Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest jdk available in VMR aspnetcore build #45822

Merged
merged 3 commits into from
Jan 9, 2025
+38 −0
Merged

Use latest jdk available in VMR aspnetcore build #45822

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
169e249
Use latest jdk available in VMR aspnetcore build
ViktorHofer Jan 9, 2025
5a40724
Update patch
ViktorHofer Jan 9, 2025
d29f3c1
Update patch once more
ViktorHofer Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From d04dfb1ab0f13dbe0f15c065d7f127d8747a0832 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <[email protected]>
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
@@ -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
+++ 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 {
Loading