mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies from https://github.com/dotnet/arcade build 20190509.9 (#1934)

Browse source 
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19259.9
This commit is contained in:
dotnet-maestro[bot] 2019-05-10 12:25:59 +00:00 committed by GitHub
parent a39b10e2ba
commit 1eb1c5e04d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -72,9 +72,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19258.5"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19259.9">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9005cee9510d23535c09bd9b6be7c426e526c067</Sha> <Sha>155080ecb738e189db75f8f2461ebad75d955aa7</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

10
eng/common/tools.ps1
View file

@ -358,7 +358,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1 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") { } elseif ($msbuildEngine -eq "vs") {
try { try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@ -367,7 +367,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1 ExitWithExitCode 1
} }
$buildTool = @{ Path = $msbuildPath; Command = "" } $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" }
} else { } else {
Write-Host "Unexpected value of -msbuildEngine: '$msbuildEngine'." -ForegroundColor Red Write-Host "Unexpected value of -msbuildEngine: '$msbuildEngine'." -ForegroundColor Red
ExitWithExitCode 1 ExitWithExitCode 1
@ -478,11 +478,11 @@ function Stop-Processes() {
# Terminates the script if the build fails. # Terminates the script if the build fails.
# #
function MSBuild() { function MSBuild() {
if ($pipelinesLog -and $msbuildEngine) { if ($pipelinesLog) {
$buildTool = InitializeBuildTool
$toolsetBuildProject = InitializeToolset $toolsetBuildProject = InitializeToolset
$tf = if ($msbuildEngine -eq "dotnet") { "netcoreapp2.1" } else { "net472" }
$path = Split-Path -parent $toolsetBuildProject $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" $args += "/logger:$path"
} }

4
eng/common/tools.sh
View file

@ -165,11 +165,11 @@ function InstallDotNet {
local install_script=$_GetDotNetInstallScript local install_script=$_GetDotNetInstallScript
local archArg='' local archArg=''
if [[ "$#" -ge "3" ]]; then if [[ -n "${3:-}" ]]; then
archArg="--architecture $3" archArg="--architecture $3"
fi fi
local runtimeArg='' local runtimeArg=''
if [[ "$#" -ge "4" ]]; then if [[ -n "${4:-}" ]]; then
runtimeArg="--runtime $4" runtimeArg="--runtime $4"
fi fi

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview4-011223" "dotnet": "3.0.100-preview4-011223"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19258.5" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19259.9"
} }
} }