From 5096dc54c3dc9daf71f67b2ebd919f726ca3aaf6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 25 Jun 2021 18:10:09 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#1098)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/tools.ps1 | 11 ++++++++++-
global.json | 2 +-
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cb416097..ea6fa3c9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 28a6403ee97077256fcdc60f599f0ad9e38e3cfa
+ a68ec1edf328e737b31a09cb49e1929c28e91d0c
-
+
https://github.com/dotnet/arcade
- 28a6403ee97077256fcdc60f599f0ad9e38e3cfa
+ a68ec1edf328e737b31a09cb49e1929c28e91d0c
-
+
https://github.com/dotnet/arcade
- 28a6403ee97077256fcdc60f599f0ad9e38e3cfa
+ a68ec1edf328e737b31a09cb49e1929c28e91d0c
-
+
https://github.com/dotnet/arcade
- 28a6403ee97077256fcdc60f599f0ad9e38e3cfa
+ a68ec1edf328e737b31a09cb49e1929c28e91d0c
-
+
https://github.com/dotnet/arcade
- 28a6403ee97077256fcdc60f599f0ad9e38e3cfa
+ a68ec1edf328e737b31a09cb49e1929c28e91d0c
https://github.com/dotnet/arcade-services
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 5619c7aa..7942ffaf 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
- return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
+
+ $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
+ $local:Prefer64bit = if ($vsRequirements.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 {
+ $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
+ }
+
+ return $global:_MSBuildExe
}
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
diff --git a/global.json b/global.json
index fe4b9a20..58e8969c 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3"
}
}