From 3560c4d427bbb8ddccea25c329ccb493c839e12e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 13:52:35 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210414.5 (#16936) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates/job/onelocbuild.yml | 3 +++ global.json | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c2352ad328..adcfeb8d98c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -203,21 +203,21 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21212.6"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21214.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha> + <Sha>93a6389f406e5e900da46ab643c608578f143851</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21212.6"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21214.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha> + <Sha>93a6389f406e5e900da46ab643c608578f143851</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21212.6"> + <Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21214.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha> + <Sha>93a6389f406e5e900da46ab643c608578f143851</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21212.6"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21214.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>db49d790a4bfa977a9ed7436bf2aa242cefae45e</Sha> + <Sha>93a6389f406e5e900da46ab643c608578f143851</Sha> </Dependency> <Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.4.21214.9"> <Uri>https://github.com/dotnet/runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index f7c43d4ecb05..6509b8066719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ <SystemCommandLineVersion>2.0.0-beta1.21118.1</SystemCommandLineVersion> <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion> <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion> - <MicrosoftDotNetSignToolVersion>6.0.0-beta.21212.6</MicrosoftDotNetSignToolVersion> + <MicrosoftDotNetSignToolVersion>6.0.0-beta.21214.5</MicrosoftDotNetSignToolVersion> <MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.4.21214.9</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> @@ -152,7 +152,7 @@ <PropertyGroup> <FluentAssertionsVersion>4.19.2</FluentAssertionsVersion> <FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion> - <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21212.6</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21214.5</MicrosoftDotNetXUnitExtensionsVersion> <MoqPackageVersion>4.8.2</MoqPackageVersion> </PropertyGroup> <PropertyGroup> diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 928a70cda2c5..d2b271ec1ac1 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -11,6 +11,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true + AutoCompletePr: false UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo @@ -54,6 +55,8 @@ jobs: lclSource: ${{ parameters.LclSource }} lclPackageId: ${{ parameters.LclPackageId }} isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index d1dbfeb0dd5a..b45a88d664b3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21212.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21212.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21214.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21214.5" } }