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 d020ffab9cb004..fd7a0ea9eac6fa 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 @@ -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 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 @@ + 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 @@ - + 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 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.