diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2f5cd4a0a..d89f383bc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- 9005cee9510d23535c09bd9b6be7c426e526c067
+ 810920cf8a5fc183585304193f8b4e4e189497e9
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index b0e767e81..9ca177b82 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -358,7 +358,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
- $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild" }
+ $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -367,7 +367,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
- $buildTool = @{ Path = $msbuildPath; Command = "" }
+ $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" }
} else {
Write-Host "Unexpected value of -msbuildEngine: '$msbuildEngine'." -ForegroundColor Red
ExitWithExitCode 1
@@ -478,11 +478,11 @@ function Stop-Processes() {
# Terminates the script if the build fails.
#
function MSBuild() {
- if ($pipelinesLog -and $msbuildEngine) {
+ if ($pipelinesLog) {
+ $buildTool = InitializeBuildTool
$toolsetBuildProject = InitializeToolset
- $tf = if ($msbuildEngine -eq "dotnet") { "netcoreapp2.1" } else { "net472" }
$path = Split-Path -parent $toolsetBuildProject
- $path = Join-Path $path "$tf\Microsoft.DotNet.Arcade.Sdk.dll"
+ $path = Join-Path $path (Join-Path $buildTool.Framework "Microsoft.DotNet.Arcade.Sdk.dll")
$args += "/logger:$path"
}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 9dc565e29..df3eb8bce 100644
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -165,11 +165,11 @@ function InstallDotNet {
local install_script=$_GetDotNetInstallScript
local archArg=''
- if [[ "$#" -ge "3" ]]; then
+ if [[ -n "${3:-}" ]]; then
archArg="--architecture $3"
fi
local runtimeArg=''
- if [[ "$#" -ge "4" ]]; then
+ if [[ -n "${4:-}" ]]; then
runtimeArg="--runtime $4"
fi
diff --git a/global.json b/global.json
index 3e4fcbfdf..671e47527 100644
--- a/global.json
+++ b/global.json
@@ -10,7 +10,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19258.5",
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19260.2",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
}
}