Update dependencies from https://github.com/dotnet/arcade build 20190508.5 (#1922)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19258.5
This commit is contained in:
dotnet-maestro[bot] 2019-05-09 12:24:48 +00:00 committed by GitHub
parent 36b56792c7
commit 6101e36e01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions

View file

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

View file

@ -11,6 +11,12 @@
# Binary log must be enabled on CI.
[bool]$binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $ci }
# Set to true to use the pipelines logger which will enable Azure logging output.
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
# This flag is meant as a temporary opt-opt for the feature while validate it across
# our consumers. It will be deleted in the future.
[bool]$pipelinesLog = if (Test-Path variable:pipelinesLog) { $pipelinesLog } else { $ci }
# Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes).
[bool]$prepareMachine = if (Test-Path variable:prepareMachine) { $prepareMachine } else { $false }
@ -442,7 +448,7 @@ function InitializeToolset() {
'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
$path = Get-Content $toolsetLocationFile -TotalCount 1
if (!(Test-Path $path)) {
@ -472,6 +478,23 @@ function Stop-Processes() {
# Terminates the script if the build fails.
#
function MSBuild() {
if ($pipelinesLog -and $msbuildEngine) {
$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"
$args += "/logger:$path"
}
MSBuild-Core @args
}
#
# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function.
# The arguments are automatically quoted.
# Terminates the script if the build fails.
#
function MSBuild-Core() {
if ($ci) {
if (!$binaryLog) {
throw "Binary log must be enabled in CI build."
@ -549,4 +572,4 @@ if ($ci) {
$env:TEMP = $TempDir
$env:TMP = $TempDir
}
}

View file

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