Merge commit '197db4ff0ded5f02e2d050f1310f297265d19e3d'

dotnet · Oct 18, 2024 · 9c52987 · 9c52987
2 parents 87ac28b + 197db4f
commit 9c52987
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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>

diff --git a/...s/System.Runtime/tests/System.Globalization.Tests/System/Globalization/RegionInfoTests.cs b/...s/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)
             {