diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2021-12-14 02:34:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-14 02:34:17 +0300 |
| commit | f072ff85b50f33cd0859f795a22326fbd6be3d68 (patch) | |
| tree | aa82f5487987901f7d704a652e13eddbbc09ca6d /Directory.Build.targets | |
| parent | dc038843de7e7a8442e2e19c62ae620049c06164 (diff) | |
!nits! Build cleanup (#38979)
- condense `$(_UseHelixOpenQueues)` YAML
- restore ability to override `$(IsUnitTestProject)`
- treat `$(IsUnitTestProject)` and `$(IsTestProject)` as `bool` after Arcade SDK.props imported
- avoid attempts to override `$(RunQuarantinedTests)`; it's set globally
- remove unnecessary `$(IsUnitTestProject)` and `$(IsTestProject)` settings
- override `$(IsUnitTestProject)` (not `$(IsTestProject)`) _before_ root Directory.Build.props
Diffstat (limited to 'Directory.Build.targets')
| -rw-r--r-- | Directory.Build.targets | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets index 1f1616124b..037e05200a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,4 @@ <Project> - <PropertyGroup> <!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, and ref/ assemblies in source build. --> <!-- Analyzer package are needed in source build for WebSDK --> @@ -10,8 +9,7 @@ suppress all targets for TestProjects using ExcludeFromBuild. --> <ExcludeFromBuild Condition="'$(IsPackable)' != 'true' and '$(SkipTestBuild)' == 'true' and - ('$(IsTestProject)' == 'true' or - '$(IsUnitTestProject)' == 'true' or + ($(IsTestProject) or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsSampleProject)' == 'true' or @@ -62,7 +60,7 @@ <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' "> <PackageId Condition=" '$(PackageId)' == '' ">$(AssemblyName)</PackageId> <IsPackable - Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR + Condition="'$(IsPackable)' == '' AND ( $(IsTestProject) OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsMicrobenchmarksProject)' == 'true') ">false</IsPackable> </PropertyGroup> @@ -112,7 +110,7 @@ '$(IsSampleProject)' != 'true' AND '$(IsSpecificationTestProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND - '$(IsTestProject)' != 'true' AND + !$(IsTestProject) AND '$(IsMicrobenchmarksProject)' != 'true' ">true</IsImplementationProject> <!-- This determines whether a project is available as a <Reference> to other projects in this repo. --> @@ -131,7 +129,7 @@ <IsPackable Condition="'$(IsPackable)' == '' AND ('$(IsImplementationProject)' == 'true' OR '$(IsAnalyzersProject)' == 'true') ">true</IsPackable> <IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable> - <BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND '$(IsTestProject)' == 'true'">true</BuildHelixPayload> + <BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND $(IsTestProject) ">true</BuildHelixPayload> <SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests> </PropertyGroup> @@ -194,8 +192,7 @@ <Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" /> <Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" /> <Import Project="eng\targets\Java.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.javaproj'" /> - <Import Project="eng\targets\Helix.targets" Condition="'$(IsTestProject)' == 'true'" /> + <Import Project="eng\targets\Helix.targets" Condition=" $(IsTestProject) " /> <Import Project="eng\targets\FunctionalTestAsset.targets" Condition="'$(IsTestAssetProject)' == 'true'" /> <Import Project="eng\targets\FunctionalTestWithAssets.targets" Condition="'$(ContainsFunctionalTestAssets)' == 'true'" /> - </Project> |