From 4149d3e88447c4cc9980951210601397a4af3655 Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Fri, 5 Feb 2021 11:55:28 -0800
Subject: [PATCH] add Alpine 3.13 and Fedora 34 to RID graph

---
 .../Microsoft.NETCore.Platforms.pkgproj       |   2 +-
 .../runtime.compatibility.json                | 180 ++++++++++++++++++
 pkg/Microsoft.NETCore.Platforms/runtime.json  |  50 +++++
 .../runtimeGroups.props                       |   4 +-
 src/packages.builds                           |   3 +
 5 files changed, 236 insertions(+), 3 deletions(-)

diff --git a/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj b/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
index 8ee89202b5d3..38ec9bbdf834 100644
--- 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.12</PackageVersion>
+    <PackageVersion>2.1.13</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
index 8d58dd04411d..3af8efe80336 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -377,6 +377,132 @@
     "any",
     "base"
   ],
+  "alpine.3.13": [
+    "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.13-corert": [
+    "alpine.3.13-corert",
+    "alpine.3.13",
+    "alpine.3.12-corert",
+    "alpine.3.12",
+    "alpine.3.11-corert",
+    "alpine.3.11",
+    "alpine.3.10-corert",
+    "alpine.3.10",
+    "alpine.3.9-corert",
+    "alpine.3.9",
+    "alpine.3.8-corert",
+    "alpine.3.8",
+    "alpine.3.7-corert",
+    "alpine.3.7",
+    "alpine.3.6-corert",
+    "alpine.3.6",
+    "alpine-corert",
+    "alpine",
+    "linux-musl-corert",
+    "linux-musl",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "alpine.3.13-x64": [
+    "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.13-x64-corert": [
+    "alpine.3.13-x64-corert",
+    "alpine.3.13-corert",
+    "alpine.3.13-x64",
+    "alpine.3.13",
+    "alpine.3.12-x64-corert",
+    "alpine.3.12-corert",
+    "alpine.3.12-x64",
+    "alpine.3.12",
+    "alpine.3.11-x64-corert",
+    "alpine.3.11-corert",
+    "alpine.3.11-x64",
+    "alpine.3.11",
+    "alpine.3.10-x64-corert",
+    "alpine.3.10-corert",
+    "alpine.3.10-x64",
+    "alpine.3.10",
+    "alpine.3.9-x64-corert",
+    "alpine.3.9-corert",
+    "alpine.3.9-x64",
+    "alpine.3.9",
+    "alpine.3.8-x64-corert",
+    "alpine.3.8-corert",
+    "alpine.3.8-x64",
+    "alpine.3.8",
+    "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",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "alpine.3.6": [
     "alpine.3.6",
     "alpine",
@@ -2405,6 +2531,60 @@
     "any",
     "base"
   ],
+  "fedora.34": [
+    "fedora.34",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.34-corert": [
+    "fedora.34-corert",
+    "fedora.34",
+    "fedora-corert",
+    "fedora",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "fedora.34-x64": [
+    "fedora.34-x64",
+    "fedora.34",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.34-x64-corert": [
+    "fedora.34-x64-corert",
+    "fedora.34-corert",
+    "fedora.34-x64",
+    "fedora.34",
+    "fedora-x64-corert",
+    "fedora-corert",
+    "fedora-x64",
+    "fedora",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "gentoo": [
     "gentoo",
     "linux",
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index ccf1ffa742b6..ab5f1cd8a8f8 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -99,6 +99,31 @@
         "alpine.3.11-x64-corert"
       ]
     },
+    "alpine.3.13": {
+      "#import": [
+        "alpine.3.12"
+      ]
+    },
+    "alpine.3.13-corert": {
+      "#import": [
+        "alpine.3.13",
+        "alpine.3.12-corert"
+      ]
+    },
+    "alpine.3.13-x64": {
+      "#import": [
+        "alpine.3.13",
+        "alpine.3.12-x64"
+      ]
+    },
+    "alpine.3.13-x64-corert": {
+      "#import": [
+        "alpine.3.13-corert",
+        "alpine.3.13-x64",
+        "alpine.3.13",
+        "alpine.3.12-x64-corert"
+      ]
+    },
     "alpine.3.6": {
       "#import": [
         "alpine"
@@ -991,6 +1016,31 @@
         "fedora-x64-corert"
       ]
     },
+    "fedora.34": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.34-corert": {
+      "#import": [
+        "fedora.34",
+        "fedora-corert"
+      ]
+    },
+    "fedora.34-x64": {
+      "#import": [
+        "fedora.34",
+        "fedora-x64"
+      ]
+    },
+    "fedora.34-x64-corert": {
+      "#import": [
+        "fedora.34-corert",
+        "fedora.34-x64",
+        "fedora.34",
+        "fedora-x64-corert"
+      ]
+    },
     "gentoo": {
       "#import": [
         "linux"
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index ede1c99a789c..602d9e1bdb79 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -17,7 +17,7 @@
     <RuntimeGroup Include="alpine">
       <Parent>linux-musl</Parent>
       <Architectures>x64</Architectures>
-      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12</Versions>
+      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="android">
@@ -44,7 +44,7 @@
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>23;24;25;26;27;28;29;30;31;32;33</Versions>
+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
diff --git a/src/packages.builds b/src/packages.builds
index 5f4d49c67406..95425aaf46af 100644
--- a/src/packages.builds
+++ b/src/packages.builds
@@ -27,6 +27,9 @@
     <Project Include="$(MSBuildThisFileDirectory)System.Drawing.Common\pkg\System.Drawing.Common.pkgproj">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
+    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->