Merge pull request #32623 from joshfree/release/2.1

Increment Microsoft.NETCore.Platforms version
dotnet · Oct 4, 2018 · 933b031 · 933b031
2 parents cc4bb7b + 3aaa88f
commit 933b031
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 1 deletion.
diff --git a/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj b/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <PackageVersion>2.1.1</PackageVersion>
+    <PackageVersion>2.1.2</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>

diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -7220,6 +7220,31 @@
     "any",
     "base"
   ],
+  "ubuntu.18.10-arm-corert": [
+    "ubuntu.18.10-arm-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-arm",
+    "ubuntu.18.10",
+    "ubuntu-arm-corert",
+    "ubuntu-corert",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm-corert",
+    "debian-corert",
+    "debian-arm",
+    "debian",
+    "linux-arm-corert",
+    "linux-corert",
+    "linux-arm",
+    "linux",
+    "unix-arm-corert",
+    "unix-corert",
+    "unix-arm",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "ubuntu.18.10-arm64": [
     "ubuntu.18.10-arm64",
     "ubuntu.18.10",
@@ -7234,6 +7259,46 @@
     "any",
     "base"
   ],
+  "ubuntu.18.10-arm64-corert": [
+    "ubuntu.18.10-arm64-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-arm64",
+    "ubuntu.18.10",
+    "ubuntu-arm64-corert",
+    "ubuntu-corert",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64-corert",
+    "debian-corert",
+    "debian-arm64",
+    "debian",
+    "linux-arm64-corert",
+    "linux-corert",
+    "linux-arm64",
+    "linux",
+    "unix-arm64-corert",
+    "unix-corert",
+    "unix-arm64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-corert": [
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10",
+    "ubuntu-corert",
+    "ubuntu",
+    "debian-corert",
+    "debian",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "ubuntu.18.10-x64": [
     "ubuntu.18.10-x64",
     "ubuntu.18.10",
@@ -7248,6 +7313,31 @@
     "any",
     "base"
   ],
+  "ubuntu.18.10-x64-corert": [
+    "ubuntu.18.10-x64-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-x64",
+    "ubuntu.18.10",
+    "ubuntu-x64-corert",
+    "ubuntu-corert",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64-corert",
+    "debian-corert",
+    "debian-x64",
+    "debian",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "ubuntu.18.10-x86": [
     "ubuntu.18.10-x86",
     "ubuntu.18.10",
@@ -7262,6 +7352,31 @@
     "any",
     "base"
   ],
+  "ubuntu.18.10-x86-corert": [
+    "ubuntu.18.10-x86-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-x86",
+    "ubuntu.18.10",
+    "ubuntu-x86-corert",
+    "ubuntu-corert",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86-corert",
+    "debian-corert",
+    "debian-x86",
+    "debian",
+    "linux-x86-corert",
+    "linux-corert",
+    "linux-x86",
+    "linux",
+    "unix-x86-corert",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "unix": [
     "unix",
     "any",

diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -2685,24 +2685,62 @@
         "ubuntu-arm"
       ]
     },
+    "ubuntu.18.10-arm-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-arm",
+        "ubuntu.18.10",
+        "ubuntu-arm-corert"
+      ]
+    },
     "ubuntu.18.10-arm64": {
       "#import": [
         "ubuntu.18.10",
         "ubuntu-arm64"
       ]
     },
+    "ubuntu.18.10-arm64-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-arm64",
+        "ubuntu.18.10",
+        "ubuntu-arm64-corert"
+      ]
+    },
+    "ubuntu.18.10-corert": {
+      "#import": [
+        "ubuntu.18.10",
+        "ubuntu-corert"
+      ]
+    },
     "ubuntu.18.10-x64": {
       "#import": [
         "ubuntu.18.10",
         "ubuntu-x64"
       ]
     },
+    "ubuntu.18.10-x64-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-x64",
+        "ubuntu.18.10",
+        "ubuntu-x64-corert"
+      ]
+    },
     "ubuntu.18.10-x86": {
       "#import": [
         "ubuntu.18.10",
         "ubuntu-x86"
       ]
     },
+    "ubuntu.18.10-x86-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-x86",
+        "ubuntu.18.10",
+        "ubuntu-x86-corert"
+      ]
+    },
     "unix": {
       "#import": [
         "any"

diff --git a/src/packages.builds b/src/packages.builds
@@ -24,6 +24,9 @@
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
     <!-- add specific builds / pkgproj's here to include in servicing builds -->
+    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->