diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json index a409a5751e7f..35280070d1e2 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json @@ -1,6 +1,7 @@ { "alpine": [ "alpine", + "linux-musl", "unix", "any", "base" @@ -8,6 +9,8 @@ "alpine-corert": [ "alpine-corert", "alpine", + "linux-musl-corert", + "linux-musl", "unix-corert", "unix", "corert", @@ -17,6 +20,8 @@ "alpine-x64": [ "alpine-x64", "alpine", + "linux-musl-x64", + "linux-musl", "unix-x64", "unix", "any", @@ -26,8 +31,12 @@ "alpine-x64-corert", "alpine-corert", "alpine-x64", - "unix-x64-corert", + "linux-musl-x64-corert", "alpine", + "linux-musl-corert", + "linux-musl-x64", + "unix-x64-corert", + "linux-musl", "unix-corert", "unix-x64", "unix", @@ -38,6 +47,7 @@ "alpine.3.6": [ "alpine.3.6", "alpine", + "linux-musl", "unix", "any", "base" @@ -47,6 +57,8 @@ "alpine.3.6", "alpine-corert", "alpine", + "linux-musl-corert", + "linux-musl", "unix-corert", "unix", "corert", @@ -58,6 +70,8 @@ "alpine.3.6", "alpine-x64", "alpine", + "linux-musl-x64", + "linux-musl", "unix-x64", "unix", "any", @@ -72,6 +86,73 @@ "alpine-corert", "alpine-x64", "alpine", + "linux-musl-x64-corert", + "linux-musl-corert", + "linux-musl-x64", + "linux-musl", + "unix-x64-corert", + "unix-corert", + "unix-x64", + "unix", + "corert", + "any", + "base" + ], + "alpine.3.7": [ + "alpine.3.7", + "alpine.3.6", + "alpine", + "linux-musl", + "unix", + "any", + "base" + ], + "alpine.3.7-corert": [ + "alpine.3.7-corert", + "alpine.3.7", + "alpine.3.6-corert", + "alpine.3.6", + "alpine-corert", + "alpine", + "linux-musl-corert", + "linux-musl", + "unix-corert", + "unix", + "corert", + "any", + "base" + ], + "alpine.3.7-x64": [ + "alpine.3.7-x64", + "alpine.3.7", + "alpine.3.6-x64", + "alpine.3.6", + "alpine-x64", + "alpine", + "linux-musl-x64", + "linux-musl", + "unix-x64", + "unix", + "any", + "base" + ], + "alpine.3.7-x64-corert": [ + "alpine.3.7-x64-corert", + "alpine.3.7-corert", + "alpine.3.7-x64", + "alpine.3.7", + "alpine.3.6-x64-corert", + "alpine.3.6-corert", + "alpine.3.6-x64", + "alpine.3.6", + "alpine-x64-corert", + "alpine-corert", + "alpine-x64", + "alpine", + "linux-musl-x64-corert", + "linux-musl-corert", + "linux-musl-x64", + "linux-musl", "unix-x64-corert", "unix-corert", "unix-x64", @@ -82,12 +163,15 @@ ], "android": [ "android", + "unix", "any", "base" ], "android-arm": [ "android-arm", "android", + "unix-arm", + "unix", "any", "base" ], @@ -95,7 +179,11 @@ "android-arm-corert", "android-corert", "android-arm", + "unix-arm-corert", "android", + "unix-corert", + "unix-arm", + "unix", "corert", "any", "base" @@ -103,6 +191,8 @@ "android-arm64": [ "android-arm64", "android", + "unix-arm64", + "unix", "any", "base" ], @@ -110,7 +200,11 @@ "android-arm64-corert", "android-corert", "android-arm64", + "unix-arm64-corert", "android", + "unix-corert", + "unix-arm64", + "unix", "corert", "any", "base" @@ -118,6 +212,8 @@ "android-corert": [ "android-corert", "android", + "unix-corert", + "unix", "corert", "any", "base" @@ -125,6 +221,7 @@ "android.21": [ "android.21", "android", + "unix", "any", "base" ], @@ -133,6 +230,8 @@ "android.21", "android-arm", "android", + "unix-arm", + "unix", "any", "base" ], @@ -145,6 +244,10 @@ "android-corert", "android-arm", "android", + "unix-arm-corert", + "unix-corert", + "unix-arm", + "unix", "corert", "any", "base" @@ -154,6 +257,8 @@ "android.21", "android-arm64", "android", + "unix-arm64", + "unix", "any", "base" ], @@ -166,6 +271,10 @@ "android-corert", "android-arm64", "android", + "unix-arm64-corert", + "unix-corert", + "unix-arm64", + "unix", "corert", "any", "base" @@ -175,6 +284,8 @@ "android.21", "android-corert", "android", + "unix-corert", + "unix", "corert", "any", "base" @@ -1338,6 +1449,126 @@ "any", "base" ], + "linux-musl": [ + "linux-musl", + "unix", + "any", + "base" + ], + "linux-musl-arm": [ + "linux-musl-arm", + "linux-musl", + "unix-arm", + "unix", + "any", + "base" + ], + "linux-musl-arm-corert": [ + "linux-musl-arm-corert", + "linux-musl-corert", + "linux-musl-arm", + "unix-arm-corert", + "linux-musl", + "unix-corert", + "unix-arm", + "unix", + "corert", + "any", + "base" + ], + "linux-musl-arm64": [ + "linux-musl-arm64", + "linux-musl", + "unix-arm64", + "unix", + "any", + "base" + ], + "linux-musl-arm64-corert": [ + "linux-musl-arm64-corert", + "linux-musl-corert", + "linux-musl-arm64", + "unix-arm64-corert", + "linux-musl", + "unix-corert", + "unix-arm64", + "unix", + "corert", + "any", + "base" + ], + "linux-musl-armel": [ + "linux-musl-armel", + "linux-musl", + "unix-armel", + "unix", + "any", + "base" + ], + "linux-musl-armel-corert": [ + "linux-musl-armel-corert", + "linux-musl-corert", + "linux-musl-armel", + "unix-armel-corert", + "linux-musl", + "unix-corert", + "unix-armel", + "unix", + "corert", + "any", + "base" + ], + "linux-musl-corert": [ + "linux-musl-corert", + "linux-musl", + "unix-corert", + "unix", + "corert", + "any", + "base" + ], + "linux-musl-x64": [ + "linux-musl-x64", + "linux-musl", + "unix-x64", + "unix", + "any", + "base" + ], + "linux-musl-x64-corert": [ + "linux-musl-x64-corert", + "linux-musl-corert", + "linux-musl-x64", + "unix-x64-corert", + "linux-musl", + "unix-corert", + "unix-x64", + "unix", + "corert", + "any", + "base" + ], + "linux-musl-x86": [ + "linux-musl-x86", + "linux-musl", + "unix-x86", + "unix", + "any", + "base" + ], + "linux-musl-x86-corert": [ + "linux-musl-x86-corert", + "linux-musl-corert", + "linux-musl-x86", + "unix-x86-corert", + "linux-musl", + "unix-corert", + "unix-x86", + "unix", + "corert", + "any", + "base" + ], "linux-x64": [ "linux-x64", "linux", diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json index 9165dd5f87b9..33a1a03d328e 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -2,26 +2,26 @@ "runtimes": { "alpine": { "#import": [ - "unix" + "linux-musl" ] }, "alpine-corert": { "#import": [ "alpine", - "unix-corert" + "linux-musl-corert" ] }, "alpine-x64": { "#import": [ "alpine", - "unix-x64" + "linux-musl-x64" ] }, "alpine-x64-corert": { "#import": [ "alpine-corert", "alpine-x64", - "unix-x64-corert" + "linux-musl-x64-corert" ] }, "alpine.3.6": { @@ -49,37 +49,66 @@ "alpine-x64-corert" ] }, + "alpine.3.7": { + "#import": [ + "alpine.3.6" + ] + }, + "alpine.3.7-corert": { + "#import": [ + "alpine.3.7", + "alpine.3.6-corert" + ] + }, + "alpine.3.7-x64": { + "#import": [ + "alpine.3.7", + "alpine.3.6-x64" + ] + }, + "alpine.3.7-x64-corert": { + "#import": [ + "alpine.3.7-corert", + "alpine.3.7-x64", + "alpine.3.7", + "alpine.3.6-x64-corert" + ] + }, "android": { "#import": [ - "any" + "unix" ] }, "android-arm": { "#import": [ - "android" + "android", + "unix-arm" ] }, "android-arm-corert": { "#import": [ "android-corert", - "android-arm" + "android-arm", + "unix-arm-corert" ] }, "android-arm64": { "#import": [ - "android" + "android", + "unix-arm64" ] }, "android-arm64-corert": { "#import": [ "android-corert", - "android-arm64" + "android-arm64", + "unix-arm64-corert" ] }, "android-corert": { "#import": [ "android", - "corert" + "unix-corert" ] }, "android.21": { @@ -677,6 +706,82 @@ "unix-corert" ] }, + "linux-musl": { + "#import": [ + "unix" + ] + }, + "linux-musl-arm": { + "#import": [ + "linux-musl", + "unix-arm" + ] + }, + "linux-musl-arm-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-arm", + "unix-arm-corert" + ] + }, + "linux-musl-arm64": { + "#import": [ + "linux-musl", + "unix-arm64" + ] + }, + "linux-musl-arm64-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-arm64", + "unix-arm64-corert" + ] + }, + "linux-musl-armel": { + "#import": [ + "linux-musl", + "unix-armel" + ] + }, + "linux-musl-armel-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-armel", + "unix-armel-corert" + ] + }, + "linux-musl-corert": { + "#import": [ + "linux-musl", + "unix-corert" + ] + }, + "linux-musl-x64": { + "#import": [ + "linux-musl", + "unix-x64" + ] + }, + "linux-musl-x64-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-x64", + "unix-x64-corert" + ] + }, + "linux-musl-x86": { + "#import": [ + "linux-musl", + "unix-x86" + ] + }, + "linux-musl-x86-corert": { + "#import": [ + "linux-musl-corert", + "linux-musl-x86", + "unix-x86-corert" + ] + }, "linux-x64": { "#import": [ "linux", diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props index 1255cbf1ff4b..8ca07e49380d 100644 --- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props @@ -9,15 +9,19 @@ unix x64;x86;arm;armel;arm64 + + unix + x64;x86;arm;armel;arm64 + - unix + linux-musl x64 - 3.6 + 3.6;3.7 - any + unix arm;arm64 21 @@ -163,4 +167,4 @@ RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml" UpdateRuntimeFiles="$(UpdateRuntimeFiles)" /> - \ No newline at end of file +