From 41fd293dda27c099b063f51d8917e607271a508e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 5 Jul 2021 12:23:32 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210701.2 (#2131)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 8 ++++----
eng/Versions.props | 2 +-
eng/common/tools.ps1 | 2 +-
global.json | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 37c6735426af..72a3142d602a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,14 +3,14 @@
-
+
https://github.com/dotnet/arcade
- a68ec1edf328e737b31a09cb49e1929c28e91d0c
+ 7f52af24016a4b749a2c1f219105c0f5a7100028
-
+
https://github.com/dotnet/arcade
- a68ec1edf328e737b31a09cb49e1929c28e91d0c
+ 7f52af24016a4b749a2c1f219105c0f5a7100028
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index e2ed040e8814..874e405bee15 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
5.0.0
17.0.0-preview-21267-01
17.0.0-preview-21267-01
- 6.0.0-beta.21324.3
+ 6.0.0-beta.21351.2
6.0.0-beta.21271.1
3.10.0-2.final
3.10.0-2.final
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 7942ffaf4cb3..4b2552032493 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 035b67c3f470..c62599401f1e 100644
--- a/global.json
+++ b/global.json
@@ -8,7 +8,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21355.1"
}