200 lines
4.7 KiB
Diff
200 lines
4.7 KiB
Diff
From 09e477fd876de48614d728fbd6582db2a0f203b7 Mon Sep 17 00:00:00 2001
|
|
From: "build@apk-groulx" <build@apk-groulx.praxis>
|
|
Date: Mon, 29 Nov 2021 20:39:25 +0000
|
|
Subject: [PATCH 1/1] add RID for Alpine 3.15
|
|
|
|
---
|
|
.../runtime.compatibility.json | 116 +++++++++++++++++-
|
|
.../Microsoft.NETCore.Platforms/runtime.json | 25 +++-
|
|
.../runtimeGroups.props | 2 +-
|
|
3 files changed, 140 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
|
index 844590f8022..7d7517f043b 100644
|
|
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
|
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
|
@@ -508,6 +508,120 @@
|
|
"any",
|
|
"base"
|
|
],
|
|
+ "alpine.3.15": [
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14",
|
|
+ "alpine.3.13",
|
|
+ "alpine.3.12",
|
|
+ "alpine.3.11",
|
|
+ "alpine.3.10",
|
|
+ "alpine.3.9",
|
|
+ "alpine.3.8",
|
|
+ "alpine.3.7",
|
|
+ "alpine.3.6",
|
|
+ "alpine",
|
|
+ "linux-musl",
|
|
+ "linux",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "alpine.3.15-arm": [
|
|
+ "alpine.3.15-arm",
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14-arm",
|
|
+ "alpine.3.14",
|
|
+ "alpine.3.13-arm",
|
|
+ "alpine.3.13",
|
|
+ "alpine.3.12-arm",
|
|
+ "alpine.3.12",
|
|
+ "alpine.3.11-arm",
|
|
+ "alpine.3.11",
|
|
+ "alpine.3.10-arm",
|
|
+ "alpine.3.10",
|
|
+ "alpine.3.9-arm",
|
|
+ "alpine.3.9",
|
|
+ "alpine.3.8-arm",
|
|
+ "alpine.3.8",
|
|
+ "alpine.3.7-arm",
|
|
+ "alpine.3.7",
|
|
+ "alpine.3.6-arm",
|
|
+ "alpine.3.6",
|
|
+ "alpine-arm",
|
|
+ "alpine",
|
|
+ "linux-musl-arm",
|
|
+ "linux-musl",
|
|
+ "linux-arm",
|
|
+ "linux",
|
|
+ "unix-arm",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "alpine.3.15-arm64": [
|
|
+ "alpine.3.15-arm64",
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14-arm64",
|
|
+ "alpine.3.14",
|
|
+ "alpine.3.13-arm64",
|
|
+ "alpine.3.13",
|
|
+ "alpine.3.12-arm64",
|
|
+ "alpine.3.12",
|
|
+ "alpine.3.11-arm64",
|
|
+ "alpine.3.11",
|
|
+ "alpine.3.10-arm64",
|
|
+ "alpine.3.10",
|
|
+ "alpine.3.9-arm64",
|
|
+ "alpine.3.9",
|
|
+ "alpine.3.8-arm64",
|
|
+ "alpine.3.8",
|
|
+ "alpine.3.7-arm64",
|
|
+ "alpine.3.7",
|
|
+ "alpine.3.6-arm64",
|
|
+ "alpine.3.6",
|
|
+ "alpine-arm64",
|
|
+ "alpine",
|
|
+ "linux-musl-arm64",
|
|
+ "linux-musl",
|
|
+ "linux-arm64",
|
|
+ "linux",
|
|
+ "unix-arm64",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "alpine.3.15-x64": [
|
|
+ "alpine.3.15-x64",
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14-x64",
|
|
+ "alpine.3.14",
|
|
+ "alpine.3.13-x64",
|
|
+ "alpine.3.13",
|
|
+ "alpine.3.12-x64",
|
|
+ "alpine.3.12",
|
|
+ "alpine.3.11-x64",
|
|
+ "alpine.3.11",
|
|
+ "alpine.3.10-x64",
|
|
+ "alpine.3.10",
|
|
+ "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"
|
|
+ ],
|
|
"alpine.3.6": [
|
|
"alpine.3.6",
|
|
"alpine",
|
|
@@ -7239,4 +7353,4 @@
|
|
"any",
|
|
"base"
|
|
]
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
|
|
index 7d6aa102b50..ea7eac422b8 100644
|
|
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
|
|
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
|
|
@@ -138,6 +138,29 @@
|
|
"alpine.3.13-x64"
|
|
]
|
|
},
|
|
+ "alpine.3.15": {
|
|
+ "#import": [
|
|
+ "alpine.3.14"
|
|
+ ]
|
|
+ },
|
|
+ "alpine.3.15-arm": {
|
|
+ "#import": [
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14-arm"
|
|
+ ]
|
|
+ },
|
|
+ "alpine.3.15-arm64": {
|
|
+ "#import": [
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14-arm64"
|
|
+ ]
|
|
+ },
|
|
+ "alpine.3.15-x64": {
|
|
+ "#import": [
|
|
+ "alpine.3.15",
|
|
+ "alpine.3.14-x64"
|
|
+ ]
|
|
+ },
|
|
"alpine.3.6": {
|
|
"#import": [
|
|
"alpine"
|
|
@@ -3196,4 +3219,4 @@
|
|
]
|
|
}
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
|
index 3cb3d2df858..c7a346d1672 100644
|
|
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
|
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
|
@@ -16,7 +16,7 @@
|
|
<RuntimeGroup Include="alpine">
|
|
<Parent>linux-musl</Parent>
|
|
<Architectures>x64;arm;arm64</Architectures>
|
|
- <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14</Versions>
|
|
+ <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15</Versions>
|
|
</RuntimeGroup>
|
|
|
|
<RuntimeGroup Include="android">
|
|
--
|
|
2.34.0
|
|
|