From 92936914c316b8565c4e43a653aff1db1269e0ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Oct 2021 12:17:33 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20211027.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21527.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 52f4b871e6e..0caf98f174b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,25 +75,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 diff --git a/eng/Versions.props b/eng/Versions.props index 125daa251a3..6393120c38d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,9 +37,9 @@ - 7.0.0-beta.21527.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 + 7.0.0-beta.21527.5 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 caefb3dc2c9..c8311b2ee05 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "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" }, "sdk": { "version": "6.0.100-rc.1.21430.12"