From 5d0898881475602e65a96dacdb35c1bf127ee7d2 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 21 Feb 2019 18:32:07 -0800 Subject: [PATCH] Restore optional tooling for windows to use optimization data (dotnet/corefx#35433) Commit migrated from https://github.com/dotnet/corefx/commit/c839a4d5b1cb8889e6251d47aed3fdfd098586ef --- eng/InternalTools.props | 6 +++- eng/pipelines/libraries/corefx-base.yml | 49 +++++++++++++++------------------ eng/pipelines/libraries/windows.yml | 5 ---- eng/publish.proj | 2 +- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/eng/InternalTools.props b/eng/InternalTools.props index 701b8b4..19f5746 100644 --- a/eng/InternalTools.props +++ b/eng/InternalTools.props @@ -3,7 +3,11 @@ - + + true + + + diff --git a/eng/pipelines/libraries/corefx-base.yml b/eng/pipelines/libraries/corefx-base.yml index 84d0fa5..14de0bf 100644 --- a/eng/pipelines/libraries/corefx-base.yml +++ b/eng/pipelines/libraries/corefx-base.yml @@ -80,6 +80,10 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, 'true') }}: - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber) + - _dotnetFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + - group: DotNet-Internal-Tools-Feed + - group: DotNet-Blob-Feed + - ${{ if eq(parameters.isOfficialBuild, 'false') }}: - _msbuildCommonParameters: '' @@ -87,10 +91,6 @@ jobs: - group: DotNet-HelixApi-Access - _archiveTestsParameter: /p:ArchiveTests=Tests - - ${{ if eq(parameters.isOfficialBuild, 'true') }}: - - group: DotNet-Blob-Feed - - _dotnetFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - # Windows variables - ${{ if eq(parameters.targetOS, 'Windows_NT') }}: - _buildScript: build.cmd @@ -104,10 +104,6 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, 'false') }}: - _windowsOfficialBuildArguments: '' - # Optional tooling variables - - ${{ if eq(parameters.isOfficialBuild, 'true') }}: - - group: DotNet-Internal-Tools-Feed - # Non-Windows variables - ${{ if ne(parameters.targetOS, 'Windows_NT') }}: - _buildScript: ${{ job.buildScriptPrefix }}./build.sh @@ -149,25 +145,24 @@ jobs: - ${{ if ne(job.preBuildSteps[0], '') }}: - ${{ job.preBuildSteps }} - - ${{ if eq(job.customBuildSteps[0], '') }}: - - - ${{ if eq(parameters.isOfficialBuild, 'true') }}: - - task: NuGetToolInstaller@0 - inputs: - versionSpec: '4.9.2' - condition: eq(variables['_restoreInternalTools'], 'true') - - task: NuGetCommand@2 - displayName: Restore internal tools - inputs: - command: restore - feedsToUse: config - restoreSolution: 'eng\common\internal\Tools.csproj' - nugetConfigPath: 'NuGet.config' - restoreDirectory: '$(Build.SourcesDirectory)\.packages' - condition: eq(variables['_restoreInternalTools'], 'true') - env: - VSS_NUGET_EXTERNAL_FEED_ENDPOINTS: '{"endpointCredentials": [{"endpoint":"https://devdiv.pkgs.visualstudio.com/_packaging/8f470c7e-ac49-4afe-a6ee-cf784e438b93/nuget/v3/index.json", "username":"dn-bot","password":"$(dn-bot-devdiv-nuget-feed-read)"}]}' + - ${{ if eq(parameters.isOfficialBuild, 'true') }}: + - task: NuGetToolInstaller@0 + inputs: + versionSpec: '4.9.2' + condition: ne(variables['_skipRestoreInternalTools'], 'true') + - task: NuGetCommand@2 + displayName: Restore internal tools + inputs: + command: restore + feedsToUse: config + restoreSolution: 'eng\common\internal\Tools.csproj' + nugetConfigPath: 'NuGet.config' + restoreDirectory: '$(Build.SourcesDirectory)\.packages' + env: + VSS_NUGET_EXTERNAL_FEED_ENDPOINTS: '{"endpointCredentials": [{"endpoint":"https://devdiv.pkgs.visualstudio.com/_packaging/8f470c7e-ac49-4afe-a6ee-cf784e438b93/nuget/v3/index.json", "username":"dn-bot","password":"$(dn-bot-devdiv-nuget-feed-read)"}]}' + TargetGroup: $(_framework) + - ${{ if eq(job.customBuildSteps[0], '') }}: - script: $(_buildScript) $(_commonArguments) -f $(_framework) @@ -194,7 +189,7 @@ jobs: /p:TargetGroup=$(_framework) /p:OfficialBuildId=$(Build.BuildNumber) /p:ContinuousIntegrationBuild=true - /p:AssetManifestFileName='corefx-test-assets.xml' + /p:AssetManifestFileName=corefx-test-assets.xml /p:ManifestBuildId=$(Build.BuildNumber) /p:ManifestBuildData=Location=$(_dotnetFeedUrl) /p:ManifestBranch=$(Build.SourceBranchName) diff --git a/eng/pipelines/libraries/windows.yml b/eng/pipelines/libraries/windows.yml index 6a08bd4..8705d97 100644 --- a/eng/pipelines/libraries/windows.yml +++ b/eng/pipelines/libraries/windows.yml @@ -100,14 +100,12 @@ jobs: _architecture: x86 _framework: uapaot _helixQueues: $(uapNetfxQueues) - _restoreInternalTools: true UAPAOT_x64_Release: _BuildConfig: Release _architecture: x64 _framework: uapaot _helixQueues: $(uapNetfxQueues) - _restoreInternalTools: true pool: ${{ if eq(parameters.isOfficialBuild, 'true') }}: @@ -213,7 +211,6 @@ jobs: _BuildConfig: Release _architecture: x86 _framework: uapaot - _restoreInternalTools: true ${{ if eq(parameters.isOfficialBuild, 'true') }}: arm_Release: @@ -230,13 +227,11 @@ jobs: _BuildConfig: Release _architecture: arm _framework: uapaot - _restoreInternalTools: true UAPAOT_arm64_Release: _BuildConfig: Release _architecture: arm64 _framework: uapaot - _restoreInternalTools: true pool: ${{ if eq(parameters.isOfficialBuild, 'true') }}: diff --git a/eng/publish.proj b/eng/publish.proj index bef5b89..cf1545d 100644 --- a/eng/publish.proj +++ b/eng/publish.proj @@ -144,7 +144,7 @@ - +