Skip to content

Commit 97a59f1

Browse files
Fix SignalR Java tests not running (#18114)
1 parent ad9cf5b commit 97a59f1

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,3 +236,4 @@ jobs:
236236
testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
237237
buildConfiguration: $(BuildConfiguration)
238238
buildPlatform: $(AgentOsName)
239+
mergeTestResults: true

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<IsShippingPackage>true</IsShippingPackage>
1313

14+
<IsTestProject>true</IsTestProject>
15+
1416
<!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->
1517
<GradleOptions Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(GradleOptions) -Dorg.gradle.daemon=false</GradleOptions>
1618
</PropertyGroup>
@@ -33,6 +35,9 @@
3335
</PackDependsOn>
3436
</PropertyGroup>
3537

38+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
39+
40+
<!-- Define Target overrides after importing Directory.Build.targets so these don't get overriden -->
3641
<Target Name="Pack" DependsOnTargets="$(PackDependsOn)" Condition="'$(IsPackable)' == 'true'">
3742
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
3843
<Exec Command="./gradlew $(GradleOptions) createPackage" />
@@ -50,10 +55,8 @@
5055
<Exec Command="./gradlew $(GradleOptions) test" IgnoreStandardErrorWarningFormat="true" />
5156
</Target>
5257

53-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
54-
5558
<PropertyGroup>
5659
<!-- Pass the Java Package Version down to Gradle -->
57-
<GradleOptions>-PpackageVersion="$(PackageVersion)"</GradleOptions>
60+
<GradleOptions Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(GradleOptions) -PpackageVersion="$(PackageVersion)"</GradleOptions>
5861
</PropertyGroup>
5962
</Project>

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// Copyright (c) .NET Foundation. All rights reserved.
23
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
34

0 commit comments

Comments
 (0)