Skip to content

Commit aeb28d4

Browse files
Keep building packages that are marked packable (#22616)
1 parent 7079762 commit aeb28d4

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Directory.Build.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
<!-- Analyzer package are needed in source build for WebSDK -->
66
<ExcludeFromSourceBuild
77
Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(IsReferenceAssemblyProject)' != 'true' and '$(IsAnalyzersProject)' != 'true'">true</ExcludeFromSourceBuild>
8-
8+
99
<!-- If the user has specified that they want to skip building any test related projects with SkipTestBuild,
1010
suppress all targets for TestProjects using ExcludeFromBuild. -->
11-
<ExcludeFromBuild Condition="'$(SkipTestBuild)' == 'true' and
11+
<ExcludeFromBuild Condition="'$(IsPackable)' != 'true' and
12+
'$(SkipTestBuild)' == 'true' and
1213
('$(IsTestProject)' == 'true' or
1314
'$(IsUnitTestProject)' == 'true' or
1415
'$(IsTestAssetProject)' == 'true' or
15-
'$(IsBenchmarkProject)' == 'true' or
16+
'$(IsBenchmarkProject)' == 'true' or
1617
'$(IsSampleProject)' == 'true' or
1718
'$(IsSpecificationTestProject)' == 'true')">true</ExcludeFromBuild>
1819
</PropertyGroup>

src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
7+
<IsPackable>true</IsPackable>
78
</PropertyGroup>
89

910
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
4343

4444
<!-- Define Target overrides after importing Directory.Build.targets so these don't get overridden -->
45-
<Target Name="Pack" DependsOnTargets="$(PackDependsOn)" Condition="'$(IsPackable)' == 'true' and '$(SkipTestBuild)' != 'true'">
45+
<Target Name="Pack" DependsOnTargets="$(PackDependsOn)" Condition="'$(IsPackable)' == 'true'">
4646
<Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Pack" />
4747
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
4848
<Exec Command="./gradlew $(GradleOptions) createPackage" />
4949
<Message Importance="high" Text="java:signalr -> $(PackageOutputPath)%(JavaBuildFiles.Identity)" />
5050
<Copy SourceFiles="build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(PackageOutputPath)" />
5151
</Target>
5252

53-
<Target Name="Build" Condition="'$(SkipTestBuild)' != 'true'">
53+
<Target Name="Build">
5454
<Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Build" />
5555
<Exec Command="./gradlew $(GradleOptions) compileJava" />
5656
</Target>

0 commit comments

Comments
 (0)