From 87339ef382171bd460e9e40a2058c110c8cb9bbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jan 2025 04:29:12 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/aspnetcore build 20250112.1 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-alpha.2.25061.1 -> To Version 10.0.0-alpha.2.25062.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a16f7a5422b4..86880f11a852 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 1f10d776a73a6f6c729bf202c56aa052382957b8 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 82ab89241b90ca3d64b22971f3a1e248da72828a - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 151d09e729a5e029bbf959225740a701de0c6c7f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c3275594ceb3..39705f50ce31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.1 From bb1453dac2b5e586381eac6218f10889b6470cba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jan 2025 08:04:13 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/aspnetcore build 20250112.2 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-alpha.2.25061.1 -> To Version 10.0.0-alpha.2.25062.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86880f11a852..6b7db82e21ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 1f10d776a73a6f6c729bf202c56aa052382957b8 - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 82ab89241b90ca3d64b22971f3a1e248da72828a - + https://github.com/dotnet/aspnetcore - 151d09e729a5e029bbf959225740a701de0c6c7f + a869e316fd72bd8b94dfee3704266260b9c547ab https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 39705f50ce31..0381296c87e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 - 10.0.0-alpha.2.25062.1 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25062.2 From 97764791ac488cef2e0cab233dbda5c8d1c9ef2b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 13 Jan 2025 11:51:24 +0100 Subject: [PATCH 03/11] Update 0001-update-jdk-version.patch --- .../patches/aspnetcore/0001-update-jdk-version.patch | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch index 5ca01e482b4e..e458d6c5c860 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -21,8 +21,6 @@ index c1270224e3..bd7a41270d 100644 - "jdk": "11.0.24" + "jdk": "latest" }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1", diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 895f8c4338..3e192445c9 100644 --- a/src/SignalR/clients/java/signalr/build.gradle From fd2fadcd2a241557e1470b637cb185da33682abb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 13 Jan 2025 12:53:33 +0100 Subject: [PATCH 04/11] Reduce lines of context in aspnetcore git patch --- .../patches/aspnetcore/0001-update-jdk-version.patch | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch index e458d6c5c860..d634b7b15161 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -14,9 +14,7 @@ diff --git a/global.json b/global.json index c1270224e3..bd7a41270d 100644 --- a/global.json +++ b/global.json -@@ -24,7 +24,7 @@ - "xcopy-msbuild": "17.8.5" - }, +@@ -26,3 +26,3 @@ "native-tools": { - "jdk": "11.0.24" + "jdk": "latest" @@ -25,12 +23,8 @@ diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients index 895f8c4338..3e192445c9 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle -@@ -22,7 +22,7 @@ allprojects { - version project.findProperty('packageVersion') ?: "99.99.99-dev" - +@@ -24,3 +24,3 @@ allprojects { java { - sourceCompatibility = 1.8 + sourceCompatibility = 1.9 } - - repositories { From 53d43ec5d1ce496b16c45c6eda06a71b6852bb1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jan 2025 22:00:25 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/aspnetcore build 20250113.9 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-alpha.2.25061.1 -> To Version 10.0.0-alpha.2.25063.9 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a69e519b18d..2c4071480be6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 1f10d776a73a6f6c729bf202c56aa052382957b8 - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 010e61a4f46d6d9b544cde169dc034417de7223a - + https://github.com/dotnet/aspnetcore - a869e316fd72bd8b94dfee3704266260b9c547ab + 8f13beaa220600fd968c50538c402965ef2c892d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index df69403f8083..c5558acbe924 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 - 10.0.0-alpha.2.25062.2 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.9 From 76d37977028efd1e3bbc526d7156cf699a405c10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jan 2025 04:28:10 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/aspnetcore build 20250113.10 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-alpha.2.25061.1 -> To Version 10.0.0-alpha.2.25063.10 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4071480be6..6f881541e6b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 1f10d776a73a6f6c729bf202c56aa052382957b8 - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 010e61a4f46d6d9b544cde169dc034417de7223a - + https://github.com/dotnet/aspnetcore - 8f13beaa220600fd968c50538c402965ef2c892d + 84fd1a4465ad723c57f51035e0985e2269eb72eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c5558acbe924..4b7af24760c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 - 10.0.0-alpha.2.25063.9 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.10 From 5bba150c7a26452fe0929ad1b6d2f16110c0bd81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jan 2025 05:38:04 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/aspnetcore build 20250113.11 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-alpha.2.25061.1 -> To Version 10.0.0-alpha.2.25063.11 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f881541e6b6..422c197524ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 1f10d776a73a6f6c729bf202c56aa052382957b8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 010e61a4f46d6d9b544cde169dc034417de7223a - + https://github.com/dotnet/aspnetcore - 84fd1a4465ad723c57f51035e0985e2269eb72eb + 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4b7af24760c9..d983b39f687e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 - 10.0.0-alpha.2.25063.10 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25063.11 From 8eaeba01fd472c26225a0cae6f2ffb066b72ea42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Jan 2025 11:27:44 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/aspnetcore build 20250114.1 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-alpha.2.25061.1 -> To Version 10.0.0-alpha.2.25064.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 422c197524ce..6fac5892432a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 1f10d776a73a6f6c729bf202c56aa052382957b8 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 010e61a4f46d6d9b544cde169dc034417de7223a - + https://github.com/dotnet/aspnetcore - 8c8b85a31b47a5dea79d9c09415e13bcdaeefce8 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d983b39f687e..0f99bce450ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 - 10.0.0-alpha.2.25063.11 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 From a1b38c63fc4ad73eb478f96e6e16dd022a9e4a19 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2025 13:43:20 +0100 Subject: [PATCH 09/11] Delete src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch --- .../aspnetcore/0001-update-jdk-version.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch deleted file mode 100644 index d634b7b15161..000000000000 --- a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d04dfb1ab0f13dbe0f15c065d7f127d8747a0832 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Thu, 9 Jan 2025 08:54:39 +0100 -Subject: [PATCH] Use the latest available jdk - -Backport: https://github.com/dotnet/aspnetcore/pull/59788 - ---- - global.json | 2 +- - src/SignalR/clients/java/signalr/build.gradle | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/global.json b/global.json -index c1270224e3..bd7a41270d 100644 ---- a/global.json -+++ b/global.json -@@ -26,3 +26,3 @@ - "native-tools": { -- "jdk": "11.0.24" -+ "jdk": "latest" - }, -diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle -index 895f8c4338..3e192445c9 100644 ---- a/src/SignalR/clients/java/signalr/build.gradle -+++ b/src/SignalR/clients/java/signalr/build.gradle -@@ -24,3 +24,3 @@ allprojects { - java { -- sourceCompatibility = 1.8 -+ sourceCompatibility = 1.9 - } From 190f1f0719d0f5591bcc90b12d9a645a4955fc91 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2025 13:54:08 +0100 Subject: [PATCH 10/11] Revert "Delete src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch" This reverts commit a1b38c63fc4ad73eb478f96e6e16dd022a9e4a19. --- .../aspnetcore/0001-update-jdk-version.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch new file mode 100644 index 000000000000..d634b7b15161 --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -0,0 +1,30 @@ +From d04dfb1ab0f13dbe0f15c065d7f127d8747a0832 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Thu, 9 Jan 2025 08:54:39 +0100 +Subject: [PATCH] Use the latest available jdk + +Backport: https://github.com/dotnet/aspnetcore/pull/59788 + +--- + global.json | 2 +- + src/SignalR/clients/java/signalr/build.gradle | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/global.json b/global.json +index c1270224e3..bd7a41270d 100644 +--- a/global.json ++++ b/global.json +@@ -26,3 +26,3 @@ + "native-tools": { +- "jdk": "11.0.24" ++ "jdk": "latest" + }, +diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle +index 895f8c4338..3e192445c9 100644 +--- a/src/SignalR/clients/java/signalr/build.gradle ++++ b/src/SignalR/clients/java/signalr/build.gradle +@@ -24,3 +24,3 @@ allprojects { + java { +- sourceCompatibility = 1.8 ++ sourceCompatibility = 1.9 + } From f129f17ae4607526e6277382a1c6d9622d78783a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2025 13:54:44 +0100 Subject: [PATCH 11/11] Remove 0002-Enable-building-Hosting-Bundle-in-VMR patch --- ...nable-building-Hosting-Bundle-in-VMR.patch | 130 ------------------ 1 file changed, 130 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch diff --git a/src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch b/src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch deleted file mode 100644 index 9dd054340a73..000000000000 --- a/src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 6afaf38a1744e313bb6c10f7691bc55ced4dc3f1 Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Mon, 13 Jan 2025 15:00:54 -0800 -Subject: [PATCH] Enable building Hosting Bundle in VMR - -Backport: https://github.com/dotnet/aspnetcore/pull/59857 - ---- - Directory.Build.props | 1 + - eng/Build.props | 14 +++++++++----- - eng/Publishing.props | 5 +++-- - .../WindowsHostingBundle.wixproj | 17 +++++++++++++---- - 4 files changed, 26 insertions(+), 11 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 0321c8b193..b195586ed5 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -239,6 +239,7 @@ - https://dotnetbuilds.blob.core.windows.net/public/ - https://dotnetbuilds.blob.core.windows.net/internal/ - -+ true - $(ArtifactsShippingPackagesDir) - - -diff --git a/eng/Build.props b/eng/Build.props -index 697c3d9ba0..87e19ef337 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -59,7 +59,7 @@ - - - -- -+ - - -@@ -70,6 +70,14 @@ - - - -+ -+ -+ -+ Platform=x86 -+ $(DotNetBuildPass) -+ -+ -+ - - - -@@ -255,10 +263,6 @@ - - - -- -- -- -- - - - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 201e167159..a6a89bd0e9 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -96,12 +96,13 @@ - - - -- - -- -+ - - -diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj -index 3389f389a7..5ef4167757 100644 ---- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj -+++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj -@@ -99,18 +99,27 @@ - $(BundleNameFull) - - -+ -+ -+ $([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime', '$(SharedFxMsiVersion)')) -+ -+ -+ -+ $(CrossArchitectureInstallerBasePath) -+ -+ - -- -+ - x64 - SharedFxRedistInstallerx64 - $(SharedFxPackageVersion) - -- -+ - x86 - SharedFxRedistInstallerx86 - $(SharedFxPackageVersion) - -- -+ - arm64 - SharedFxRedistInstallerarm64 - $(SharedFxPackageVersion) -@@ -127,7 +136,7 @@ - $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) - $(DefineConstants);BundleRegFamily=$(BundleRegFamily) - $(DefineConstants);BundleRegName=$(BundleRegName) -- $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePath) -+ $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePathNormalized) - - - -