From aeb28d4b830c9e9c540fbcfcc6c8c5db137f387b Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Mon, 8 Jun 2020 10:13:36 -0700
Subject: [PATCH] Keep building packages that are marked packable (#22616)

---
 Directory.Build.targets                                    | 7 ++++---
 .../IIS/IIS/test/testassets/TestTasks/TestTasks.csproj     | 1 +
 .../java/signalr/signalr.client.java.Tests.javaproj        | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 695ae02995..f89af5200c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -5,14 +5,15 @@
     <!-- Analyzer package are needed in source build for WebSDK -->
     <ExcludeFromSourceBuild
         Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(IsReferenceAssemblyProject)' != 'true' and '$(IsAnalyzersProject)' != 'true'">true</ExcludeFromSourceBuild>
-        
+
     <!-- If the user has specified that they want to skip building any test related projects with SkipTestBuild,
      suppress all targets for TestProjects using ExcludeFromBuild. -->
-    <ExcludeFromBuild Condition="'$(SkipTestBuild)' == 'true' and 
+    <ExcludeFromBuild Condition="'$(IsPackable)' != 'true' and
+        '$(SkipTestBuild)' == 'true' and
         ('$(IsTestProject)' == 'true' or
          '$(IsUnitTestProject)' == 'true' or
          '$(IsTestAssetProject)' == 'true' or
-         '$(IsBenchmarkProject)' == 'true' or 
+         '$(IsBenchmarkProject)' == 'true' or
          '$(IsSampleProject)' == 'true' or
          '$(IsSpecificationTestProject)' == 'true')">true</ExcludeFromBuild>
   </PropertyGroup>
diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
index 3a1adb6341..1f6ce55943 100644
--- a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
+++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj
index 5c3cc77e73..6a1851569e 100644
--- a/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj
+++ b/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj
@@ -42,7 +42,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <!-- Define Target overrides after importing Directory.Build.targets so these don't get overridden -->
-  <Target Name="Pack" DependsOnTargets="$(PackDependsOn)" Condition="'$(IsPackable)' == 'true' and '$(SkipTestBuild)' != 'true'">
+  <Target Name="Pack" DependsOnTargets="$(PackDependsOn)" Condition="'$(IsPackable)' == 'true'">
     <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Pack" />
     <Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
     <Exec Command="./gradlew $(GradleOptions) createPackage" />
@@ -50,7 +50,7 @@
     <Copy SourceFiles="build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(PackageOutputPath)" />
   </Target>
 
-  <Target Name="Build" Condition="'$(SkipTestBuild)' != 'true'">
+  <Target Name="Build">
     <Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Build" />
     <Exec Command="./gradlew $(GradleOptions) compileJava" />
   </Target>