From f072ff85b50f33cd0859f795a22326fbd6be3d68 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 13 Dec 2021 15:34:17 -0800 Subject: [PATCH] !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 --- .azure/pipelines/ci.yml | 6 ++---- .azure/pipelines/helix-matrix.yml | 7 ++----- .azure/pipelines/quarantined-pr.yml | 7 ++----- .azure/pipelines/quarantined-tests.yml | 7 ++----- Directory.Build.props | 10 +++++----- Directory.Build.targets | 13 +++++-------- eng/targets/CSharp.Common.props | 8 +++----- eng/targets/CSharp.Common.targets | 8 +++----- eng/targets/Cpp.Common.targets | 3 +-- eng/targets/Helix.props | 3 ++- eng/targets/Npm.Common.targets | 4 +--- .../Microsoft.AspNetCore.Analyzer.Testing.csproj | 1 - .../Microsoft.AspNetCore.Components.Web.JS.npmproj | 5 ++++- src/Components/WebView/Directory.Build.props | 3 +-- .../src/Microsoft.JSInterop.JS.npmproj | 1 - ...Microsoft.AspNetCore.Mvc.IntegrationTests.csproj | 2 -- src/ProjectTemplates/Directory.Build.props | 4 ++-- src/Servers/Kestrel/Directory.Build.props | 4 ++-- src/SignalR/Directory.Build.props | 5 ++--- src/SignalR/Directory.Build.targets | 3 +-- .../signalr/core/signalr.client.java.core.javaproj | 1 - .../signalr.client.java.messagepack.javaproj | 1 - .../signalr/test/signalr.client.java.Tests.javaproj | 1 - .../SignalR.Npm.FunctionalTests.npmproj | 4 +--- src/SignalR/clients/ts/client-ts.npmproj | 3 +-- src/SignalR/clients/ts/common/common.npmproj | 1 - .../signalr-protocol-msgpack.npmproj | 1 - src/SignalR/clients/ts/signalr/signalr.npmproj | 1 - src/Testing/src/Microsoft.AspNetCore.Testing.csproj | 2 -- 29 files changed, 42 insertions(+), 77 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 3e70e88fdfd6..29333ca2053e 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -46,6 +46,8 @@ variables: value: .NETCORE - name: PostBuildSign value: true +- name: _UseHelixOpenQueues + value: ${{ ne(variables['System.TeamProject'], 'internal') }} - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: _BuildArgs value: /p:TeamName=$(_TeamName) @@ -103,8 +105,6 @@ variables: - name: WindowsArm64InstallersLogArgs value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog - ${{ if ne(variables['System.TeamProject'], 'internal') }}: - - name: _UseHelixOpenQueues - value: 'true' - name: _SignType value: '' - name: _InternalRuntimeDownloadArgs @@ -124,8 +124,6 @@ variables: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) - group: DotNet-HelixApi-Access - - name: _UseHelixOpenQueues - value: 'false' - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - name: _SignType value: real diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 37631ca4e11e..bf34bfd8e01f 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -16,13 +16,10 @@ schedules: always: false variables: -- ${{ if ne(variables['System.TeamProject'], 'internal') }}: - - name: _UseHelixOpenQueues - value: 'true' +- name: _UseHelixOpenQueues + value: ${{ ne(variables['System.TeamProject'], 'internal') }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access - - name: _UseHelixOpenQueues - value: 'false' jobs: - template: jobs/default-build.yml diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml index f336576be045..cc9b4688496a 100644 --- a/.azure/pipelines/quarantined-pr.yml +++ b/.azure/pipelines/quarantined-pr.yml @@ -40,13 +40,10 @@ schedules: always: true variables: -- ${{ if ne(variables['System.TeamProject'], 'internal') }}: - - name: _UseHelixOpenQueues - value: 'true' +- name: _UseHelixOpenQueues + value: ${{ ne(variables['System.TeamProject'], 'internal') }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access - - name: _UseHelixOpenQueues - value: 'false' jobs: - template: jobs/default-build.yml diff --git a/.azure/pipelines/quarantined-tests.yml b/.azure/pipelines/quarantined-tests.yml index 529a8a80ac3e..7f138c64b756 100644 --- a/.azure/pipelines/quarantined-tests.yml +++ b/.azure/pipelines/quarantined-tests.yml @@ -11,13 +11,10 @@ schedules: always: true variables: -- ${{ if ne(variables['System.TeamProject'], 'internal') }}: - - name: _UseHelixOpenQueues - value: 'true' +- name: _UseHelixOpenQueues + value: ${{ ne(variables['System.TeamProject'], 'internal') }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access - - name: _UseHelixOpenQueues - value: 'false' jobs: - template: jobs/default-build.yml diff --git a/Directory.Build.props b/Directory.Build.props index 29487221b245..e4139483ccc5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -24,18 +24,19 @@ $(RepoRelativeProjectDir.Contains('benchmarkapps')) ">true true true - false - true + false true true true false + $(IsUnitTestProject) ">false @@ -10,8 +9,7 @@ suppress all targets for TestProjects using ExcludeFromBuild. --> $(AssemblyName) false @@ -112,7 +110,7 @@ '$(IsSampleProject)' != 'true' AND '$(IsSpecificationTestProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND - '$(IsTestProject)' != 'true' AND + !$(IsTestProject) AND '$(IsMicrobenchmarksProject)' != 'true' ">true @@ -131,7 +129,7 @@ true false - true + true true @@ -194,8 +192,7 @@ - + - diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index a2745e22ee91..a6ee8c7067b9 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -1,5 +1,4 @@ - preview @@ -12,16 +11,16 @@ - + - + - + PreserveNewest PreserveNewest @@ -33,5 +32,4 @@ false true - diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index 4cf0bb9af70d..dd54cf7240ad 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -1,5 +1,4 @@ - net$(TargetFrameworkVersion.TrimStart('vV').Replace('.','')) @@ -26,7 +25,7 @@ $(Features);nullablePublicOnly - true - true + true @@ -52,7 +51,7 @@ - + @@ -143,5 +142,4 @@ - diff --git a/eng/targets/Cpp.Common.targets b/eng/targets/Cpp.Common.targets index f0b3a09f11c7..d352173de37f 100644 --- a/eng/targets/Cpp.Common.targets +++ b/eng/targets/Cpp.Common.targets @@ -1,6 +1,5 @@ - @@ -12,7 +11,7 @@ - + diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 30efaf150676..fdd541e766d4 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -10,7 +10,8 @@ 00:30:00 - false + + false false false diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index 5f6fb9938fe5..9f376cc50dc5 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -1,5 +1,4 @@ - @@ -132,10 +131,9 @@ - + - diff --git a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj index 1f8278db12de..2576a9683c58 100644 --- a/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj +++ b/src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj @@ -6,7 +6,6 @@ $(PackageTags);testing true - false true true diff --git a/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj b/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj index 8394cbbd3289..7e289835a7b6 100644 --- a/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj +++ b/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj @@ -1,12 +1,15 @@  - true + true false + + + false diff --git a/src/Components/WebView/Directory.Build.props b/src/Components/WebView/Directory.Build.props index 4b5c3fb85c65..b64eb5234302 100644 --- a/src/Components/WebView/Directory.Build.props +++ b/src/Components/WebView/Directory.Build.props @@ -1,8 +1,7 @@  - + true - diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/Microsoft.JSInterop.JS.npmproj b/src/JSInterop/Microsoft.JSInterop.JS/src/Microsoft.JSInterop.JS.npmproj index a0f637aba69c..c1e729a93292 100644 --- a/src/JSInterop/Microsoft.JSInterop.JS/src/Microsoft.JSInterop.JS.npmproj +++ b/src/JSInterop/Microsoft.JSInterop.JS/src/Microsoft.JSInterop.JS.npmproj @@ -4,7 +4,6 @@ @microsoft/dotnet-js-interop true - false true diff --git a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index 2645610a14bb..93e20c9dba02 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -1,5 +1,4 @@ - $(DefaultNetCoreTargetFramework) false @@ -14,5 +13,4 @@ - diff --git a/src/ProjectTemplates/Directory.Build.props b/src/ProjectTemplates/Directory.Build.props index 3bf3f50397a5..c97233e66a46 100644 --- a/src/ProjectTemplates/Directory.Build.props +++ b/src/ProjectTemplates/Directory.Build.props @@ -6,9 +6,9 @@ false - + - + PreserveNewest diff --git a/src/Servers/Kestrel/Directory.Build.props b/src/Servers/Kestrel/Directory.Build.props index 1b0e999039dc..7e04f836319c 100644 --- a/src/Servers/Kestrel/Directory.Build.props +++ b/src/Servers/Kestrel/Directory.Build.props @@ -10,7 +10,7 @@ $(MSBuildThisFileDirectory)shared\ - + SignalR win-x86 - diff --git a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj index 6454353c7085..3122c60e2be9 100644 --- a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj +++ b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj @@ -6,7 +6,6 @@ java:signalr true - false $(OutputPath) diff --git a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj index 09d1441cc1ab..e6bf6dea89d7 100644 --- a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj +++ b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj @@ -6,7 +6,6 @@ java:signalr-messagepack true - false $(OutputPath) diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index df6a012b55ab..3e8dfac79be9 100644 --- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -3,7 +3,6 @@ false - true true true diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index 6eb64f9feb09..a6e6de033dfb 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -3,7 +3,6 @@ false - true sauce.local <_TestSauceArgs>--verbose --no-color --configuration $(Configuration) --sauce-user "$(SauceUser)" --sauce-key "$(SauceKey)" <_TestSauceArgs Condition="'$(BrowserTestHostName)' != ''">$(_TestSauceArgs) --use-hostname "$(BrowserTestHostName)" @@ -19,7 +18,7 @@ - + @@ -59,5 +58,4 @@ - diff --git a/src/SignalR/clients/ts/client-ts.npmproj b/src/SignalR/clients/ts/client-ts.npmproj index ed1cf840b2ff..7037b55ba3af 100644 --- a/src/SignalR/clients/ts/client-ts.npmproj +++ b/src/SignalR/clients/ts/client-ts.npmproj @@ -1,5 +1,6 @@ + true false false @@ -7,8 +8,6 @@ - - true false false diff --git a/src/SignalR/clients/ts/common/common.npmproj b/src/SignalR/clients/ts/common/common.npmproj index 647ed15fb15c..27e53e669e9f 100644 --- a/src/SignalR/clients/ts/common/common.npmproj +++ b/src/SignalR/clients/ts/common/common.npmproj @@ -4,7 +4,6 @@ false false - false diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj index 30aa2443165f..24a8b7aa0acc 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj @@ -4,7 +4,6 @@ @microsoft/signalr-protocol-msgpack true - false true diff --git a/src/SignalR/clients/ts/signalr/signalr.npmproj b/src/SignalR/clients/ts/signalr/signalr.npmproj index 8fbb240c781d..f12deef340f4 100644 --- a/src/SignalR/clients/ts/signalr/signalr.npmproj +++ b/src/SignalR/clients/ts/signalr/signalr.npmproj @@ -4,7 +4,6 @@ @microsoft/signalr true - false diff --git a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj index df67ddfad7a4..961b18b849d6 100644 --- a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj +++ b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj @@ -8,8 +8,6 @@ $(NoWarn);CS1591 true aspnetcore - - false true true