Merge in 'release/7.0' changes

dotnet · Feb 15, 2023 · cc8752f · cc8752f
2 parents dcb489a + 527278b
commit cc8752f
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 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
@@ -23,6 +23,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>1</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
@@ -10423,6 +10423,71 @@
     "any",
     "base"
   ],
+ "ubuntu.23.04": [
+     "ubuntu.23.04",
+     "ubuntu",
+     "debian",
+     "linux",
+     "unix",
+     "any",
+     "base"
+   ],
+   "ubuntu.23.04-arm": [
+     "ubuntu.23.04-arm",
+     "ubuntu.23.04",
+     "ubuntu-arm",
+     "ubuntu",
+     "debian-arm",
+     "debian",
+     "linux-arm",
+     "linux",
+     "unix-arm",
+     "unix",
+     "any",
+     "base"
+   ],
+   "ubuntu.23.04-arm64": [
+     "ubuntu.23.04-arm64",
+     "ubuntu.23.04",
+     "ubuntu-arm64",
+      "ubuntu",
+     "debian-arm64",
+     "debian",
+     "linux-arm64",
+     "linux",
+     "unix-arm64",
+     "unix",
+     "any",
+     "base"
+  ],
+  "ubuntu.23.04-x64": [
+     "ubuntu.23.04-x64",
+     "ubuntu.23.04",
+     "ubuntu-x64",
+     "ubuntu",
+     "debian-x64",
+     "debian",
+     "linux-x64",
+     "linux",
+     "unix-x64",
+     "unix",
+     "any",
+     "base"
+  ],
+  "ubuntu.23.04-x86": [
+     "ubuntu.23.04-x86",
+     "ubuntu.23.04",
+     "ubuntu-x86",
+     "ubuntu",
+     "debian-x86",
+     "debian",
+     "linux-x86",
+     "linux",
+     "unix-x86",
+     "unix",
+     "any",
+     "base"
+  ],
   "unix": [
     "unix",
     "any",
@@ -11118,4 +11183,4 @@
     "any",
     "base"
   ]
-}
+}
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -3999,6 +3999,35 @@
         "ubuntu-x86"
       ]
     },
+    "ubuntu.23.04": {
+      "#import": [
+        "ubuntu"
+      ]
+    },
+    "ubuntu.23.04-arm": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-arm"
+      ]
+    },
+    "ubuntu.23.04-arm64": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-arm64"
+      ]
+    },
+    "ubuntu.23.04-x64": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-x64"
+      ]
+    },
+    "ubuntu.23.04-x86": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-x86"
+      ]
+    },
     "unix": {
       "#import": [
         "any"
@@ -4378,4 +4407,4 @@
       ]
     }
   }
-}
+}
diff --git 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</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;23.04</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>