From c0075ae28f9c2b795b9397da08e9596fb97f613d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Oct 2021 12:02:30 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/arcade build 20211027.5 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21527.5 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/onelocbuild.yml | 3 +++ global.json | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac39b142a08..fb7db3638e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2ebb..a842886629b 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages @@ -64,6 +65,8 @@ jobs: ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index 36cd24e9a3f..03b36b699c6 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.7.21379.14", + "version": "6.0.100-rc.1.21430.12", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.7.21379.14", + "dotnet": "6.0.100-rc.1.21430.12", "vs": { "version": "16.8", "components": [ @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 51a39e4778aa29211772e0713a846227a5c57960 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Oct 2021 12:02:30 +0000 Subject: [PATCH 02/17] Update dependencies from https://github.com/dotnet/arcade build 20211028.3 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21528.3 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/execute-sdl.yml | 6 +----- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb7db3638e0..8b35c0b9f62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849d7..3aafc82e417 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -60,11 +60,7 @@ jobs: - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: - # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. - ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: - vmImage: windows-2019 + vmImage: windows-2019 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index a842886629b..c4fc18b3ee7 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4fd..ae85a99a853 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96ca..8dd1fdbd144 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' diff --git a/global.json b/global.json index 03b36b699c6..3285aca6c27 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 2c09e64d8dfa797c4f8cfed2120939fdcc65d98c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Oct 2021 12:02:08 +0000 Subject: [PATCH 03/17] Update dependencies from https://github.com/dotnet/arcade build 20211029.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21529.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b35c0b9f62..aa870f20de4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd + 0558f85d950fee2838bf02b9ba1f20d67f00b504 diff --git a/global.json b/global.json index 3285aca6c27..f46ff11a69c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From a6963f7bd66fbe61f4daf2ccac3a5a22331d2e80 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 1 Nov 2021 19:42:23 +0100 Subject: [PATCH 04/17] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index f46ff11a69c..0f6c5efe332 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21430.12", + "version": "6.0.100-preview.7.21379.14", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-rc.1.21430.12", + "dotnet": "6.0.100-preview.7.21379.14", "vs": { "version": "16.8", "components": [ From 5ff3c6bfd7024f1385dedd8ec73010919bbfc285 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Nov 2021 12:03:17 +0000 Subject: [PATCH 05/17] Update dependencies from https://github.com/dotnet/arcade build 20211102.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21552.1 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa870f20de4..9d5d53a2601 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + c336f6cb59bd52dfe2a844c738ec044affc57634 diff --git a/global.json b/global.json index 0f6c5efe332..596ee2e77c0 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.7.21379.14", + "version": "6.0.100-rc.1.21430.12", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.7.21379.14", + "dotnet": "6.0.100-rc.1.21430.12", "vs": { "version": "16.8", "components": [ @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21552.1", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 08bd235f6c9c983961cd6b86b9582d8b7e7243e2 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 2 Nov 2021 15:46:03 +0100 Subject: [PATCH 06/17] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 596ee2e77c0..66c4d104259 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21430.12", + "version": "6.0.100-preview.7.21379.14", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-rc.1.21430.12", + "dotnet": "6.0.100-preview.7.21379.14", "vs": { "version": "16.8", "components": [ From e5b9ba53508d5cba205f6626daa92293adde0e1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Nov 2021 12:02:06 +0000 Subject: [PATCH 07/17] Update dependencies from https://github.com/dotnet/arcade build 20211102.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21552.1 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 66c4d104259..596ee2e77c0 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.7.21379.14", + "version": "6.0.100-rc.1.21430.12", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.7.21379.14", + "dotnet": "6.0.100-rc.1.21430.12", "vs": { "version": "16.8", "components": [ From 0326ebc51a657405d0c802eaa985f8a20f0019a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Nov 2021 12:02:19 +0000 Subject: [PATCH 08/17] Update dependencies from https://github.com/dotnet/arcade build 20211103.3 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21553.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d5d53a2601..192ab2b2d69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - c336f6cb59bd52dfe2a844c738ec044affc57634 + 0c6a8fa272455f7f363d986d4077455353e5fe7c diff --git a/global.json b/global.json index 596ee2e77c0..237be463345 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21552.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21553.3", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 9695fc897cd85076409e3775b6b5e3b30fcb9993 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Thu, 4 Nov 2021 13:09:28 +0100 Subject: [PATCH 09/17] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 237be463345..747e560d4b9 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21430.12", + "version": "6.0.100-preview.7.21379.14", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-rc.1.21430.12", + "dotnet": "6.0.100-preview.7.21379.14", "vs": { "version": "16.8", "components": [ From fc28fd54458c32ff9d1910b115fcb03e1ccda0a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Nov 2021 12:02:39 +0000 Subject: [PATCH 10/17] Update dependencies from https://github.com/dotnet/arcade build 20211104.4 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21554.4 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/source-build.yml | 15 +++++++++------ eng/common/templates/job/source-index-stage1.yml | 10 +++++++--- global.json | 6 +++--- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 192ab2b2d69..7106d87fb64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 0c6a8fa272455f7f363d986d4077455353e5fe7c + 670231b2034b040c42af651d4c34d679784f0318 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5023d36dcb3..5cd5325d7b4 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,11 +31,6 @@ parameters: # container and pool. platform: {} - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - defaultContainerHostPool: - vmImage: ubuntu-20.04 - jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -47,7 +42,15 @@ jobs: container: ${{ parameters.platform.container }} ${{ if eq(parameters.platform.pool, '') }}: - pool: ${{ parameters.defaultContainerHostPool }} + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index ae85a99a853..4af724eb1a9 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -5,8 +5,6 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - pool: - vmImage: 'windows-2019' condition: '' dependsOn: '' @@ -24,7 +22,13 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables - pool: ${{ parameters.pool }} + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} diff --git a/global.json b/global.json index 747e560d4b9..033224bb374 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.7.21379.14", + "version": "6.0.100-rc.1.21430.12", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.7.21379.14", + "dotnet": "6.0.100-rc.1.21430.12", "vs": { "version": "16.8", "components": [ @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21553.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 419bcaad09f46b13849820725f929856e7c78f90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Nov 2021 12:02:24 +0000 Subject: [PATCH 11/17] Update dependencies from https://github.com/dotnet/arcade build 20211105.2 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21555.2 --- eng/Version.Details.xml | 4 ++-- eng/common/post-build/symbols-validation.ps1 | 16 ++++++++-------- global.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7106d87fb64..321b633ed38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 670231b2034b040c42af651d4c34d679784f0318 + a7c57abb74deaee6dac921dd68f9c3c58059ebfb diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index a4a92efbedf..cd2181bafa0 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -134,17 +134,17 @@ $CountMissingSymbols = { # Save the output and get diagnostic output $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String - if (Test-Path $PdbPath) { - return 'PDB' + if ((Test-Path $PdbPath) -and (Test-path $SymbolPath)) { + return 'Module and PDB for Module' } - elseif (Test-Path $NGenPdb) { - return 'NGen PDB' + elseif ((Test-Path $NGenPdb) -and (Test-Path $PdbPath) -and (Test-Path $SymbolPath)) { + return 'Dll, PDB and NGen PDB' } - elseif (Test-Path $SODbg) { - return 'DBG for SO' + elseif ((Test-Path $SODbg) -and (Test-Path $SymbolPath)) { + return 'So and DBG for SO' } - elseif (Test-Path $DylibDwarf) { - return 'Dwarf for Dylib' + elseif ((Test-Path $DylibDwarf) -and (Test-Path $SymbolPath)) { + return 'Dylib and Dwarf for Dylib' } elseif (Test-Path $SymbolPath) { return 'Module' diff --git a/global.json b/global.json index 033224bb374..a5a5c321df4 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From a567e8a835ec5cb22948e24bcac4c5c08ffa9143 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Mon, 8 Nov 2021 13:44:08 -0700 Subject: [PATCH 12/17] use stable sdk --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index a5a5c321df4..163fbe75fa3 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-rc.1.21430.12", + "version": "6.0.100", "allowPrerelease": true, "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-rc.1.21430.12", + "dotnet": "6.0.100", "vs": { "version": "16.8", "components": [ From 7185e0cb0b57be7e379abc50ca7ac392eab870c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Nov 2021 13:03:11 +0000 Subject: [PATCH 13/17] Update dependencies from https://github.com/dotnet/arcade build 20211109.3 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21559.3 --- eng/Version.Details.xml | 4 ++-- eng/common/msbuild.ps1 | 1 + global.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 321b633ed38..69ada837d7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index eea19cd8452..f041e5ddd95 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -6,6 +6,7 @@ Param( [switch] $ci, [switch] $prepareMachine, [switch] $excludePrereleaseVS, + [string] $msbuildEngine = $null, [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs ) diff --git a/global.json b/global.json index 163fbe75fa3..143e5ead77f 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From b22be9f975a4698e16f78dc948c10bdc096cdb3c Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Nov 2021 16:35:47 +0100 Subject: [PATCH 14/17] Stick with preview7 due to build errors, don't roll forward --- global.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 143e5ead77f..ed96ed5c9ee 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,10 @@ { "sdk": { - "version": "6.0.100", - "allowPrerelease": true, - "rollForward": "minor" + "version": "6.0.100-preview.7.21379.14", + "allowPrerelease": true }, "tools": { - "dotnet": "6.0.100", + "dotnet": "6.0.100-preview.7.21379.14", "vs": { "version": "16.8", "components": [ From 95c931a9052a464878fb699807f3ac971fd5bb41 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Nov 2021 18:20:37 +0100 Subject: [PATCH 15/17] Update to stable sdk for both normal and service builds --- global.json | 9 +++++---- service/global.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/global.json b/global.json index ed96ed5c9ee..4a36c23e078 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,13 @@ { "sdk": { - "version": "6.0.100-preview.7.21379.14", - "allowPrerelease": true + "version": "6.0.100", + "allowPrerelease": true, + "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.7.21379.14", + "dotnet": "6.0.100", "vs": { - "version": "16.8", + "version": "17.0", "components": [ "Microsoft.VisualStudio.Component.FSharp" ] diff --git a/service/global.json b/service/global.json index 1950f1c063f..deddda37187 100644 --- a/service/global.json +++ b/service/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.300", + "version": "6.0.100", "allowPrerelease": true, "rollForward": "minor" } From 5e514c72cb3ea92e3de23171e0f1c932746e34bb Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Nov 2021 20:01:30 +0100 Subject: [PATCH 16/17] Downgrade vs back to 16.8 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 4a36c23e078..143e5ead77f 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "tools": { "dotnet": "6.0.100", "vs": { - "version": "17.0", + "version": "16.8", "components": [ "Microsoft.VisualStudio.Component.FSharp" ] From b248f31245dacc883bbf1962f073f1e950e43dfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Nov 2021 13:02:20 +0000 Subject: [PATCH 17/17] Update dependencies from https://github.com/dotnet/arcade build 20211116.10 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21527.1 -> To Version 7.0.0-beta.21566.10 --- eng/Version.Details.xml | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 2 +- eng/common/tools.ps1 | 57 +++++++++++++--------- eng/common/tools.sh | 62 +++++++++++++----------- global.json | 2 +- 5 files changed, 73 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69ada837d7e..83a27b3edd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 1157151f486..e5bef8ebd3a 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -124,7 +124,7 @@ try { Exec-BlockVerbosely { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` -GuardianCliLocation $guardianCliLocation ` - -WorkingDirectory $workingDirectory ` + -WorkingDirectory $SourceDirectory ` -UpdateBaseline $UpdateBaseline ` -GdnFolder $gdnFolder } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 44484289943..90b1f9fdcdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -301,31 +301,44 @@ function InstallDotNet([string] $dotnetRoot, if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($noPath) { $installParameters.NoPath = $True } - try { - & $installScript @installParameters - } - catch { - if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { - Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" - if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + $variations = @() + $variations += @($installParameters) - if ($runtimeSourceFeedKey) { - $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) - $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) - $installParameters.FeedCredential = $decodedString - } + $dotnetBuilds = $installParameters.Clone() + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $variations += @($dotnetBuilds) - try { - & $installScript @installParameters - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." - ExitWithExitCode 1 - } + if ($runtimeSourceFeed) { + $runtimeSource = $installParameters.Clone() + $runtimeSource.AzureFeed = $runtimeSourceFeed + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $runtimeSource.FeedCredential = $decodedString + } + $variations += @($runtimeSource) + } + + $installSuccess = $false + foreach ($variation in $variations) { + if ($variation | Get-Member AzureFeed) { + $location = $variation.AzureFeed } else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + $location = "public location"; + } + Write-Host "Attempting to install dotnet from $location." + try { + & $installScript @variation + $installSuccess = $true + break } + catch { + Write-Host "Failed to install dotnet from $location." + } + } + if (-not $installSuccess) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + ExitWithExitCode 1 } } @@ -887,7 +900,7 @@ function Try-LogClientIpAddress() Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" try { - $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing + $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing $lines = $result.Content.Split([Environment]::NewLine) $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" Write-Host $socketIp diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef72b..dd7030ff538 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -188,28 +188,29 @@ function InstallDotNet { GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local archArg='' + local installParameters=(--version $version --install-dir "$root") + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then - archArg="--architecture $3" + installParameters+=(--architecture $3) fi - local runtimeArg='' if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then - runtimeArg="--runtime $4" + installParameters+=(--runtime $4) fi - local skipNonVersionedFilesArg="" if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" + installParameters+=(--skip-non-versioned-files) fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local variations=() # list of variable names with parameter arrays in them + + local public_location=("${installParameters[@]}") + variations+=(public_location) + + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + variations+=(dotnetbuilds) - local runtimeSourceFeedKey='' + if [[ -n "${6:-}" ]]; then + variations+=(private_feed) + local private_feed=("${installParameters[@]}" --azure-feed $6) if [[ -n "${7:-}" ]]; then # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # '-d'. To work around this, do a simple detection and switch the parameter @@ -219,22 +220,27 @@ function InstallDotNet { decodeArg="-d" fi decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + private_feed+=(--feed-credential $decodedFeedKey) fi + fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else - if [[ $exit_code != 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - fi - ExitWithExitCode $exit_code + local installSuccess=0 + for variationName in "${variations[@]}"; do + local name="$variationName[@]" + local variation=("${!name}") + echo "Attempting to install dotnet from $variationName." + bash "$install_script" "${variation[@]}" && installSuccess=1 + if [[ "$installSuccess" -eq 1 ]]; then + break fi - } + + echo "Failed to install dotnet from $variationName." + done + + if [[ "$installSuccess" -eq 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + ExitWithExitCode 1 + fi } function with_retries { @@ -402,7 +408,7 @@ function StopProcesses { function TryLogClientIpAddress () { echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' if command -v curl > /dev/null; then - curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true + curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true fi } diff --git a/global.json b/global.json index 143e5ead77f..aba42851aab 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21566.10", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } }