From 8e4889bef61fe7e92bfd5661f0b22b58ae8b86c5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:30:16 -0600
Subject: [PATCH 1/2] Handle building host test assets with stabilized package
 versions (#109031)

Co-authored-by: Elinor Fung <elfung@microsoft.com>
---
 .../tests/Assets/Projects/Directory.Build.targets        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.targets b/src/installer/tests/Assets/Projects/Directory.Build.targets
index 09d445f31a2faa..0c23a06b0228d4 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.targets
+++ b/src/installer/tests/Assets/Projects/Directory.Build.targets
@@ -12,8 +12,15 @@
   <Target Name="UpdateRuntimeFrameworkVersion"
           Condition="'$(UseLocalTargetingRuntimePack)' == 'true'"
           AfterTargets="ResolveTargetingPackAssets">
+    <PropertyGroup>
+      <_UpdatedVersion>$(Version)</_UpdatedVersion>
+      <!-- When package versions are stabilized, they do not have version suffixes. Because these are
+           non-shipping tests assets, the Version property will still include suffixes (unlike for shipping
+           assets), so we explicitly use the ProductVersion (without suffixes) in the stabilized case. -->
+      <_UpdatedVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_UpdatedVersion>
+    </PropertyGroup>
     <ItemGroup>
-      <RuntimeFramework Version="$(Version)"
+      <RuntimeFramework Version="$(_UpdatedVersion)"
                         Condition="'%(RuntimeFramework.FrameworkName)' == '$(LocalFrameworkOverrideName)'" />
     </ItemGroup>
   </Target>

From 197db4ff0ded5f02e2d050f1310f297265d19e3d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:31:11 -0600
Subject: [PATCH 2/2] Fix nativeaot outerloop (#109009)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
---
 .../System/Globalization/RegionInfoTests.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs
index f048a65ede70a4..0d86a47933c6f8 100644
--- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs
+++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs
@@ -272,7 +272,7 @@ public void ValidateThrowingWhenUsingCustomUnspecifiedLcid()
         public void BuiltInRegionListTest()
         {
             // Ensure we can create all region info objects from the built-in list
-            Dictionary<string, string> regionNames = (Dictionary<string, string>)typeof(RegionInfo).Assembly.GetType("System.Globalization.CultureData").GetProperty("RegionNames", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
+            Dictionary<string, string> regionNames = (Dictionary<string, string>)Type.GetType("System.Globalization.CultureData, System.Private.CoreLib").GetProperty("RegionNames", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
 
             foreach (var kvp in regionNames)
             {