diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d3249610af4f3..d6d88380793e4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/dotnet/runtime fde6b37e985605d862c070256de7c97e2a3f3342 - + https://github.com/dotnet/runtime - fde6b37e985605d862c070256de7c97e2a3f3342 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://github.com/dotnet/runtime - fde6b37e985605d862c070256de7c97e2a3f3342 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c8039d870b5adc..43a779931870d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -61,8 +61,8 @@ 6.0.0-preview.1.102 6.0.0-alpha.1.20612.4 - 6.0.0-rc.1.21415.6 - 6.0.0-rc.1.21415.6 + 6.0.13 + 6.0.13 6.0.0 6.0.0-rc.1.21415.6 diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs index ee007af28b6d0e..36ff2977b807d1 100644 --- a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs +++ b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoData.cs @@ -65,7 +65,11 @@ internal static int[] GetCurrencyNegativePatterns(string localeName) return PlatformDetection.IsNlsGlobalization ? new int[] { 12 } : new int[] { 9 }; case "es-BO": - return (PlatformDetection.IsNlsGlobalization && PlatformDetection.WindowsVersion < 10) ? new int[] { 14 } : new int[] { 1 }; + return (PlatformDetection.IsNlsGlobalization && PlatformDetection.WindowsVersion < 10) ? + new int[] { 14 } : + // Mac OSX used to return 1 which is the format "-$n". OSX Version 12 (Monterey) started + // to return a different value 12 "$ -n". + PlatformDetection.IsOSX ? new int[] { 1, 12 } : new int[] { 1 }; case "fr-CA": return PlatformDetection.IsNlsGlobalization ? new int[] { 15 } : new int[] { 8, 15 }; diff --git a/src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs index 8c6fc1a78d47bf..7ec508517e01cb 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs @@ -190,7 +190,8 @@ public void OSVersion_ValidVersion_OSX() Version version = Environment.OSVersion.Version; // verify that the Environment.OSVersion.Version matches the current RID - Assert.Contains(version.ToString(2), RuntimeInformation.RuntimeIdentifier); + // As of 12.0, only major version numbers are included in the RID + Assert.Contains(version.ToString(1), RuntimeInformation.RuntimeIdentifier); Assert.True(version.Build >= 0, "OSVersion Build should be non-negative"); Assert.Equal(-1, version.Revision); // Revision is never set on OSX