From 169e24946298c126b4fbf3966113834524e2154b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 9 Jan 2025 08:59:10 +0100 Subject: [PATCH 1/3] Use latest jdk available in VMR aspnetcore build --- .../aspnetcore/0001-update-jdk-version.patch | 24 +++++++++++++++++++ 1 file changed, 24 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..50fd2aaa9b13 --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -0,0 +1,24 @@ +From 6f55fd1639e918e3d0ad402d703e76ba8d6c412b 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 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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" + }, + "native-tools": { +- "jdk": "11.0.24" ++ "jdk": "latest" + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1", From 5a4072429f274aced3b59d2c92fdef3311649255 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 9 Jan 2025 12:02:03 +0100 Subject: [PATCH 2/3] Update patch --- .../aspnetcore/0001-update-jdk-version.patch | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch index 50fd2aaa9b13..c9a48c7b70e9 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -1,24 +1,24 @@ -From 6f55fd1639e918e3d0ad402d703e76ba8d6c412b 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 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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" - }, - "native-tools": { -- "jdk": "11.0.24" -+ "jdk": "latest" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1", +From ae5bdadc2e4fe78690a0ef418b6bbe06acb33b42 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Thu, 9 Jan 2025 10:56:16 +0100 +Subject: [PATCH] Specify toolchain in build.gradle files + +Backport: https://github.com/dotnet/aspnetcore/pull/59788 + +--- + src/SignalR/clients/java/signalr/build.gradle | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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 +@@ -22,7 +22,7 @@ allprojects { + version project.findProperty('packageVersion') ?: "99.99.99-dev" + + java { +- sourceCompatibility = 1.8 ++ sourceCompatibility = 1.9 + } + + repositories { From d29f3c1377c1dd0970ae9447002fa7ced7bebcaa Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 9 Jan 2025 13:34:03 +0100 Subject: [PATCH 3/3] Update patch once more --- .../aspnetcore/0001-update-jdk-version.patch | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch index c9a48c7b70e9..5ca01e482b4e 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -1,14 +1,28 @@ -From ae5bdadc2e4fe78690a0ef418b6bbe06acb33b42 Mon Sep 17 00:00:00 2001 +From d04dfb1ab0f13dbe0f15c065d7f127d8747a0832 Mon Sep 17 00:00:00 2001 From: Viktor Hofer -Date: Thu, 9 Jan 2025 10:56:16 +0100 -Subject: [PATCH] Specify toolchain in build.gradle files +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 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 +@@ -24,7 +24,7 @@ + "xcopy-msbuild": "17.8.5" + }, + "native-tools": { +- "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