Skip to content

Commit 88b1709

Browse files
dotnet-maestro[bot]dotMorten
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20190214.4 (dotnet#356)
This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19114.4
1 parent c951be0 commit 88b1709

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
</Dependency>
4848
</ProductDependencies>
4949
<ToolsetDependencies>
50-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19113.1">
50+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19114.4">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>9cb5f28be59a1ba9fe6bfb86449b216cfcdfb50e</Sha>
52+
<Sha>03497f16b93264158c28cee4eea767b53bc750f5</Sha>
5353
</Dependency>
5454
</ToolsetDependencies>
5555
</Dependencies>

eng/common/tools.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,15 @@ function InitializeToolset() {
417417

418418
$proj = Join-Path $ToolsetDir "restore.proj"
419419
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }
420-
420+
421421
'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
422-
MSBuild $proj $bl /t:__WriteToolsetLocation /noconsolelogger /p:__ToolsetLocationOutputFile=$toolsetLocationFile
423-
422+
MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
423+
424424
$path = Get-Content $toolsetLocationFile -TotalCount 1
425425
if (!(Test-Path $path)) {
426426
throw "Invalid toolset path: $path"
427427
}
428-
428+
429429
return $global:_ToolsetBuildProj = $path
430430
}
431431

eng/common/tools.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,15 @@ function InitializeToolset {
238238
ExitWithExitCode 2
239239
fi
240240

241-
local toolset_restore_log="$log_dir/ToolsetRestore.binlog"
242241
local proj="$toolset_dir/restore.proj"
243242

243+
local bl=""
244+
if [[ "$binary_log" == true ]]; then
245+
bl="/bl:$log_dir/ToolsetRestore.binlog"
246+
fi
247+
244248
echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
245-
MSBuild "$proj" /t:__WriteToolsetLocation /noconsolelogger /bl:"$toolset_restore_log" /p:__ToolsetLocationOutputFile="$toolset_location_file"
249+
MSBuild "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file"
246250

247251
local toolset_build_proj=`cat "$toolset_location_file"`
248252

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"version": "3.0.100-preview-010024"
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19113.1"
12+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19114.4"
1313
}
1414
}

0 commit comments

Comments
 (0)