Skip to content

[release/7.0] Add RIDs for macOS 13 #75428

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
merged 1 commit into from
Sep 12, 2022
Merged

[release/7.0] Add RIDs for macOS 13 #75428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 72 additions & 0 deletions src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6040,6 +6040,78 @@
"any",
"base"
],
"osx.13": [
"osx.13",
"osx.12",
"osx.11.0",
"osx.10.16",
"osx.10.15",
"osx.10.14",
"osx.10.13",
"osx.10.12",
"osx.10.11",
"osx.10.10",
"osx",
"unix",
"any",
"base"
],
"osx.13-arm64": [
"osx.13-arm64",
"osx.13",
"osx.12-arm64",
"osx.12",
"osx.11.0-arm64",
"osx.11.0",
"osx.10.16-arm64",
"osx.10.16",
"osx.10.15-arm64",
"osx.10.15",
"osx.10.14-arm64",
"osx.10.14",
"osx.10.13-arm64",
"osx.10.13",
"osx.10.12-arm64",
"osx.10.12",
"osx.10.11-arm64",
"osx.10.11",
"osx.10.10-arm64",
"osx.10.10",
"osx-arm64",
"osx",
"unix-arm64",
"unix",
"any",
"base"
],
"osx.13-x64": [
"osx.13-x64",
"osx.13",
"osx.12-x64",
"osx.12",
"osx.11.0-x64",
"osx.11.0",
"osx.10.16-x64",
"osx.10.16",
"osx.10.15-x64",
"osx.10.15",
"osx.10.14-x64",
"osx.10.14",
"osx.10.13-x64",
"osx.10.13",
"osx.10.12-x64",
"osx.10.12",
"osx.10.11-x64",
"osx.10.11",
"osx.10.10-x64",
"osx.10.10",
"osx-x64",
"osx",
"unix-x64",
"unix",
"any",
"base"
],
"rhel": [
"rhel",
"linux",
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2360,6 +2360,23 @@
"osx.11.0-x64"
]
},
"osx.13": {
"#import": [
"osx.12"
]
},
"osx.13-arm64": {
"#import": [
"osx.13",
"osx.12-arm64"
]
},
"osx.13-x64": {
"#import": [
"osx.13",
"osx.12-x64"
]
},
"rhel": {
"#import": [
"linux"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<RuntimeGroup Include="osx">
<Parent>unix</Parent>
<Architectures>x64;arm64</Architectures>
<Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0;12</Versions>
<Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0;12;13</Versions>
</RuntimeGroup>

<RuntimeGroup Include="freebsd">
Expand Down
11 changes: 6 additions & 5 deletions src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,15 @@ public void CanAddArchitectureToExistingGroups()
[Fact]
public void CanAddArchitectureAndVersionToExistingGroups()
{
var additionalRIDs = new[] { "osx.12-powerpc" };
var additionalRIDs = new[] { "osx.13-powerpc" };
var expectedAdditions = new[]
{
new RuntimeDescription("osx.12-powerpc", new[] { "osx.12", "osx.11.0-powerpc" }),
new RuntimeDescription("osx.12-arm64", new[] { "osx.12", "osx.11.0-arm64" }),
new RuntimeDescription("osx.12-x64", new[] { "osx.12", "osx.11.0-x64" }),
new RuntimeDescription("osx.12", new[] { "osx.11.0" }),
new RuntimeDescription("osx.13-powerpc", new[] { "osx.13", "osx.12-powerpc" }),
new RuntimeDescription("osx.13-arm64", new[] { "osx.13", "osx.12-arm64" }),
new RuntimeDescription("osx.13-x64", new[] { "osx.13", "osx.12-x64" }),
new RuntimeDescription("osx.13", new[] { "osx.12" }),
// our RID model doesn't give priority to architecture, so the new architecture is applied to all past versions
new RuntimeDescription("osx.12-powerpc", new[] { "osx.12", "osx.11.0-powerpc" }),
new RuntimeDescription("osx.11.0-powerpc", new[] { "osx.11.0", "osx.10.16-powerpc" }),
new RuntimeDescription("osx.10.16-powerpc", new[] { "osx.10.16", "osx.10.15-powerpc" }),
new RuntimeDescription("osx.10.15-powerpc", new[] { "osx.10.15", "osx.10.14-powerpc" }),
Expand Down