Override stage 2 bundled versions like we used to as this is the only way the downlevel tests can work.

Still discussing any other options offline.

Author: marcpopMSFT

src/Layout/redist/targets/OverlaySdkOnLKG.targets

@@ -5,8 +5,15 @@
       <_DotNetHiveRoot>$(DOTNET_INSTALL_DIR)</_DotNetHiveRoot>
       <_DotNetHiveRoot Condition="'$(_DotNetHiveRoot)' == ''">$(RepoRoot).dotnet/</_DotNetHiveRoot>
       <_DotNetHiveRoot Condition="!HasTrailingSlash('$(_DotNetHiveRoot)')">$(_DotNetHiveRoot)/</_DotNetHiveRoot>
+      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
     </PropertyGroup>
 
+    <!-- Get stage 0 SDK version without having to duplicate the LKG SDK property between the global.json
+    and a property. -->
+    <Exec Command="$(DotnetTool) --version" ConsoleToMsbuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="Stage0SdkVersion"/>
+    </Exec>
+
     <!-- Copy artifacts from the stage0 SDK folder.
          Ignore the sdk, templates and host files for which only live built artifacts should be used. -->
     <ItemGroup>
@@ -24,6 +31,12 @@
       <InstallerOutputFile Include="@(OverlaySDKFile)" Exclude="@(InstallerOutputFile)" />
     </ItemGroup>
 
+    <OverrideAndCreateBundledNETCoreAppPackageVersion
+      Stage0MicrosoftNETCoreAppRefPackageVersionPath="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledVersions.props"
+      MicrosoftNETCoreAppRefPackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
+      NewSDKVersion="$(Version)"
+      OutputPath="$(TestHostDotNetRoot)/SDK/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
+
     <!-- Copy artifacts to the testhost folder. -->
     <Copy DestinationFiles="@(InstallerOutputFile)"
           SourceFiles="@(InstallerOutputFile->Metadata('Source'))"