From eb3160d2412a75a1e3d883a346104a0967fbfd78 Mon Sep 17 00:00:00 2001
From: Dominik Viererbe <github@dviererbe.de>
Date: Tue, 16 May 2023 04:29:16 +0300
Subject: [PATCH] Add Ubuntu 22.10 kinetic kudu RIDs for .NET 7 (#84984)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Ubuntu 22.10 kinetic kudu RIDs

* Add required OOB package authoring changes.

---------

Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
---
 .../src/Microsoft.NETCore.Platforms.csproj    |  4 +-
 .../src/runtime.compatibility.json            | 65 +++++++++++++++++++
 .../src/runtime.json                          | 29 +++++++++
 .../src/runtimeGroups.props                   |  2 +-
 4 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index 7bcc94c575a494..67af62b2d7f296 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -24,8 +24,8 @@
     <_generateRuntimeGraphTask>$([MSBuild]::NormalizePath('$(BaseOutputPath)', $(Configuration), '$(_generateRuntimeGraphTargetFramework)', '$(AssemblyName).dll'))</_generateRuntimeGraphTask>
     <!-- When building from source, ensure the RID we're building for is part of the RID graph -->
     <AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
-    <ServicingVersion>2</ServicingVersion>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <ServicingVersion>3</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 09d06365bbe8e4..af660ffab03759 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -10742,6 +10742,71 @@
     "any",
     "base"
   ],
+  "ubuntu.22.10": [
+    "ubuntu.22.10",
+    "ubuntu",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.10-arm": [
+    "ubuntu.22.10-arm",
+    "ubuntu.22.10",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.10-arm64": [
+    "ubuntu.22.10-arm64",
+    "ubuntu.22.10",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.10-x64": [
+    "ubuntu.22.10-x64",
+    "ubuntu.22.10",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.22.10-x86": [
+    "ubuntu.22.10-x86",
+    "ubuntu.22.10",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
   "ubuntu.23.04": [
     "ubuntu.23.04",
     "ubuntu",
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index 174e9bc025ea0f..eface1f4d3d031 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -4063,6 +4063,35 @@
         "ubuntu-x86"
       ]
     },
+    "ubuntu.22.10": {
+      "#import": [
+        "ubuntu"
+      ]
+    },
+    "ubuntu.22.10-arm": {
+      "#import": [
+        "ubuntu.22.10",
+        "ubuntu-arm"
+      ]
+    },
+    "ubuntu.22.10-arm64": {
+      "#import": [
+        "ubuntu.22.10",
+        "ubuntu-arm64"
+      ]
+    },
+    "ubuntu.22.10-x64": {
+      "#import": [
+        "ubuntu.22.10",
+        "ubuntu-x64"
+      ]
+    },
+    "ubuntu.22.10-x86": {
+      "#import": [
+        "ubuntu.22.10",
+        "ubuntu-x86"
+      ]
+    },
     "ubuntu.23.04": {
       "#import": [
         "ubuntu"
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index a9c9e854d548bd..54966c513678e4 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -262,7 +262,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;22.04;23.04</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;22.10;23.04</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>