From 9ceae543981d0c69ee64cb4e6cbf2f2844ea7446 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 23 Jan 2019 11:23:13 -0800 Subject: [PATCH] Adding alpine 3.8 to the RID graph (dotnet/corefx#34758) * Adding alpine 3.8 to the RID graph * Adding alpine 3.9 to the RID graph Commit migrated from https://github.com/dotnet/corefx/commit/47f042960fa1b9c651ca1370d5548852ffdcd339 --- .../runtime.compatibility.json | 61 ++++++++++++++++++++++ .../pkg/Microsoft.NETCore.Platforms/runtime.json | 22 ++++++++ .../runtimeGroups.props | 2 +- 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json index 545ee8e..64512cb 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json @@ -68,6 +68,67 @@ "any", "base" ], + "alpine.3.8": [ + "alpine.3.8", + "alpine.3.7", + "alpine.3.6", + "alpine", + "linux-musl", + "linux", + "unix", + "any", + "base" + ], + "alpine.3.8-x64": [ + "alpine.3.8-x64", + "alpine.3.8", + "alpine.3.7-x64", + "alpine.3.7", + "alpine.3.6-x64", + "alpine.3.6", + "alpine-x64", + "alpine", + "linux-musl-x64", + "linux-musl", + "linux-x64", + "linux", + "unix-x64", + "unix", + "any", + "base" + ], + "alpine.3.9": [ + "alpine.3.9", + "alpine.3.8", + "alpine.3.7", + "alpine.3.6", + "alpine", + "linux-musl", + "linux", + "unix", + "any", + "base" + ], + "alpine.3.9-x64": [ + "alpine.3.9-x64", + "alpine.3.9", + "alpine.3.8-x64", + "alpine.3.8", + "alpine.3.7-x64", + "alpine.3.7", + "alpine.3.6-x64", + "alpine.3.6", + "alpine-x64", + "alpine", + "linux-musl-x64", + "linux-musl", + "linux-x64", + "linux", + "unix-x64", + "unix", + "any", + "base" + ], "android": [ "android", "linux", diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json index 438e4a9..f9ee87f 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -33,6 +33,28 @@ "alpine.3.6-x64" ] }, + "alpine.3.8": { + "#import": [ + "alpine.3.7" + ] + }, + "alpine.3.8-x64": { + "#import": [ + "alpine.3.8", + "alpine.3.7-x64" + ] + }, + "alpine.3.9": { + "#import": [ + "alpine.3.8" + ] + }, + "alpine.3.9-x64": { + "#import": [ + "alpine.3.9", + "alpine.3.8-x64" + ] + }, "android": { "#import": [ "linux" diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props index 1069fbd..737c04e 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props @@ -17,7 +17,7 @@ linux-musl x64 - 3.6;3.7 + 3.6;3.7;3.8;3.9 -- 2.7.4