From 7b43d5ecff53c894f1c36d907accdde2034f2b91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 12:31:13 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210628.2 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21324.3 -> To Version 6.0.0-beta.21328.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16d167c045..c05821fdd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,25 +15,25 @@ - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 21aa1f7d27..73330ef5eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,8 +97,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21324.3 - 6.0.0-beta.21324.3 + 6.0.0-beta.21328.2 + 6.0.0-beta.21328.2 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 - 6.0.0-beta.21324.3 + 6.0.0-beta.21328.2 1.0.0-beta.21265.1 1.1.0-beta.21228.1 1.0.0-prerelease.21264.3 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf4c..4b25520324 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -380,7 +380,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" - $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" } else { diff --git a/global.json b/global.json index d69fff1db8..9f28af3484 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "vswhere": "2.5.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21328.2" } }