Skip to content

Commit cd483c1

Browse files
Add RIDs for macOS 13; update test (#75428)
Co-authored-by: Filip Navara <[email protected]>
1 parent 5ef3816 commit cd483c1

File tree

4 files changed

+96
-6
lines changed

4 files changed

+96
-6
lines changed

src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6040,6 +6040,78 @@
60406040
"any",
60416041
"base"
60426042
],
6043+
"osx.13": [
6044+
"osx.13",
6045+
"osx.12",
6046+
"osx.11.0",
6047+
"osx.10.16",
6048+
"osx.10.15",
6049+
"osx.10.14",
6050+
"osx.10.13",
6051+
"osx.10.12",
6052+
"osx.10.11",
6053+
"osx.10.10",
6054+
"osx",
6055+
"unix",
6056+
"any",
6057+
"base"
6058+
],
6059+
"osx.13-arm64": [
6060+
"osx.13-arm64",
6061+
"osx.13",
6062+
"osx.12-arm64",
6063+
"osx.12",
6064+
"osx.11.0-arm64",
6065+
"osx.11.0",
6066+
"osx.10.16-arm64",
6067+
"osx.10.16",
6068+
"osx.10.15-arm64",
6069+
"osx.10.15",
6070+
"osx.10.14-arm64",
6071+
"osx.10.14",
6072+
"osx.10.13-arm64",
6073+
"osx.10.13",
6074+
"osx.10.12-arm64",
6075+
"osx.10.12",
6076+
"osx.10.11-arm64",
6077+
"osx.10.11",
6078+
"osx.10.10-arm64",
6079+
"osx.10.10",
6080+
"osx-arm64",
6081+
"osx",
6082+
"unix-arm64",
6083+
"unix",
6084+
"any",
6085+
"base"
6086+
],
6087+
"osx.13-x64": [
6088+
"osx.13-x64",
6089+
"osx.13",
6090+
"osx.12-x64",
6091+
"osx.12",
6092+
"osx.11.0-x64",
6093+
"osx.11.0",
6094+
"osx.10.16-x64",
6095+
"osx.10.16",
6096+
"osx.10.15-x64",
6097+
"osx.10.15",
6098+
"osx.10.14-x64",
6099+
"osx.10.14",
6100+
"osx.10.13-x64",
6101+
"osx.10.13",
6102+
"osx.10.12-x64",
6103+
"osx.10.12",
6104+
"osx.10.11-x64",
6105+
"osx.10.11",
6106+
"osx.10.10-x64",
6107+
"osx.10.10",
6108+
"osx-x64",
6109+
"osx",
6110+
"unix-x64",
6111+
"unix",
6112+
"any",
6113+
"base"
6114+
],
60436115
"rhel": [
60446116
"rhel",
60456117
"linux",

src/libraries/Microsoft.NETCore.Platforms/src/runtime.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2360,6 +2360,23 @@
23602360
"osx.11.0-x64"
23612361
]
23622362
},
2363+
"osx.13": {
2364+
"#import": [
2365+
"osx.12"
2366+
]
2367+
},
2368+
"osx.13-arm64": {
2369+
"#import": [
2370+
"osx.13",
2371+
"osx.12-arm64"
2372+
]
2373+
},
2374+
"osx.13-x64": {
2375+
"#import": [
2376+
"osx.13",
2377+
"osx.12-x64"
2378+
]
2379+
},
23632380
"rhel": {
23642381
"#import": [
23652382
"linux"

src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<RuntimeGroup Include="osx">
174174
<Parent>unix</Parent>
175175
<Architectures>x64;arm64</Architectures>
176-
<Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0;12</Versions>
176+
<Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0;12;13</Versions>
177177
</RuntimeGroup>
178178

179179
<RuntimeGroup Include="freebsd">

src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,15 @@ public void CanAddArchitectureToExistingGroups()
210210
[Fact]
211211
public void CanAddArchitectureAndVersionToExistingGroups()
212212
{
213-
var additionalRIDs = new[] { "osx.12-powerpc" };
213+
var additionalRIDs = new[] { "osx.13-powerpc" };
214214
var expectedAdditions = new[]
215215
{
216-
new RuntimeDescription("osx.12-powerpc", new[] { "osx.12", "osx.11.0-powerpc" }),
217-
new RuntimeDescription("osx.12-arm64", new[] { "osx.12", "osx.11.0-arm64" }),
218-
new RuntimeDescription("osx.12-x64", new[] { "osx.12", "osx.11.0-x64" }),
219-
new RuntimeDescription("osx.12", new[] { "osx.11.0" }),
216+
new RuntimeDescription("osx.13-powerpc", new[] { "osx.13", "osx.12-powerpc" }),
217+
new RuntimeDescription("osx.13-arm64", new[] { "osx.13", "osx.12-arm64" }),
218+
new RuntimeDescription("osx.13-x64", new[] { "osx.13", "osx.12-x64" }),
219+
new RuntimeDescription("osx.13", new[] { "osx.12" }),
220220
// our RID model doesn't give priority to architecture, so the new architecture is applied to all past versions
221+
new RuntimeDescription("osx.12-powerpc", new[] { "osx.12", "osx.11.0-powerpc" }),
221222
new RuntimeDescription("osx.11.0-powerpc", new[] { "osx.11.0", "osx.10.16-powerpc" }),
222223
new RuntimeDescription("osx.10.16-powerpc", new[] { "osx.10.16", "osx.10.15-powerpc" }),
223224
new RuntimeDescription("osx.10.15-powerpc", new[] { "osx.10.15", "osx.10.14-powerpc" }),

0 commit comments

Comments
 (0)