From eac0430bbeaaf63d5e1b51afc0257736aaa9d38b 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: Wed, 7 Feb 2024 20:02:21 -0800 Subject: [PATCH 1/5] [6.0] Add RIDs for Fedora 40 and Ubuntu 24.04 (#98080) --- .../src/Microsoft.NETCore.Platforms.csproj | 5 +- .../src/runtime.compatibility.json | 97 +++++++++++++++++++ .../src/runtime.json | 46 +++++++++ .../src/runtimeGroups.props | 4 +- 4 files changed, 147 insertions(+), 5 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 @@ $(MSBuildProjectName) true Microsoft.NETCore.Platforms.BuildTasks - false true @@ -19,8 +18,8 @@ $(AdditionalRuntimeIdentifiers);$(OutputRID) - 11 - false + 12 + true diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json index bf9dcefffefbcd..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", @@ -10028,6 +10060,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", diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json index 4bc419bbfde675..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" @@ -3921,6 +3938,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" diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props index 5fe956f0be5515..71f41149bc93b3 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props @@ -71,7 +71,7 @@ linux x64;arm64 - 23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39 + 23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39;40 false @@ -244,7 +244,7 @@ debian x64;x86;arm;arm64 - 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 + 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 false From a5e6606da04005ecd8798af70ea3208eae735bc9 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Sun, 11 Feb 2024 15:45:48 -0800 Subject: [PATCH 2/5] Define installer-owned directories in dotnet-runtime RPM package (#98246) --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index 87aaf9d263ced2..8bb473d3aa682d 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -45,6 +45,7 @@ + From 97b969ad0e0e126d9d1e0931fbe493f336680fe7 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 12 Feb 2024 10:07:48 -0800 Subject: [PATCH 3/5] Update SqlClient and ship M.W.C (#97884) --- eng/Versions.props | 2 +- .../src/Microsoft.Windows.Compatibility.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d020ffab9cb004..14da15a86d5e23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 4.5.1 4.3.0 5.0.0 - 4.8.5 + 4.8.6 4.5.0 4.3.0 4.3.0 diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj index bc6c1decca31c1..324091a939e7ff 100644 --- a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj +++ b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj @@ -5,8 +5,8 @@ false true - false - 6 + true + 7 $(NoWarn);NU5128 This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET Core as well as .NET Standard. From 59871179d25ac5329caf973cf3491c1fb579b024 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:08:16 -0800 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/emsdk build 20240208.1 (#98170) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.26 -> To Version 6.0.28 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 847436d5141153..a0184440200ffb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fedcb3cb5ec32..c32f4e6542d449 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 7312355e44fd230b7aa26c7190f3870391751476 - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + 0b2571edc63476761a1db6160e34048c7d51505e - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + 0b2571edc63476761a1db6160e34048c7d51505e - + https://github.com/dotnet/emsdk - 5460e2cb3721954528c452d9d32474e4c32b7141 + 0b2571edc63476761a1db6160e34048c7d51505e https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index 14da15a86d5e23..fd7a0ea9eac6fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.28 + 6.0.28 + 6.0.28 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From abe57b03add03a678c3610fcc5c909bf40e88109 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 12:15:31 -0800 Subject: [PATCH 5/5] Add ca-certificates to Mariner 2.0 deps (#98269) Co-authored-by: Nikola Milosavljevic --- .../dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj index 52b410239d3be7..76315c4255ec16 100644 --- a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj @@ -5,6 +5,6 @@ - +