From 17523c851facf1771e3720f67cef4622556482d4 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 25 Aug 2025 10:18:56 -0700
Subject: [PATCH 1/2] Update the testhost root rather than the installer root
 to avoid impacting the installer msi

---
 src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
index 17e00b153544..e4595cd8fdf6 100644
--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
@@ -35,7 +35,7 @@
       MicrosoftNETCoreAppRefPackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
       NewSDKVersion="$(Version)"
       TargetRid="$(TargetRid)"
-      OutputPath="$(RedistInstallerLayoutPath)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
+      OutputPath="$(TestHostDotNetRoot)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
 
     <!-- Copy artifacts to the testhost folder. -->
     <Copy DestinationFiles="@(InstallerOutputFile)"

From a9458dc35ebfc5959cf7e350f8eca2c159d4848d Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 25 Aug 2025 11:23:41 -0700
Subject: [PATCH 2/2] Swap the order of the stage0 bundled version and the test
 output copy step so that the tests end up with the right content

---
 src/Layout/redist/targets/OverlaySdkOnLKG.targets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
index e4595cd8fdf6..406f81137c2f 100644
--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
@@ -30,18 +30,18 @@
       <InstallerOutputFile Include="@(OverlaySDKFile)" Exclude="@(InstallerOutputFile)" />
     </ItemGroup>
 
+    <!-- Copy artifacts to the testhost folder. -->
+    <Copy DestinationFiles="@(InstallerOutputFile)"
+          SourceFiles="@(InstallerOutputFile->Metadata('Source'))"
+          SkipUnchangedFiles="true"
+          UseHardLinksIfPossible="true" />
+
     <OverrideAndCreateBundledNETCoreAppPackageVersion
       Stage0MicrosoftNETCoreAppRefPackageVersionPath="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledVersions.props"
       MicrosoftNETCoreAppRefPackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
       NewSDKVersion="$(Version)"
       TargetRid="$(TargetRid)"
       OutputPath="$(TestHostDotNetRoot)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
-
-    <!-- Copy artifacts to the testhost folder. -->
-    <Copy DestinationFiles="@(InstallerOutputFile)"
-          SourceFiles="@(InstallerOutputFile->Metadata('Source'))"
-          SkipUnchangedFiles="true"
-          UseHardLinksIfPossible="true" />
   </Target>
 
   <Target Name="PublishTestWorkloads"