From 52c46e3b805f772380f175c03baeb66f79bf963c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Oct 2021 12:26:17 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/arcade build 20211027.1 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21526.1 -> To Version 7.0.0-beta.21527.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d7b54b046..3029ac950e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - f08de5892cab40c9a0e94dcc54b4537763420494 + 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 - + https://github.com/dotnet/arcade - f08de5892cab40c9a0e94dcc54b4537763420494 + 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 - + https://github.com/dotnet/arcade - f08de5892cab40c9a0e94dcc54b4537763420494 + 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 - + https://github.com/dotnet/arcade - f08de5892cab40c9a0e94dcc54b4537763420494 + 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 - + https://github.com/dotnet/arcade - f08de5892cab40c9a0e94dcc54b4537763420494 + 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 99371e6725..b793796362 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 7.0.0-beta.21526.1 - 7.0.0-beta.21526.1 + 7.0.0-beta.21527.1 + 7.0.0-beta.21527.1 1.22.0 1.1.2 2.0.0 @@ -108,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 7.0.0-beta.21526.1 + 7.0.0-beta.21527.1 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/global.json b/global.json index 7257adf057..92c76bc8e1 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21526.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21526.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.1" } } From e5d70ca8ee748f59b7ad404c593177eeebd57775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Oct 2021 12:29:29 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/arcade build 20211027.5 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21526.1 -> To Version 7.0.0-beta.21527.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates/job/onelocbuild.yml | 3 +++ global.json | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3029ac950e..a0ed5b3c96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b793796362..83b47b9b4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 + 7.0.0-beta.21527.5 + 7.0.0-beta.21527.5 1.22.0 1.1.2 2.0.0 @@ -108,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 7.0.0-beta.21527.1 + 7.0.0-beta.21527.5 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2eb..a842886629 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 92c76bc8e1..82c90738d5 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.5" } } From 1fa7a3ad617713d0a52a8ac40f35663891479960 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Oct 2021 12:24:00 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/arcade build 20211028.3 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21526.1 -> To Version 7.0.0-beta.21528.3 --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates/job/execute-sdl.yml | 6 +----- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- global.json | 4 ++-- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0ed5b3c96..1b9a424f93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 83b47b9b4f..4eda5a7c79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 1.22.0 1.1.2 2.0.0 @@ -108,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 7.0.0-beta.21527.5 + 7.0.0-beta.21528.3 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849d..3aafc82e41 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 a842886629..c4fc18b3ee 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 1cc0c29e4f..ae85a99a85 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 a1f8fce96c..8dd1fdbd14 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 82c90738d5..91caa2744c 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21528.3" } } From 7bb9c4e3f0e9104e664957b2a10388434bee062b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Oct 2021 12:22:06 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/arcade build 20211029.1 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21526.1 -> To Version 7.0.0-beta.21529.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b9a424f93..f93bde5fef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd + 0558f85d950fee2838bf02b9ba1f20d67f00b504 - + https://github.com/dotnet/arcade - b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd + 0558f85d950fee2838bf02b9ba1f20d67f00b504 - + https://github.com/dotnet/arcade - b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd + 0558f85d950fee2838bf02b9ba1f20d67f00b504 - + https://github.com/dotnet/arcade - b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd + 0558f85d950fee2838bf02b9ba1f20d67f00b504 - + https://github.com/dotnet/arcade - b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd + 0558f85d950fee2838bf02b9ba1f20d67f00b504 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4eda5a7c79..b5e5136dd1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 7.0.0-beta.21528.3 - 7.0.0-beta.21528.3 + 7.0.0-beta.21529.1 + 7.0.0-beta.21529.1 1.22.0 1.1.2 2.0.0 @@ -108,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 7.0.0-beta.21528.3 + 7.0.0-beta.21529.1 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/global.json b/global.json index 91caa2744c..ad2986b542 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21528.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21529.1" } } From ddd65444965d0f2df6f845892fbba2599f48643e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Nov 2021 12:25:16 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/arcade build 20211102.1 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21526.1 -> To Version 7.0.0-beta.21552.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f93bde5fef..b4d271d0c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + c336f6cb59bd52dfe2a844c738ec044affc57634 - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + c336f6cb59bd52dfe2a844c738ec044affc57634 - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + c336f6cb59bd52dfe2a844c738ec044affc57634 - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + c336f6cb59bd52dfe2a844c738ec044affc57634 - + https://github.com/dotnet/arcade - 0558f85d950fee2838bf02b9ba1f20d67f00b504 + c336f6cb59bd52dfe2a844c738ec044affc57634 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b5e5136dd1..b3c6d46a24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 7.0.0-beta.21529.1 - 7.0.0-beta.21529.1 + 7.0.0-beta.21552.1 + 7.0.0-beta.21552.1 1.22.0 1.1.2 2.0.0 @@ -108,7 +108,7 @@ 1.1.0-beta.20258.6 1.1.0-beta-21228-01 1.1.0-beta-21228-01 - 7.0.0-beta.21529.1 + 7.0.0-beta.21552.1 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/global.json b/global.json index ad2986b542..16c3e89b82 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21529.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21529.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21552.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21552.1" } }