projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8bc5dbd
)
add macOS 11 with arm64 to RID graph (#40644)
author
Tomas Weinfurt
<tweinfurt@yahoo.com>
Wed, 12 Aug 2020 00:04:46 +0000
(17:04 -0700)
committer
GitHub
<noreply@github.com>
Wed, 12 Aug 2020 00:04:46 +0000
(17:04 -0700)
src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
patch
|
blob
|
history
src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
patch
|
blob
|
history
src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
patch
|
blob
|
history
diff --git
a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index
2336466
..
c425623
100644
(file)
--- a/
src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/
src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@
-3661,6
+3661,14
@@
"any",
"base"
],
+ "osx-arm64": [
+ "osx-arm64",
+ "osx",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
"osx-x64": [
"osx-x64",
"osx",
@@
-3816,6
+3824,65
@@
"any",
"base"
],
+ "osx.11": [
+ "osx.11",
+ "osx",
+ "unix",
+ "any",
+ "base"
+ ],
+ "osx.11-arm64": [
+ "osx.11-arm64",
+ "osx.11",
+ "osx-arm64",
+ "osx",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "osx.11-x64": [
+ "osx.11-x64",
+ "osx.11",
+ "osx-x64",
+ "osx",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "osx.11.0": [
+ "osx.11.0",
+ "osx.11",
+ "osx",
+ "unix",
+ "any",
+ "base"
+ ],
+ "osx.11.0-arm64": [
+ "osx.11.0-arm64",
+ "osx.11.0",
+ "osx.11-arm64",
+ "osx.11",
+ "osx-arm64",
+ "osx",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "osx.11.0-x64": [
+ "osx.11.0-x64",
+ "osx.11.0",
+ "osx.11-x64",
+ "osx.11",
+ "osx-x64",
+ "osx",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
"rhel": [
"rhel",
"linux",
diff --git
a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index
1942915
..
1a7e4c3
100644
(file)
--- a/
src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/
src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@
-1571,6
+1571,12
@@
"unix"
]
},
+ "osx-arm64": {
+ "#import": [
+ "osx",
+ "unix-arm64"
+ ]
+ },
"osx-x64": {
"#import": [
"osx",
@@
-1643,6
+1649,40
@@
"osx.10.14-x64"
]
},
+ "osx.11": {
+ "#import": [
+ "osx"
+ ]
+ },
+ "osx.11-arm64": {
+ "#import": [
+ "osx.11",
+ "osx-arm64"
+ ]
+ },
+ "osx.11-x64": {
+ "#import": [
+ "osx.11",
+ "osx-x64"
+ ]
+ },
+ "osx.11.0": {
+ "#import": [
+ "osx.11"
+ ]
+ },
+ "osx.11.0-arm64": {
+ "#import": [
+ "osx.11.0",
+ "osx.11-arm64"
+ ]
+ },
+ "osx.11.0-x64": {
+ "#import": [
+ "osx.11.0",
+ "osx.11-x64"
+ ]
+ },
"rhel": {
"#import": [
"linux"
diff --git
a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index
761fd98
..
76b491c
100644
(file)
--- a/
src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/
src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@
-124,6
+124,12
@@
<Versions>10.10;10.11;10.12;10.13;10.14;10.15</Versions>
</RuntimeGroup>
+ <RuntimeGroup Include="osx">
+ <Parent>unix</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>11;11.0</Versions>
+ </RuntimeGroup>
+
<RuntimeGroup Include="freebsd">
<Parent>unix</Parent>
<Architectures>x64</Architectures>