Skip to content

[release/8.0] Use the latest available JDK #60233

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

Merged
merged 4 commits into from
Feb 6, 2025
Merged

[release/8.0] Use the latest available JDK #60233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd3a310
Use the latest available JDK
ViktorHofer Feb 6, 2025
d442b4d
Add newline at end of global.json file
wtgodbe Feb 6, 2025
418ac10
Fix spacing
wtgodbe Feb 6, 2025
bd40ff1
Update DelegateTests.cs
DeagleGross Jan 31, 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
3 changes: 1 addition & 2 deletions eng/scripts/InstallJdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\"
$javacExe = "$installDir\bin\javac.exe"
$tempDir = "$repoRoot\obj"
if (-not $JdkVersion) {
$globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
$JdkVersion = $globalJson.'native-tools'.jdk
$JdkVersion = "11.0.24"
}

if (Test-Path $javacExe) {
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
},
"native-tools": {
"jdk": "11.0.24"
"jdk": "latest"
}
}
1 change: 1 addition & 0 deletions src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ public async Task UpdateDelegationRuleTest()

[ConditionalFact]
[DelegateSupportedCondition(true)]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60141")]
public async Task DelegateAfterReceiverRestart()
{
var queueName = Guid.NewGuid().ToString();
Expand Down
2 changes: 1 addition & 1 deletion src/SignalR/clients/java/signalr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ allprojects {
version project.findProperty('packageVersion') ?: "99.99.99-dev"

java {
sourceCompatibility = 1.8
sourceCompatibility = 1.9
}

repositories {
Expand Down
2 changes: 2 additions & 0 deletions src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<!-- Installing Java on ARM will take some work -->
<SkipHelixArm>true</SkipHelixArm>
<SkipHelixAlpine>true</SkipHelixAlpine>
<!-- Temporary while Mac machines get new JDK -->
<SkipHelixQueues>OSX.13.Amd64.Open;$(SkipHelixQueues)</SkipHelixQueues>
<PublishDir>$(OutputPath)</PublishDir>
<TestDependsOnJava>true</TestDependsOnJava>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...lR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ public void invocationBindingFailureWhenParsingLocalDateTimeWithoutAppropriateTy
assertEquals(HubMessageType.INVOCATION_BINDING_FAILURE, message.getMessageType());
InvocationBindingFailureMessage failureMessage = (InvocationBindingFailureMessage) messages.get(0);

assertEquals("java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 41 path $.arguments[0]", failureMessage.getException().getMessage());
assertEquals("com.google.gson.JsonSyntaxException", failureMessage.getException().getClass().getName());
}

@Test
Expand Down
Loading