diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj
index 997904f57d4d63..fa4e2326a573fb 100644
--- a/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
index 5bb9d46a3a8f55..4d0933db75b09a 100644
--- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
+++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
@@ -118,4 +118,7 @@
+
+
+
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
index 526780399721c7..ff7628e9ebc6a8 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
@@ -35,4 +35,7 @@
+
+
+
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 41a7e17807e7cb..1d4238b12fbe32 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -7,6 +7,18 @@
"any",
"base"
],
+ "alpine-arm64": [
+ "alpine-arm64",
+ "alpine",
+ "linux-musl-arm64",
+ "linux-musl",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
"alpine-x64": [
"alpine-x64",
"alpine",
@@ -32,6 +44,28 @@
"any",
"base"
],
+ "alpine.3.10-arm64": [
+ "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.10-x64": [
"alpine.3.10-x64",
"alpine.3.10",
@@ -68,6 +102,30 @@
"any",
"base"
],
+ "alpine.3.11-arm64": [
+ "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.11-x64": [
"alpine.3.11-x64",
"alpine.3.11",
@@ -107,6 +165,32 @@
"any",
"base"
],
+ "alpine.3.12-arm64": [
+ "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.12-x64": [
"alpine.3.12-x64",
"alpine.3.12",
@@ -142,6 +226,20 @@
"any",
"base"
],
+ "alpine.3.6-arm64": [
+ "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.6-x64": [
"alpine.3.6-x64",
"alpine.3.6",
@@ -166,6 +264,22 @@
"any",
"base"
],
+ "alpine.3.7-arm64": [
+ "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.7-x64": [
"alpine.3.7-x64",
"alpine.3.7",
@@ -193,6 +307,24 @@
"any",
"base"
],
+ "alpine.3.8-arm64": [
+ "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.8-x64": [
"alpine.3.8-x64",
"alpine.3.8",
@@ -223,6 +355,26 @@
"any",
"base"
],
+ "alpine.3.9-arm64": [
+ "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.9-x64": [
"alpine.3.9-x64",
"alpine.3.9",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 4584c45f8e267e..b0c04b16cfb0cb 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -5,6 +5,12 @@
"linux-musl"
]
},
+ "alpine-arm64": {
+ "#import": [
+ "alpine",
+ "linux-musl-arm64"
+ ]
+ },
"alpine-x64": {
"#import": [
"alpine",
@@ -16,6 +22,12 @@
"alpine.3.9"
]
},
+ "alpine.3.10-arm64": {
+ "#import": [
+ "alpine.3.10",
+ "alpine.3.9-arm64"
+ ]
+ },
"alpine.3.10-x64": {
"#import": [
"alpine.3.10",
@@ -27,6 +39,12 @@
"alpine.3.10"
]
},
+ "alpine.3.11-arm64": {
+ "#import": [
+ "alpine.3.11",
+ "alpine.3.10-arm64"
+ ]
+ },
"alpine.3.11-x64": {
"#import": [
"alpine.3.11",
@@ -38,6 +56,12 @@
"alpine.3.11"
]
},
+ "alpine.3.12-arm64": {
+ "#import": [
+ "alpine.3.12",
+ "alpine.3.11-arm64"
+ ]
+ },
"alpine.3.12-x64": {
"#import": [
"alpine.3.12",
@@ -49,6 +73,12 @@
"alpine"
]
},
+ "alpine.3.6-arm64": {
+ "#import": [
+ "alpine.3.6",
+ "alpine-arm64"
+ ]
+ },
"alpine.3.6-x64": {
"#import": [
"alpine.3.6",
@@ -60,6 +90,12 @@
"alpine.3.6"
]
},
+ "alpine.3.7-arm64": {
+ "#import": [
+ "alpine.3.7",
+ "alpine.3.6-arm64"
+ ]
+ },
"alpine.3.7-x64": {
"#import": [
"alpine.3.7",
@@ -71,6 +107,12 @@
"alpine.3.7"
]
},
+ "alpine.3.8-arm64": {
+ "#import": [
+ "alpine.3.8",
+ "alpine.3.7-arm64"
+ ]
+ },
"alpine.3.8-x64": {
"#import": [
"alpine.3.8",
@@ -82,6 +124,12 @@
"alpine.3.8"
]
},
+ "alpine.3.9-arm64": {
+ "#import": [
+ "alpine.3.9",
+ "alpine.3.8-arm64"
+ ]
+ },
"alpine.3.9-x64": {
"#import": [
"alpine.3.9",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index 49876be074df16..a298540f94d8fa 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -15,7 +15,7 @@
linux-musl
- x64
+ x64;arm64
3.6;3.7;3.8;3.9;3.10;3.11;3.12
diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj
index e9ac35fcb8d2f4..7d841e4691f9b4 100644
--- a/src/libraries/restore/runtime/runtime.depproj
+++ b/src/libraries/restore/runtime/runtime.depproj
@@ -20,13 +20,6 @@
Exclude here so that when building with the 2.x SDK we don't place it in the test shared framework.
This can be removed once we have a new SDK -->
-
-
-
-
-
-
-
@@ -36,7 +29,6 @@
hostfxr
@@ -49,13 +41,7 @@
false
-
-
-
-
-
-
-
+
@@ -70,12 +56,6 @@
SkipUnchangedFiles="true"
UseHardlinksIfPossible="$(UseHardlink)" />
-
-
@@ -111,12 +91,7 @@
-
-
-
-
-
+ Condition="'$(RuntimeFlavor)' == 'Mono'" />