Skip to content

[release/6.0] Update dotnet host for testing and fix failing globalization test #80560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 2 commits into from
Jan 12, 2023
Merged

[release/6.0] Update dotnet host for testing and fix failing globalization test #80560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
064498e
[release/6.0] Update dotnet host for testing to fix OSVersion_ValidVe…
akoeplinger Jan 12, 2023
712e3b3
Fix Failing Globalization Test on OSX (#63971)
tarekgh Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[release/6.0] Update dotnet host for testing to fix OSVersion_ValidVe… 
…rsion_OSX

We changed how we got the OS version in f30e7fa to account for the macOS versioning changes. The `dotnet` host used for testing was still on a version before that change so the RID it set (which flows through to RuntimeInformation.RuntimeIdentifier) was using the old format. Updating to the latest 6.0.13 fixes that.

Also bring in the change from 5da4464#diff-3b1296c3b8a733ad1c027de7b5c653d0843afcc959cf9b2656160a9dcf8c0aa5R193-R194 so we only check for the major OS version.
  • Loading branch information
@akoeplinger
akoeplinger committed Jan 12, 2023
commit 064498e37397337384245805873455454db8cbc1
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-rc.1.21415.6">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-rc.1.21415.6">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.13">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fde6b37e985605d862c070256de7c97e2a3f3342</Sha>
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-rc.1.21415.6">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-rc.1.21415.6</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-rc.1.21415.6</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.13</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.13</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>6.0.0-rc.1.21415.6</MicrosoftNETCoreILAsmVersion>
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Runtime.Extensions/tests/System/EnvironmentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down