From 846eeeecd7e4416f75a2b76fd3b00a58234fb5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:17:58 -0800
Subject: [PATCH 1/7] runtime.json: ubuntu.24.04

---
 .../src/runtime.json                          | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index 4bc419bbfde675..9da0c668e3de87 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -3921,6 +3921,35 @@
         "ubuntu-x86"
       ]
     },
+    "ubuntu.24.04": {
+      "#import": [
+        "ubuntu"
+      ]
+    },
+    "ubuntu.24.04-arm": {
+      "#import": [
+        "ubuntu.24.04",
+        "ubuntu-arm"
+      ]
+    },
+    "ubuntu.24.04-arm64": {
+      "#import": [
+        "ubuntu.24.04",
+        "ubuntu-arm64"
+      ]
+    },
+    "ubuntu.24.04-x64": {
+      "#import": [
+        "ubuntu.24.04",
+        "ubuntu-x64"
+      ]
+    },
+    "ubuntu.24.04-x86": {
+      "#import": [
+        "ubuntu.24.04",
+        "ubuntu-x86"
+      ]
+    },
     "unix": {
       "#import": [
         "any"

From b7dafb04c71a2a4478aedfd41f0e543c9aba104d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:18:49 -0800
Subject: [PATCH 2/7] runtime.json: fedora.40

---
 .../src/runtime.json                            | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index 9da0c668e3de87..ac8a62325fbfdb 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -1498,6 +1498,23 @@
         "fedora-x64"
       ]
     },
+    "fedora.40": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.40-arm64": {
+      "#import": [
+        "fedora.40",
+        "fedora-arm64"
+      ]
+    },
+    "fedora.40-x64": {
+      "#import": [
+        "fedora.40",
+        "fedora-x64"
+      ]
+    },
     "freebsd": {
       "#import": [
         "unix"

From d09fae8d7ea6fc50c55143b2cfdd3c1c96d390e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:20:38 -0800
Subject: [PATCH 3/7] runtime.compatibility.json: ubuntu.24.04

---
 .../src/runtime.compatibility.json            | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index bf9dcefffefbcd..333a144859a51f 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -10028,6 +10028,71 @@
     "any",
     "base"
   ],
+  "ubuntu.24.04": [
+    "ubuntu.24.04",
+    "ubuntu",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.24.04-arm": [
+    "ubuntu.24.04-arm",
+    "ubuntu.24.04",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.24.04-arm64": [
+    "ubuntu.24.04-arm64",
+    "ubuntu.24.04",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.24.04-x64": [
+    "ubuntu.24.04-x64",
+    "ubuntu.24.04",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.24.04-x86": [
+    "ubuntu.24.04-x86",
+    "ubuntu.24.04",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
   "unix": [
     "unix",
     "any",

From 905ed5a5a0c221079d73f0ac2e5f073b9314ccdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:21:29 -0800
Subject: [PATCH 4/7] runtime.compatibility.json: fedora.40

---
 .../src/runtime.compatibility.json            | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 333a144859a51f..809c62872a8984 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -4432,6 +4432,38 @@
     "any",
     "base"
   ],
+  "fedora.40": [
+    "fedora.40",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.40-arm64": [
+    "fedora.40-arm64",
+    "fedora.40",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.40-x64": [
+    "fedora.40-x64",
+    "fedora.40",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "freebsd": [
     "freebsd",
     "unix",

From 7a9073257d3b4fed57ac2f0436c6482ecb4c68ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:21:52 -0800
Subject: [PATCH 5/7] runtimeGroups.props: fedora.40

---
 .../Microsoft.NETCore.Platforms/src/runtimeGroups.props         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index 5fe956f0be5515..e596bf65aae61f 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -71,7 +71,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;37;38;39</Versions>
+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39;40</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 

From 15f4e1b29d3b11da3dad85506e08d8efed4a41d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:22:12 -0800
Subject: [PATCH 6/7] runtimeGroups.props: ubuntu.24.04

---
 .../Microsoft.NETCore.Platforms/src/runtimeGroups.props         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index e596bf65aae61f..71f41149bc93b3 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -244,7 +244,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;22.10;23.04;23.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;22.10;23.04;23.10;24.04</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 

From 06ebb9682ae2892bba7e40d07bf6eef6c2379533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:22:27 -0800
Subject: [PATCH 7/7] Bump ServicingVersion and set GeneratePackageOnBuild to
 true.

---
 .../src/Microsoft.NETCore.Platforms.csproj                   | 5 ++---
 1 file changed, 2 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 da5471f14df03f..fc06a0deae9bba 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -6,7 +6,6 @@
     <PackageId>$(MSBuildProjectName)</PackageId>
     <AvoidRestoreCycleOnSelfReference>true</AvoidRestoreCycleOnSelfReference>
     <AssemblyName>Microsoft.NETCore.Platforms.BuildTasks</AssemblyName>
-
     <IsSourceProject>false</IsSourceProject>
     <IsPackable>true</IsPackable>
     <!-- TODO: Enable after AvoidRestoreCycleOnSelfReference hack is removed. -->
@@ -19,8 +18,8 @@
 
     <!-- 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>11</ServicingVersion>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <ServicingVersion>12</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">