diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json index ff7e2ca7f85c5..d40d1e1ac5a1a 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json @@ -1915,6 +1915,14 @@ "any", "base" ], + "ios-arm": [ + "ios-arm", + "ios", + "unix-arm", + "unix", + "any", + "base" + ], "ios-arm64": [ "ios-arm64", "ios", @@ -1931,8 +1939,62 @@ "any", "base" ], + "ios.10": [ + "ios.10", + "ios.9", + "ios.8", + "ios", + "unix", + "any", + "base" + ], + "ios.10-arm": [ + "ios.10-arm", + "ios.10", + "ios.9-arm", + "ios.9", + "ios.8-arm", + "ios.8", + "ios-arm", + "ios", + "unix-arm", + "unix", + "any", + "base" + ], + "ios.10-arm64": [ + "ios.10-arm64", + "ios.10", + "ios.9-arm64", + "ios.9", + "ios.8-arm64", + "ios.8", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.10-x64": [ + "ios.10-x64", + "ios.10", + "ios.9-x64", + "ios.9", + "ios.8-x64", + "ios.8", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], "ios.11": [ "ios.11", + "ios.10", + "ios.9", + "ios.8", "ios", "unix", "any", @@ -1941,6 +2003,12 @@ "ios.11-arm64": [ "ios.11-arm64", "ios.11", + "ios.10-arm64", + "ios.10", + "ios.9-arm64", + "ios.9", + "ios.8-arm64", + "ios.8", "ios-arm64", "ios", "unix-arm64", @@ -1951,6 +2019,12 @@ "ios.11-x64": [ "ios.11-x64", "ios.11", + "ios.10-x64", + "ios.10", + "ios.9-x64", + "ios.9", + "ios.8-x64", + "ios.8", "ios-x64", "ios", "unix-x64", @@ -1961,6 +2035,9 @@ "ios.12": [ "ios.12", "ios.11", + "ios.10", + "ios.9", + "ios.8", "ios", "unix", "any", @@ -1971,6 +2048,12 @@ "ios.12", "ios.11-arm64", "ios.11", + "ios.10-arm64", + "ios.10", + "ios.9-arm64", + "ios.9", + "ios.8-arm64", + "ios.8", "ios-arm64", "ios", "unix-arm64", @@ -1983,6 +2066,12 @@ "ios.12", "ios.11-x64", "ios.11", + "ios.10-x64", + "ios.10", + "ios.9-x64", + "ios.9", + "ios.8-x64", + "ios.8", "ios-x64", "ios", "unix-x64", @@ -1994,6 +2083,9 @@ "ios.13", "ios.12", "ios.11", + "ios.10", + "ios.9", + "ios.8", "ios", "unix", "any", @@ -2006,6 +2098,12 @@ "ios.12", "ios.11-arm64", "ios.11", + "ios.10-arm64", + "ios.10", + "ios.9-arm64", + "ios.9", + "ios.8-arm64", + "ios.8", "ios-arm64", "ios", "unix-arm64", @@ -2020,6 +2118,93 @@ "ios.12", "ios.11-x64", "ios.11", + "ios.10-x64", + "ios.10", + "ios.9-x64", + "ios.9", + "ios.8-x64", + "ios.8", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios.8": [ + "ios.8", + "ios", + "unix", + "any", + "base" + ], + "ios.8-arm": [ + "ios.8-arm", + "ios.8", + "ios-arm", + "ios", + "unix-arm", + "unix", + "any", + "base" + ], + "ios.8-arm64": [ + "ios.8-arm64", + "ios.8", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.8-x64": [ + "ios.8-x64", + "ios.8", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios.9": [ + "ios.9", + "ios.8", + "ios", + "unix", + "any", + "base" + ], + "ios.9-arm": [ + "ios.9-arm", + "ios.9", + "ios.8-arm", + "ios.8", + "ios-arm", + "ios", + "unix-arm", + "unix", + "any", + "base" + ], + "ios.9-arm64": [ + "ios.9-arm64", + "ios.9", + "ios.8-arm64", + "ios.8", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.9-x64": [ + "ios.9-x64", + "ios.9", + "ios.8-x64", + "ios.8", "ios-x64", "ios", "unix-x64", diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json index f85d599c3d3f0..0b368beb36e6f 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -832,6 +832,12 @@ "unix" ] }, + "ios-arm": { + "#import": [ + "ios", + "unix-arm" + ] + }, "ios-arm64": { "#import": [ "ios", @@ -844,21 +850,44 @@ "unix-x64" ] }, + "ios.10": { + "#import": [ + "ios.9" + ] + }, + "ios.10-arm": { + "#import": [ + "ios.10", + "ios.9-arm" + ] + }, + "ios.10-arm64": { + "#import": [ + "ios.10", + "ios.9-arm64" + ] + }, + "ios.10-x64": { + "#import": [ + "ios.10", + "ios.9-x64" + ] + }, "ios.11": { "#import": [ - "ios" + "ios.10" ] }, "ios.11-arm64": { "#import": [ "ios.11", - "ios-arm64" + "ios.10-arm64" ] }, "ios.11-x64": { "#import": [ "ios.11", - "ios-x64" + "ios.10-x64" ] }, "ios.12": { @@ -895,6 +924,52 @@ "ios.12-x64" ] }, + "ios.8": { + "#import": [ + "ios" + ] + }, + "ios.8-arm": { + "#import": [ + "ios.8", + "ios-arm" + ] + }, + "ios.8-arm64": { + "#import": [ + "ios.8", + "ios-arm64" + ] + }, + "ios.8-x64": { + "#import": [ + "ios.8", + "ios-x64" + ] + }, + "ios.9": { + "#import": [ + "ios.8" + ] + }, + "ios.9-arm": { + "#import": [ + "ios.9", + "ios.8-arm" + ] + }, + "ios.9-arm64": { + "#import": [ + "ios.9", + "ios.8-arm64" + ] + }, + "ios.9-x64": { + "#import": [ + "ios.9", + "ios.8-x64" + ] + }, "linux": { "#import": [ "unix" diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props index 06a8e3db8d0a8..4d7d03bf1d3ed 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props @@ -57,11 +57,15 @@ x64 + + unix + arm + 8;9;10 + unix arm64;x64 - - 11;12;13 + 8;9;10;11;12;13