diff options
| author | John Luo <johluo@microsoft.com> | 2020-11-14 09:37:16 +0300 |
|---|---|---|
| committer | John Luo <johluo@microsoft.com> | 2020-11-14 09:37:16 +0300 |
| commit | 0c8d69b8fe1fc3f1c24f589e1ae03dc59945903e (patch) | |
| tree | cbbee68fdb061bc22ad71cd94010484e0541e5a5 /Directory.Build.props | |
| parent | 45540f7315c1a612cda81680d73a4e15ba6a67c6 (diff) | |
| parent | b34c5ddd5f0f548610302a31c2247889ab837473 (diff) | |
Merge branch 'release/5.0'
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index cf46dcc2f2..2cbdaff556 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,14 +11,23 @@ <PropertyGroup> <RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir> - <IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance')) OR $(RepoRelativeProjectDir.Contains('perf')) OR $(RepoRelativeProjectDir.Contains('benchmarkapps'))">true</IsBenchmarkProject> + <IsBenchmarkProject Condition=" $(MSBuildProjectName.EndsWith('.Performance')) OR + $(RepoRelativeProjectDir.Contains('perf')) OR + $(RepoRelativeProjectDir.Contains('benchmarkapps')) ">true</IsBenchmarkProject> <IsSpecificationTestProject Condition="$(MSBuildProjectName.EndsWith('.Specification.Tests'))">true</IsSpecificationTestProject> <IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject> - <IsUnitTestProject Condition="'$(IsSpecificationTestProject)' != 'true' and ( $(MSBuildProjectName.EndsWith('Tests')) or $(MSBuildProjectName.EndsWith('.Test')) or $(MSBuildProjectName.EndsWith('.FunctionalTest')) )">true</IsUnitTestProject> - <IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject> - <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject> + <IsUnitTestProject Condition=" '$(IsSpecificationTestProject)' != 'true' AND + ( $(MSBuildProjectName.EndsWith('Tests')) OR + $(MSBuildProjectName.EndsWith('.Test')) OR + $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true</IsUnitTestProject> + <IsTestAssetProject Condition=" $(RepoRelativeProjectDir.Contains('testassets')) ">true</IsTestAssetProject> + <IsSampleProject Condition=" $(RepoRelativeProjectDir.Contains('sample')) OR + $(RepoRelativeProjectDir.Contains('Sample')) ">true</IsSampleProject> <IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject> - <IsShipping Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true'">false</IsShipping> + <IsShipping Condition=" '$(IsSampleProject)' == 'true' OR + '$(IsTestAssetProject)' == 'true' OR + '$(IsBenchmarkProject)' == 'true' OR + '$(IsUnitTestProject)' == 'true'">false</IsShipping> <!-- Following logic mimics core-setup approach as well as |