File tree Expand file tree Collapse file tree 3 files changed +8
-3
lines changed
src/SignalR/clients/java/signalr
src/main/java/com/microsoft/signalr Expand file tree Collapse file tree 3 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -236,3 +236,4 @@ jobs:
236
236
testResultsFiles : ' **/TEST-com.microsoft.signalr*.xml'
237
237
buildConfiguration : $(BuildConfiguration)
238
238
buildPlatform : $(AgentOsName)
239
+ mergeTestResults : true
Original file line number Diff line number Diff line change 11
11
12
12
<IsShippingPackage>true</IsShippingPackage>
13
13
14
+ <IsTestProject>true</IsTestProject>
15
+
14
16
<!-- Disable gradle daemon on CI since the CI seems to try to wait for the daemon to shut down, which it doesn't do :) -->
15
17
<GradleOptions Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(GradleOptions) -Dorg.gradle.daemon=false</GradleOptions>
16
18
</PropertyGroup>
33
35
</PackDependsOn>
34
36
</PropertyGroup>
35
37
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 -->
36
41
<Target Name="Pack" DependsOnTargets="$(PackDependsOn)" Condition="'$(IsPackable)' == 'true'">
37
42
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
38
43
<Exec Command="./gradlew $(GradleOptions) createPackage" />
50
55
<Exec Command="./gradlew $(GradleOptions) test" IgnoreStandardErrorWarningFormat="true" />
51
56
</Target>
52
57
53
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
54
-
55
58
<PropertyGroup>
56
59
<!-- Pass the Java Package Version down to Gradle -->
57
- <GradleOptions> -PpackageVersion="$(PackageVersion)"</GradleOptions>
60
+ <GradleOptions Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(GradleOptions) -PpackageVersion="$(PackageVersion)"</GradleOptions>
58
61
</PropertyGroup>
59
62
</Project>
Original file line number Diff line number Diff line change
1
+
1
2
// Copyright (c) .NET Foundation. All rights reserved.
2
3
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3
4
You can’t perform that action at this time.
0 commit comments