File tree Expand file tree Collapse file tree 4 files changed +13
-9
lines changed Expand file tree Collapse file tree 4 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 47
47
</Dependency >
48
48
</ProductDependencies >
49
49
<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 " >
51
51
<Uri >https://github.com/dotnet/arcade</Uri >
52
- <Sha >9cb5f28be59a1ba9fe6bfb86449b216cfcdfb50e </Sha >
52
+ <Sha >03497f16b93264158c28cee4eea767b53bc750f5 </Sha >
53
53
</Dependency >
54
54
</ToolsetDependencies >
55
55
</Dependencies >
Original file line number Diff line number Diff line change @@ -417,15 +417,15 @@ function InitializeToolset() {
417
417
418
418
$proj = Join-Path $ToolsetDir " restore.proj"
419
419
$bl = if ($binaryLog ) { " /bl:" + (Join-Path $LogDir " ToolsetRestore.binlog" ) } else { " " }
420
-
420
+
421
421
' <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
+
424
424
$path = Get-Content $toolsetLocationFile - TotalCount 1
425
425
if (! (Test-Path $path )) {
426
426
throw " Invalid toolset path: $path "
427
427
}
428
-
428
+
429
429
return $global :_ToolsetBuildProj = $path
430
430
}
431
431
Original file line number Diff line number Diff line change @@ -238,11 +238,15 @@ function InitializeToolset {
238
238
ExitWithExitCode 2
239
239
fi
240
240
241
- local toolset_restore_log=" $log_dir /ToolsetRestore.binlog"
242
241
local proj=" $toolset_dir /restore.proj"
243
242
243
+ local bl=" "
244
+ if [[ " $binary_log " == true ]]; then
245
+ bl=" /bl:$log_dir /ToolsetRestore.binlog"
246
+ fi
247
+
244
248
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 "
246
250
247
251
local toolset_build_proj=` cat " $toolset_location_file " `
248
252
Original file line number Diff line number Diff line change 9
9
"version" : " 3.0.100-preview-010024"
10
10
},
11
11
"msbuild-sdks" : {
12
- "Microsoft.DotNet.Arcade.Sdk" : " 1.0.0-beta.19113.1 "
12
+ "Microsoft.DotNet.Arcade.Sdk" : " 1.0.0-beta.19114.4 "
13
13
}
14
14
}
You can’t perform that action at this time.
0 commit comments