Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit 4ead056

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/2.1' changes
2 parents f48ebd1 + 9ca3ca3 commit 4ead056

File tree

3 files changed

+223
-7
lines changed

3 files changed

+223
-7
lines changed

‎pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json

+177
Original file line numberDiff line numberDiff line change
@@ -5990,8 +5990,171 @@
59905990
"any",
59915991
"base"
59925992
],
5993+
"osx.10.16": [
5994+
"osx.10.16",
5995+
"osx.10.15",
5996+
"osx.10.14",
5997+
"osx.10.13",
5998+
"osx.10.12",
5999+
"osx.10.11",
6000+
"osx.10.10",
6001+
"osx",
6002+
"unix",
6003+
"any",
6004+
"base"
6005+
],
6006+
"osx.10.16-arm64": [
6007+
"osx.10.16-arm64",
6008+
"osx.10.16",
6009+
"osx.10.15-arm64",
6010+
"osx.10.15",
6011+
"osx.10.14-arm64",
6012+
"osx.10.14",
6013+
"osx.10.13-arm64",
6014+
"osx.10.13",
6015+
"osx.10.12-arm64",
6016+
"osx.10.12",
6017+
"osx.10.11-arm64",
6018+
"osx.10.11",
6019+
"osx.10.10-arm64",
6020+
"osx.10.10",
6021+
"osx-arm64",
6022+
"osx",
6023+
"unix-arm64",
6024+
"unix",
6025+
"any",
6026+
"base"
6027+
],
6028+
"osx.10.16-arm64-corert": [
6029+
"osx.10.16-arm64-corert",
6030+
"osx.10.16-corert",
6031+
"osx.10.16-arm64",
6032+
"osx.10.16",
6033+
"osx.10.15-arm64-corert",
6034+
"osx.10.15-corert",
6035+
"osx.10.15-arm64",
6036+
"osx.10.15",
6037+
"osx.10.14-arm64-corert",
6038+
"osx.10.14-corert",
6039+
"osx.10.14-arm64",
6040+
"osx.10.14",
6041+
"osx.10.13-arm64-corert",
6042+
"osx.10.13-corert",
6043+
"osx.10.13-arm64",
6044+
"osx.10.13",
6045+
"osx.10.12-arm64-corert",
6046+
"osx.10.12-corert",
6047+
"osx.10.12-arm64",
6048+
"osx.10.12",
6049+
"osx.10.11-arm64-corert",
6050+
"osx.10.11-corert",
6051+
"osx.10.11-arm64",
6052+
"osx.10.11",
6053+
"osx.10.10-arm64-corert",
6054+
"osx.10.10-corert",
6055+
"osx.10.10-arm64",
6056+
"osx.10.10",
6057+
"osx-arm64-corert",
6058+
"osx-corert",
6059+
"osx-arm64",
6060+
"osx",
6061+
"unix-arm64-corert",
6062+
"unix-corert",
6063+
"unix-arm64",
6064+
"unix",
6065+
"corert",
6066+
"any",
6067+
"base"
6068+
],
6069+
"osx.10.16-corert": [
6070+
"osx.10.16-corert",
6071+
"osx.10.16",
6072+
"osx.10.15-corert",
6073+
"osx.10.15",
6074+
"osx.10.14-corert",
6075+
"osx.10.14",
6076+
"osx.10.13-corert",
6077+
"osx.10.13",
6078+
"osx.10.12-corert",
6079+
"osx.10.12",
6080+
"osx.10.11-corert",
6081+
"osx.10.11",
6082+
"osx.10.10-corert",
6083+
"osx.10.10",
6084+
"osx-corert",
6085+
"osx",
6086+
"unix-corert",
6087+
"unix",
6088+
"corert",
6089+
"any",
6090+
"base"
6091+
],
6092+
"osx.10.16-x64": [
6093+
"osx.10.16-x64",
6094+
"osx.10.16",
6095+
"osx.10.15-x64",
6096+
"osx.10.15",
6097+
"osx.10.14-x64",
6098+
"osx.10.14",
6099+
"osx.10.13-x64",
6100+
"osx.10.13",
6101+
"osx.10.12-x64",
6102+
"osx.10.12",
6103+
"osx.10.11-x64",
6104+
"osx.10.11",
6105+
"osx.10.10-x64",
6106+
"osx.10.10",
6107+
"osx-x64",
6108+
"osx",
6109+
"unix-x64",
6110+
"unix",
6111+
"any",
6112+
"base"
6113+
],
6114+
"osx.10.16-x64-corert": [
6115+
"osx.10.16-x64-corert",
6116+
"osx.10.16-corert",
6117+
"osx.10.16-x64",
6118+
"osx.10.16",
6119+
"osx.10.15-x64-corert",
6120+
"osx.10.15-corert",
6121+
"osx.10.15-x64",
6122+
"osx.10.15",
6123+
"osx.10.14-x64-corert",
6124+
"osx.10.14-corert",
6125+
"osx.10.14-x64",
6126+
"osx.10.14",
6127+
"osx.10.13-x64-corert",
6128+
"osx.10.13-corert",
6129+
"osx.10.13-x64",
6130+
"osx.10.13",
6131+
"osx.10.12-x64-corert",
6132+
"osx.10.12-corert",
6133+
"osx.10.12-x64",
6134+
"osx.10.12",
6135+
"osx.10.11-x64-corert",
6136+
"osx.10.11-corert",
6137+
"osx.10.11-x64",
6138+
"osx.10.11",
6139+
"osx.10.10-x64-corert",
6140+
"osx.10.10-corert",
6141+
"osx.10.10-x64",
6142+
"osx.10.10",
6143+
"osx-x64-corert",
6144+
"osx-corert",
6145+
"osx-x64",
6146+
"osx",
6147+
"unix-x64-corert",
6148+
"unix-corert",
6149+
"unix-x64",
6150+
"unix",
6151+
"corert",
6152+
"any",
6153+
"base"
6154+
],
59936155
"osx.11.0": [
59946156
"osx.11.0",
6157+
"osx.10.16",
59956158
"osx.10.15",
59966159
"osx.10.14",
59976160
"osx.10.13",
@@ -6006,6 +6169,8 @@
60066169
"osx.11.0-arm64": [
60076170
"osx.11.0-arm64",
60086171
"osx.11.0",
6172+
"osx.10.16-arm64",
6173+
"osx.10.16",
60096174
"osx.10.15-arm64",
60106175
"osx.10.15",
60116176
"osx.10.14-arm64",
@@ -6030,6 +6195,10 @@
60306195
"osx.11.0-corert",
60316196
"osx.11.0-arm64",
60326197
"osx.11.0",
6198+
"osx.10.16-arm64-corert",
6199+
"osx.10.16-corert",
6200+
"osx.10.16-arm64",
6201+
"osx.10.16",
60336202
"osx.10.15-arm64-corert",
60346203
"osx.10.15-corert",
60356204
"osx.10.15-arm64",
@@ -6069,6 +6238,8 @@
60696238
"osx.11.0-corert": [
60706239
"osx.11.0-corert",
60716240
"osx.11.0",
6241+
"osx.10.16-corert",
6242+
"osx.10.16",
60726243
"osx.10.15-corert",
60736244
"osx.10.15",
60746245
"osx.10.14-corert",
@@ -6092,6 +6263,8 @@
60926263
"osx.11.0-x64": [
60936264
"osx.11.0-x64",
60946265
"osx.11.0",
6266+
"osx.10.16-x64",
6267+
"osx.10.16",
60956268
"osx.10.15-x64",
60966269
"osx.10.15",
60976270
"osx.10.14-x64",
@@ -6116,6 +6289,10 @@
61166289
"osx.11.0-corert",
61176290
"osx.11.0-x64",
61186291
"osx.11.0",
6292+
"osx.10.16-x64-corert",
6293+
"osx.10.16-corert",
6294+
"osx.10.16-x64",
6295+
"osx.10.16",
61196296
"osx.10.15-x64-corert",
61206297
"osx.10.15-corert",
61216298
"osx.10.15-x64",

‎pkg/Microsoft.NETCore.Platforms/runtime.json

+45-6
Original file line numberDiff line numberDiff line change
@@ -2188,43 +2188,82 @@
21882188
"osx.10.14-x64-corert"
21892189
]
21902190
},
2191-
"osx.11.0": {
2191+
"osx.10.16": {
21922192
"#import": [
21932193
"osx.10.15"
21942194
]
21952195
},
2196+
"osx.10.16-arm64": {
2197+
"#import": [
2198+
"osx.10.16",
2199+
"osx.10.15-arm64"
2200+
]
2201+
},
2202+
"osx.10.16-arm64-corert": {
2203+
"#import": [
2204+
"osx.10.16-corert",
2205+
"osx.10.16-arm64",
2206+
"osx.10.16",
2207+
"osx.10.15-arm64-corert"
2208+
]
2209+
},
2210+
"osx.10.16-corert": {
2211+
"#import": [
2212+
"osx.10.16",
2213+
"osx.10.15-corert"
2214+
]
2215+
},
2216+
"osx.10.16-x64": {
2217+
"#import": [
2218+
"osx.10.16",
2219+
"osx.10.15-x64"
2220+
]
2221+
},
2222+
"osx.10.16-x64-corert": {
2223+
"#import": [
2224+
"osx.10.16-corert",
2225+
"osx.10.16-x64",
2226+
"osx.10.16",
2227+
"osx.10.15-x64-corert"
2228+
]
2229+
},
2230+
"osx.11.0": {
2231+
"#import": [
2232+
"osx.10.16"
2233+
]
2234+
},
21962235
"osx.11.0-arm64": {
21972236
"#import": [
21982237
"osx.11.0",
2199-
"osx.10.15-arm64"
2238+
"osx.10.16-arm64"
22002239
]
22012240
},
22022241
"osx.11.0-arm64-corert": {
22032242
"#import": [
22042243
"osx.11.0-corert",
22052244
"osx.11.0-arm64",
22062245
"osx.11.0",
2207-
"osx.10.15-arm64-corert"
2246+
"osx.10.16-arm64-corert"
22082247
]
22092248
},
22102249
"osx.11.0-corert": {
22112250
"#import": [
22122251
"osx.11.0",
2213-
"osx.10.15-corert"
2252+
"osx.10.16-corert"
22142253
]
22152254
},
22162255
"osx.11.0-x64": {
22172256
"#import": [
22182257
"osx.11.0",
2219-
"osx.10.15-x64"
2258+
"osx.10.16-x64"
22202259
]
22212260
},
22222261
"osx.11.0-x64-corert": {
22232262
"#import": [
22242263
"osx.11.0-corert",
22252264
"osx.11.0-x64",
22262265
"osx.11.0",
2227-
"osx.10.15-x64-corert"
2266+
"osx.10.16-x64-corert"
22282267
]
22292268
},
22302269
"rhel": {

‎pkg/Microsoft.NETCore.Platforms/runtimeGroups.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<RuntimeGroup Include="osx">
9595
<Parent>unix</Parent>
9696
<Architectures>x64;arm64</Architectures>
97-
<Versions>10.10;10.11;10.12;10.13;10.14;10.15;11.0</Versions>
97+
<Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0</Versions>
9898
</RuntimeGroup>
9999

100100
<!-- rhel 6 is independent -->

0 commit comments

Comments
 (0)