From 4225e1f7101da9737032506dd49c2b6a62a620a7 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 29 Jan 2021 14:47:52 -0500 Subject: [PATCH 1/3] Add Mac Catalyst RIDs First step in being able to build different mac catalyst runtimes Resolves https://github.com/dotnet/runtime/issues/47518 --- .../pkg/runtime.compatibility.json | 96 +++++++++++++++++++ .../pkg/runtime.json | 51 ++++++++++ .../pkg/runtimeGroups.props | 6 ++ 3 files changed, 153 insertions(+) diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index 949ee4f97b11ce..a5a0355465c96e 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -1699,6 +1699,102 @@ "any", "base" ], + "catalyst": [ + "catalyst", + "linux", + "unix", + "any", + "base" + ], + "catalyst-arm64": [ + "catalyst-arm64", + "catalyst", + "linux-arm64", + "linux", + "unix-arm64", + "unix", + "any", + "base" + ], + "catalyst-x64": [ + "catalyst-x64", + "catalyst", + "linux-x64", + "linux", + "unix-x64", + "unix", + "any", + "base" + ], + "catalyst.13": [ + "catalyst.13", + "catalyst", + "linux", + "unix", + "any", + "base" + ], + "catalyst.13-arm64": [ + "catalyst.13-arm64", + "catalyst.13", + "catalyst-arm64", + "catalyst", + "linux-arm64", + "linux", + "unix-arm64", + "unix", + "any", + "base" + ], + "catalyst.13-x64": [ + "catalyst.13-x64", + "catalyst.13", + "catalyst-x64", + "catalyst", + "linux-x64", + "linux", + "unix-x64", + "unix", + "any", + "base" + ], + "catalyst.14": [ + "catalyst.14", + "catalyst.13", + "catalyst", + "linux", + "unix", + "any", + "base" + ], + "catalyst.14-arm64": [ + "catalyst.14-arm64", + "catalyst.14", + "catalyst.13-arm64", + "catalyst.13", + "catalyst-arm64", + "catalyst", + "linux-arm64", + "linux", + "unix-arm64", + "unix", + "any", + "base" + ], + "catalyst.14-x64": [ + "catalyst.14-x64", + "catalyst.14", + "catalyst.13-x64", + "catalyst.13", + "catalyst-x64", + "catalyst", + "linux-x64", + "linux", + "unix-x64", + "unix", + "any", + "base" + ], "centos": [ "centos", "rhel", diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index b309f20a475fbb..b5f29f2f591dad 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -560,6 +560,57 @@ "browser" ] }, + "catalyst": { + "#import": [ + "linux" + ] + }, + "catalyst-arm64": { + "#import": [ + "catalyst", + "linux-arm64" + ] + }, + "catalyst-x64": { + "#import": [ + "catalyst", + "linux-x64" + ] + }, + "catalyst.13": { + "#import": [ + "catalyst" + ] + }, + "catalyst.13-arm64": { + "#import": [ + "catalyst.13", + "catalyst-arm64" + ] + }, + "catalyst.13-x64": { + "#import": [ + "catalyst.13", + "catalyst-x64" + ] + }, + "catalyst.14": { + "#import": [ + "catalyst.13" + ] + }, + "catalyst.14-arm64": { + "#import": [ + "catalyst.14", + "catalyst.13-arm64" + ] + }, + "catalyst.14-x64": { + "#import": [ + "catalyst.14", + "catalyst.13-x64" + ] + }, "centos": { "#import": [ "rhel" diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props index 3ad08c83ce89c9..e8af673ef2cf97 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props @@ -35,6 +35,12 @@ wasm + + linux + x64;arm64 + 13;14 + + rhel x64 From 4bf6a4d9c777cd3b6322ffb8c1ec4812d40fe568 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Fri, 29 Jan 2021 15:23:18 -0500 Subject: [PATCH 2/3] Slowing down... --- .../pkg/runtime.compatibility.json | 15 --------------- .../Microsoft.NETCore.Platforms/pkg/runtime.json | 6 +++--- .../pkg/runtimeGroups.props | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index a5a0355465c96e..3b2f75a133f8d3 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -1701,7 +1701,6 @@ ], "catalyst": [ "catalyst", - "linux", "unix", "any", "base" @@ -1709,8 +1708,6 @@ "catalyst-arm64": [ "catalyst-arm64", "catalyst", - "linux-arm64", - "linux", "unix-arm64", "unix", "any", @@ -1719,8 +1716,6 @@ "catalyst-x64": [ "catalyst-x64", "catalyst", - "linux-x64", - "linux", "unix-x64", "unix", "any", @@ -1729,7 +1724,6 @@ "catalyst.13": [ "catalyst.13", "catalyst", - "linux", "unix", "any", "base" @@ -1739,8 +1733,6 @@ "catalyst.13", "catalyst-arm64", "catalyst", - "linux-arm64", - "linux", "unix-arm64", "unix", "any", @@ -1751,8 +1743,6 @@ "catalyst.13", "catalyst-x64", "catalyst", - "linux-x64", - "linux", "unix-x64", "unix", "any", @@ -1762,7 +1752,6 @@ "catalyst.14", "catalyst.13", "catalyst", - "linux", "unix", "any", "base" @@ -1774,8 +1763,6 @@ "catalyst.13", "catalyst-arm64", "catalyst", - "linux-arm64", - "linux", "unix-arm64", "unix", "any", @@ -1788,8 +1775,6 @@ "catalyst.13", "catalyst-x64", "catalyst", - "linux-x64", - "linux", "unix-x64", "unix", "any", diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index b5f29f2f591dad..109b0681155d42 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -562,19 +562,19 @@ }, "catalyst": { "#import": [ - "linux" + "unix" ] }, "catalyst-arm64": { "#import": [ "catalyst", - "linux-arm64" + "unix-arm64" ] }, "catalyst-x64": { "#import": [ "catalyst", - "linux-x64" + "unix-x64" ] }, "catalyst.13": { diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props index e8af673ef2cf97..ad0b7603735b88 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props @@ -36,7 +36,7 @@ - linux + unix x64;arm64 13;14 From 6fe449fefcd6c3a850598bee62ca22c79961fd6e Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 3 Feb 2021 11:56:24 -0500 Subject: [PATCH 3/3] Changed rid name to be maccatalyst and to derive from ios --- .../pkg/runtime.compatibility.json | 177 ++++++++++-------- .../pkg/runtime.json | 102 +++++----- .../pkg/runtimeGroups.props | 4 +- 3 files changed, 149 insertions(+), 134 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index 3b2f75a133f8d3..f83a76daed7355 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -1699,87 +1699,6 @@ "any", "base" ], - "catalyst": [ - "catalyst", - "unix", - "any", - "base" - ], - "catalyst-arm64": [ - "catalyst-arm64", - "catalyst", - "unix-arm64", - "unix", - "any", - "base" - ], - "catalyst-x64": [ - "catalyst-x64", - "catalyst", - "unix-x64", - "unix", - "any", - "base" - ], - "catalyst.13": [ - "catalyst.13", - "catalyst", - "unix", - "any", - "base" - ], - "catalyst.13-arm64": [ - "catalyst.13-arm64", - "catalyst.13", - "catalyst-arm64", - "catalyst", - "unix-arm64", - "unix", - "any", - "base" - ], - "catalyst.13-x64": [ - "catalyst.13-x64", - "catalyst.13", - "catalyst-x64", - "catalyst", - "unix-x64", - "unix", - "any", - "base" - ], - "catalyst.14": [ - "catalyst.14", - "catalyst.13", - "catalyst", - "unix", - "any", - "base" - ], - "catalyst.14-arm64": [ - "catalyst.14-arm64", - "catalyst.14", - "catalyst.13-arm64", - "catalyst.13", - "catalyst-arm64", - "catalyst", - "unix-arm64", - "unix", - "any", - "base" - ], - "catalyst.14-x64": [ - "catalyst.14-x64", - "catalyst.14", - "catalyst.13-x64", - "catalyst.13", - "catalyst-x64", - "catalyst", - "unix-x64", - "unix", - "any", - "base" - ], "centos": [ "centos", "rhel", @@ -3488,6 +3407,102 @@ "any", "base" ], + "maccatalyst": [ + "maccatalyst", + "ios", + "unix", + "any", + "base" + ], + "maccatalyst-arm64": [ + "maccatalyst-arm64", + "maccatalyst", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "maccatalyst-x64": [ + "maccatalyst-x64", + "maccatalyst", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "maccatalyst.13": [ + "maccatalyst.13", + "maccatalyst", + "ios", + "unix", + "any", + "base" + ], + "maccatalyst.13-arm64": [ + "maccatalyst.13-arm64", + "maccatalyst.13", + "maccatalyst-arm64", + "maccatalyst", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "maccatalyst.13-x64": [ + "maccatalyst.13-x64", + "maccatalyst.13", + "maccatalyst-x64", + "maccatalyst", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "maccatalyst.14": [ + "maccatalyst.14", + "maccatalyst.13", + "maccatalyst", + "ios", + "unix", + "any", + "base" + ], + "maccatalyst.14-arm64": [ + "maccatalyst.14-arm64", + "maccatalyst.14", + "maccatalyst.13-arm64", + "maccatalyst.13", + "maccatalyst-arm64", + "maccatalyst", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "maccatalyst.14-x64": [ + "maccatalyst.14-x64", + "maccatalyst.14", + "maccatalyst.13-x64", + "maccatalyst.13", + "maccatalyst-x64", + "maccatalyst", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], "ol": [ "ol", "rhel", diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index 109b0681155d42..c714ca1a553429 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -560,57 +560,6 @@ "browser" ] }, - "catalyst": { - "#import": [ - "unix" - ] - }, - "catalyst-arm64": { - "#import": [ - "catalyst", - "unix-arm64" - ] - }, - "catalyst-x64": { - "#import": [ - "catalyst", - "unix-x64" - ] - }, - "catalyst.13": { - "#import": [ - "catalyst" - ] - }, - "catalyst.13-arm64": { - "#import": [ - "catalyst.13", - "catalyst-arm64" - ] - }, - "catalyst.13-x64": { - "#import": [ - "catalyst.13", - "catalyst-x64" - ] - }, - "catalyst.14": { - "#import": [ - "catalyst.13" - ] - }, - "catalyst.14-arm64": { - "#import": [ - "catalyst.14", - "catalyst.13-arm64" - ] - }, - "catalyst.14-x64": { - "#import": [ - "catalyst.14", - "catalyst.13-x64" - ] - }, "centos": { "#import": [ "rhel" @@ -1472,6 +1421,57 @@ "linuxmint.19.1-x64" ] }, + "maccatalyst": { + "#import": [ + "ios" + ] + }, + "maccatalyst-arm64": { + "#import": [ + "maccatalyst", + "ios-arm64" + ] + }, + "maccatalyst-x64": { + "#import": [ + "maccatalyst", + "ios-x64" + ] + }, + "maccatalyst.13": { + "#import": [ + "maccatalyst" + ] + }, + "maccatalyst.13-arm64": { + "#import": [ + "maccatalyst.13", + "maccatalyst-arm64" + ] + }, + "maccatalyst.13-x64": { + "#import": [ + "maccatalyst.13", + "maccatalyst-x64" + ] + }, + "maccatalyst.14": { + "#import": [ + "maccatalyst.13" + ] + }, + "maccatalyst.14-arm64": { + "#import": [ + "maccatalyst.14", + "maccatalyst.13-arm64" + ] + }, + "maccatalyst.14-x64": { + "#import": [ + "maccatalyst.14", + "maccatalyst.13-x64" + ] + }, "ol": { "#import": [ "rhel" diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props index ad0b7603735b88..8bef4cfcd888ba 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props @@ -35,8 +35,8 @@ wasm - - unix + + ios x64;arm64 13;14