From 8b1b6219cc71e9ec24c55bd5c02959ca9477103a Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Tue, 14 Jun 2022 22:57:53 +0200
Subject: [PATCH 1/2] add missing RID for Fedora 37 and Ubuntu 22.04

---
 eng/Packaging.props                           |   2 +-
 .../runtime.compatibility.json                | 118 +++++++++++++++++-
 pkg/Microsoft.NETCore.Platforms/runtime.json  |  57 +++++++++
 .../runtimeGroups.props                       |   4 +-
 .../packageIndex.json                         |   5 +-
 5 files changed, 180 insertions(+), 6 deletions(-)

diff --git a/eng/Packaging.props b/eng/Packaging.props
index c37014c7b6f4..2a4aaec5b006 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -27,7 +27,7 @@
     <PackageVersion Condition="'$(PackageVersion)' == ''">4.7.0</PackageVersion>
     <!-- major.minor.release version of the platforms package we're currently building
          Pre-release will be appended during build -->
-    <PlatformPackageVersion>3.1.11</PlatformPackageVersion>
+    <PlatformPackageVersion>3.1.12</PlatformPackageVersion>
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
     <SkipGenerationCheck>true</SkipGenerationCheck>
     <!-- The index check here is used to determine if the assembly is containted in a stable package version.
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index e8f79d39b201..d0e861f3e2d2 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -327,7 +327,6 @@
     "any",
     "base"
   ],
-
   "alpine.3.6": [
     "alpine.3.6",
     "alpine",
@@ -1472,6 +1471,38 @@
     "any",
     "base"
   ],
+  "fedora.37": [
+    "fedora.37",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.37-arm64": [
+    "fedora.37-arm64",
+    "fedora.37",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.37-x64": [
+    "fedora.37-x64",
+    "fedora.37",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "freebsd": [
     "freebsd",
     "unix",
@@ -3048,6 +3079,26 @@
     "any",
     "base"
   ],
+  "rhel.6": [
+    "rhel.6",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.6-x64": [
+    "rhel.6-x64",
+    "rhel.6",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.7": [
     "rhel.7",
     "rhel",
@@ -4791,6 +4842,71 @@
     "any",
     "base"
   ],
+  "ubuntu.22.04": [
+    "ubuntu.22.04",
+    "ubuntu",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.04-arm": [
+    "ubuntu.22.04-arm",
+    "ubuntu.22.04",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.04-arm64": [
+    "ubuntu.22.04-arm64",
+    "ubuntu.22.04",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.04-x64": [
+    "ubuntu.22.04-x64",
+    "ubuntu.22.04",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.04-x86": [
+    "ubuntu.22.04-x86",
+    "ubuntu.22.04",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
   "unix": [
     "unix",
     "any",
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 13d8bcfb48c4..eb8a9897a7f3 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -690,6 +690,23 @@
         "fedora-x64"
       ]
     },
+    "fedora.37": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.37-arm64": {
+      "#import": [
+        "fedora.37",
+        "fedora-arm64"
+      ]
+    },
+    "fedora.37-x64": {
+      "#import": [
+        "fedora.37",
+        "fedora-x64"
+      ]
+    },
     "freebsd": {
       "#import": [
         "unix"
@@ -1346,6 +1363,17 @@
         "linux-x64"
       ]
     },
+    "rhel.6": {
+      "#import": [
+        "rhel"
+      ]
+    },
+    "rhel.6-x64": {
+      "#import": [
+        "rhel.6",
+        "rhel-x64"
+      ]
+    },
     "rhel.7": {
       "#import": [
         "rhel"
@@ -2110,6 +2138,35 @@
         "ubuntu-x86"
       ]
     },
+    "ubuntu.22.04": {
+      "#import": [
+        "ubuntu"
+      ]
+    },
+    "ubuntu.22.04-arm": {
+      "#import": [
+        "ubuntu.22.04",
+        "ubuntu-arm"
+      ]
+    },
+    "ubuntu.22.04-arm64": {
+      "#import": [
+        "ubuntu.22.04",
+        "ubuntu-arm64"
+      ]
+    },
+    "ubuntu.22.04-x64": {
+      "#import": [
+        "ubuntu.22.04",
+        "ubuntu-x64"
+      ]
+    },
+    "ubuntu.22.04-x86": {
+      "#import": [
+        "ubuntu.22.04",
+        "ubuntu-x86"
+      ]
+    },
     "unix": {
       "#import": [
         "any"
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index ffbe35200a4f..5c7dae978d2d 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -55,7 +55,7 @@
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36</Versions>
+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
@@ -158,7 +158,7 @@
     <RuntimeGroup Include="ubuntu">
       <Parent>debian</Parent>
       <Architectures>x64;x86;arm;arm64</Architectures>
-      <Versions>16.04;16.10;17.04;17.10;18.04;18.10;19.04;19.10;20.04;20.10;21.04;21.10</Versions>
+      <Versions>16.04;16.10;17.04;17.10;18.04;18.10;19.04;19.10;20.04;20.10;21.04;21.10;22.04</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index ca3aa29e8129..7bc9b0fcf458 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -205,9 +205,10 @@
         "3.1.8",
         "3.1.9",
         "3.1.10",
-        "3.1.11"
+        "3.1.11",
+        "3.1.12"
       ],
-      "BaselineVersion": "3.1.11",
+      "BaselineVersion": "3.1.12",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Platforms.Future": {

From 14b80734ea0dfed7b00dad62fc52834cdf4c0808 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Wed, 15 Jun 2022 10:12:35 -0700
Subject: [PATCH 2/2] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr build 20220510.2
 (#43147)

Microsoft.NET.Sdk.IL , Microsoft.NETCore.ILAsm , Microsoft.NETCore.Runtime.CoreCLR
 From Version 3.1.25-servicing.22212.2 -> To Version 3.1.26-servicing.22260.2

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 global.json             |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b7105faa543c..2a2a1085747b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.25-servicing.22212.2">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.26-servicing.22260.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
-      <Sha>6c41c82d62452723c1b46c3b894e595185cf66c2</Sha>
+      <Sha>a68754518ab564aec1fa09b5a3c3b8ddc2ba2a31</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.25-servicing.22212.2">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.26-servicing.22260.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
-      <Sha>6c41c82d62452723c1b46c3b894e595185cf66c2</Sha>
+      <Sha>a68754518ab564aec1fa09b5a3c3b8ddc2ba2a31</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.25-servicing.22212.2">
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.26-servicing.22260.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
-      <Sha>6c41c82d62452723c1b46c3b894e595185cf66c2</Sha>
+      <Sha>a68754518ab564aec1fa09b5a3c3b8ddc2ba2a31</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 554187a13c0b..501aca5c1eeb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,9 +53,9 @@
     <MicrosoftNETCoreDotNetHostPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPackageVersion>
     <MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
     <!-- Coreclr dependencies -->
-    <MicrosoftNETSdkILPackageVersion>3.1.25-servicing.22212.2</MicrosoftNETSdkILPackageVersion>
-    <MicrosoftNETCoreILAsmPackageVersion>3.1.25-servicing.22212.2</MicrosoftNETCoreILAsmPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.25-servicing.22212.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETSdkILPackageVersion>3.1.26-servicing.22260.2</MicrosoftNETSdkILPackageVersion>
+    <MicrosoftNETCoreILAsmPackageVersion>3.1.26-servicing.22260.2</MicrosoftNETCoreILAsmPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.26-servicing.22260.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <!-- Corefx dependencies -->
     <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
     <runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
diff --git a/global.json b/global.json
index bb9a292be4af..5a69c53e8f2c 100644
--- a/global.json
+++ b/global.json
@@ -12,6 +12,6 @@
     "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.21552.6",
     "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.21552.6",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
-    "Microsoft.NET.Sdk.IL": "3.1.25-servicing.22212.2"
+    "Microsoft.NET.Sdk.IL": "3.1.26-servicing.22260.2"
   }
 }