From 34e58744cf7d141aebc825bd74e10164a14acf1e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 18 Jul 2023 20:12:18 +0200
Subject: [PATCH 1/3] Fix broken runtime tests build

Follow-up on https://github.com/dotnet/runtime/pull/89005
---
 eng/native/ijw/getRefPackFolderFromArtifacts.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/native/ijw/getRefPackFolderFromArtifacts.ps1 b/eng/native/ijw/getRefPackFolderFromArtifacts.ps1
index f9b53286c2b916..3052e4332ffbbb 100644
--- a/eng/native/ijw/getRefPackFolderFromArtifacts.ps1
+++ b/eng/native/ijw/getRefPackFolderFromArtifacts.ps1
@@ -14,7 +14,7 @@ $refPackPath = "$repoRoot/artifacts/bin/ref/net$majorVersion.$minorVersion"
 
 if (-not (Test-Path $refPackPath))
 {
-    Write-Error "Reference assemblies not found in the artifacts folder at '$refPackPath'. Did you invoke 'build.cmd libs.sfx+libs.oob /p:RefOnly=true' to make sure that refs are built? Did the repo layout change?"
+    Write-Error "Reference assemblies not found in the artifacts folder at '$refPackPath'. Did you invoke 'build.cmd libs.sfx+libs.oob' to make sure that refs are built? Did the repo layout change?"
     exit 1
 }
 

From 4f168d5f3ac66b4df86cd6fa7e43a66270c6bab0 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 18 Jul 2023 20:12:46 +0200
Subject: [PATCH 2/3] Update build-test-job.yml

---
 eng/pipelines/common/templates/runtimes/build-test-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index 567c1e5f997148..d36ce103f092c1 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -69,7 +69,7 @@ jobs:
       - ${{ each variable in parameters.variables }}:
         - ${{ variable }}
       - name: liveRuntimeBuildParams
-        value: 'libs.sfx+libs.oob+clr.iltools /p:RefOnly=true -c Release -ci'
+        value: 'libs.sfx+libs.oob+clr.iltools -c Release -ci'
       - name: compilerArg
         value: ''
 

From 40349187066da7bed23654c11e64f3a9dc0d5a67 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 18 Jul 2023 20:32:10 +0200
Subject: [PATCH 3/3] Update sfx-ref.proj

---
 src/libraries/sfx-ref.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/sfx-ref.proj b/src/libraries/sfx-ref.proj
index 984b1fe2dea039..57bec669a2f3d7 100644
--- a/src/libraries/sfx-ref.proj
+++ b/src/libraries/sfx-ref.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.Traversal">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)-$(TargetOS)</TargetFramework>
     <!-- Filter ProjectReferences to build the best matching target framework only. -->
     <FilterTraversalProjectReferences>true</FilterTraversalProjectReferences>
   </PropertyGroup>