Skip to content

Commit 1f7f4de

Browse files
github-actions[bot]ViktorHoferDeagleGross
authored
[release/9.0] Revert "Revert "Use the latest available jdk"" (#60229)
* Revert "Revert "Use the latest available jdk (#59788)" (#60143)" This reverts commit 83da591. * Update DelegateTests.cs --------- Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Korolev Dmitry <[email protected]>
1 parent ab70b26 commit 1f7f4de

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

eng/scripts/InstallJdk.ps1

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\"
2222
$javacExe = "$installDir\bin\javac.exe"
2323
$tempDir = "$repoRoot\obj"
2424
if (-not $JdkVersion) {
25-
$globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
26-
$JdkVersion = $globalJson.'native-tools'.jdk
25+
$JdkVersion = "11.0.24"
2726
}
2827

2928
if (Test-Path $javacExe) {

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"xcopy-msbuild": "17.1.0"
2525
},
2626
"native-tools": {
27-
"jdk": "11.0.24"
27+
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
3030
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5",

src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ public async Task UpdateDelegationRuleTest()
217217

218218
[ConditionalFact]
219219
[DelegateSupportedCondition(true)]
220+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60141")]
220221
public async Task DelegateAfterReceiverRestart()
221222
{
222223
var queueName = Guid.NewGuid().ToString();

src/SignalR/clients/java/signalr/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ allprojects {
2222
version project.findProperty('packageVersion') ?: "99.99.99-dev"
2323

2424
java {
25-
sourceCompatibility = 1.8
25+
sourceCompatibility = 1.9
2626
}
2727

2828
repositories {

src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<!-- Installing Java on ARM will take some work -->
77
<SkipHelixArm>true</SkipHelixArm>
88
<SkipHelixAlpine>true</SkipHelixAlpine>
9+
<!-- Temporary while Mac machines get new JDK -->
10+
<SkipHelixQueues>OSX.13.Amd64.Open;$(SkipHelixQueues)</SkipHelixQueues>
911
<PublishDir>$(OutputPath)</PublishDir>
1012
<TestDependsOnJava>true</TestDependsOnJava>
1113
</PropertyGroup>

src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public void invocationBindingFailureWhenParsingLocalDateTimeWithoutAppropriateTy
444444
assertEquals(HubMessageType.INVOCATION_BINDING_FAILURE, message.getMessageType());
445445
InvocationBindingFailureMessage failureMessage = (InvocationBindingFailureMessage) messages.get(0);
446446

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

450450
@Test

0 commit comments

Comments
 (0)