Skip to content

Commit 2c22a29

Browse files
dotnet-maestro[bot]baronfel
dotnet-maestro[bot]
authored and
baronfel
committed
[master] Update dependencies from dotnet/arcade (#7269)
* Update dependencies from https://github.com/dotnet/arcade build 20190723.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19373.6 * Update dependencies from https://github.com/dotnet/arcade build 20190724.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19374.2 * Update dependencies from https://github.com/dotnet/arcade build 20190725.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.2
1 parent 90db61b commit 2c22a29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3268
-141
lines changed

‎eng/Build.ps1‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ param (
5353
[switch]$testVs,
5454
[switch]$testAll,
5555
[string]$officialSkipTests = "false",
56+
[switch]$noVisualStudio,
5657

5758
[parameter(ValueFromRemainingArguments=$true)][string[]]$properties)
5859

@@ -96,6 +97,7 @@ function Print-Usage() {
9697
Write-Host " -procdump Monitor test runs with procdump"
9798
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
9899
Write-Host " -useGlobalNuGetCache Use global NuGet cache."
100+
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
99101
Write-Host ""
100102
Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
101103
}
@@ -145,8 +147,19 @@ function Process-Arguments() {
145147
}
146148

147149
function Update-Arguments() {
148-
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.exe")) {
149-
$script:bootstrap = $True
150+
if ($script:noVisualStudio) {
151+
$script:bootstrapTfm = "netcoreapp2.1"
152+
$script:msbuildEngine = "dotnet"
153+
}
154+
155+
if ($bootstrapTfm -eq "netcoreapp2.1") {
156+
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
157+
$script:bootstrap = $True
158+
}
159+
} else {
160+
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.exe") -or (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.runtimeconfig.json")) {
161+
$script:bootstrap = $True
162+
}
150163
}
151164
}
152165

@@ -228,10 +241,37 @@ function TestUsingNUnit([string] $testProject, [string] $targetFramework) {
228241
$projectName = [System.IO.Path]::GetFileNameWithoutExtension($testProject)
229242
$testLogPath = "$ArtifactsDir\TestResults\$configuration\${projectName}_$targetFramework.xml"
230243
$testBinLogPath = "$LogDir\${projectName}_$targetFramework.binlog"
231-
$args = "test $testProject --no-restore --no-build -c $configuration -f $targetFramework -v n --test-adapter-path . --logger ""nunit;LogFilePath=$testLogPath"" /bl:$testBinLogPath"
244+
$args = "test $testProject -c $configuration -f $targetFramework -v n --test-adapter-path . --logger ""nunit;LogFilePath=$testLogPath"" /bl:$testBinLogPath"
245+
246+
if (-not $noVisualStudio -or $norestore) {
247+
$args += " --no-restore"
248+
}
249+
250+
if (-not $noVisualStudio) {
251+
$args += " --no-build"
252+
}
253+
232254
Exec-Console $dotnetExe $args
233255
}
234256

257+
function BuildCompiler() {
258+
if ($bootstrapTfm -eq "netcoreapp2.1") {
259+
$dotnetPath = InitializeDotNetCli
260+
$dotnetExe = Join-Path $dotnetPath "dotnet.exe"
261+
$fscProject = "$RepoRoot\src\fsharp\fsc\fsc.fsproj"
262+
$fsiProject = "$RepoRoot\src\fsharp\fsi\fsi.fsproj"
263+
264+
$argNoRestore = if ($norestore) { " --no-restore" } else { "" }
265+
$argNoIncremental = if ($rebuild) { " --no-incremental" } else { "" }
266+
267+
$args = "build $fscProject -c $configuration -v $verbosity -f netcoreapp2.1" + $argNoRestore + $argNoIncremental
268+
Exec-Console $dotnetExe $args
269+
270+
$args = "build $fsiProject -c $configuration -v $verbosity -f netcoreapp2.1" + $argNoRestore + $argNoIncremental
271+
Exec-Console $dotnetExe $args
272+
}
273+
}
274+
235275
function Prepare-TempDir() {
236276
Copy-Item (Join-Path $RepoRoot "tests\Resources\Directory.Build.props") $TempDir
237277
Copy-Item (Join-Path $RepoRoot "tests\Resources\Directory.Build.targets") $TempDir
@@ -260,7 +300,11 @@ try {
260300
}
261301

262302
if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish) {
263-
BuildSolution
303+
if ($noVisualStudio) {
304+
BuildCompiler
305+
} else {
306+
BuildSolution
307+
}
264308
}
265309

266310
if ($build) {
@@ -270,7 +314,7 @@ try {
270314
$desktopTargetFramework = "net472"
271315
$coreclrTargetFramework = "netcoreapp2.1"
272316

273-
if ($testDesktop) {
317+
if ($testDesktop -and -not $noVisualStudio) {
274318
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
275319
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj" -targetFramework $desktopTargetFramework
276320
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $desktopTargetFramework
@@ -286,7 +330,7 @@ try {
286330
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $coreclrTargetFramework
287331
}
288332

289-
if ($testFSharpQA) {
333+
if ($testFSharpQA -and -not $noVisualStudio) {
290334
Push-Location "$RepoRoot\tests\fsharpqa\source"
291335
$resultsRoot = "$ArtifactsDir\TestResults\$configuration"
292336
$resultsLog = "test-net40-fsharpqa-results.log"
@@ -305,21 +349,27 @@ try {
305349
}
306350

307351
if ($testFSharpCore) {
308-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
352+
if (-not $noVisualStudio) {
353+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
354+
}
309355
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
310356
}
311357

312358
if ($testCompiler) {
313-
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
359+
if (-not $noVisualStudio) {
360+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
361+
}
314362
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
315363
}
316364

317365
if ($testCambridge) {
318-
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $desktopTargetFramework
366+
if (-not $noVisualStudio) {
367+
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $desktopTargetFramework
368+
}
319369
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $coreclrTargetFramework
320370
}
321371

322-
if ($testVs) {
372+
if ($testVs -and -not $noVisualStudio) {
323373
TestUsingNUnit -testProject "$RepoRoot\vsintegration\tests\GetTypesVS.UnitTests\GetTypesVS.UnitTests.fsproj" -targetFramework $desktopTargetFramework
324374
TestUsingNUnit -testProject "$RepoRoot\vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" -targetFramework $desktopTargetFramework
325375
}

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19264.13">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19375.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>670f6ee1a619a2a7c84cfdfe2a1c84fbe94e1c6b</Sha>
8+
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/Versions.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,26 @@
110110
<!-- Visual Studio packages -->
111111
<EnvDTE80Version>8.0.1</EnvDTE80Version>
112112
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>14.0.25420</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
113-
<MicrosoftVisualStudioCoreUtilityVersion>16.0.467</MicrosoftVisualStudioCoreUtilityVersion>
114-
<MicrosoftVisualStudioComponentModelHostVersion>16.0.467</MicrosoftVisualStudioComponentModelHostVersion>
113+
<MicrosoftVisualStudioCoreUtilityVersion>16.1.89</MicrosoftVisualStudioCoreUtilityVersion>
114+
<MicrosoftVisualStudioComponentModelHostVersion>16.1.89</MicrosoftVisualStudioComponentModelHostVersion>
115115
<MicrosoftVisualStudioDesignerInterfacesVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesVersion>
116-
<MicrosoftVisualStudioEditorVersion>16.0.467</MicrosoftVisualStudioEditorVersion>
117-
<MicrosoftVisualStudioImageCatalogVersion>16.0.28727</MicrosoftVisualStudioImageCatalogVersion>
118-
<MicrosoftVisualStudioImagingVersion>16.0.28729</MicrosoftVisualStudioImagingVersion>
116+
<MicrosoftVisualStudioEditorVersion>16.1.89</MicrosoftVisualStudioEditorVersion>
117+
<MicrosoftVisualStudioImageCatalogVersion>16.1.28916.169</MicrosoftVisualStudioImageCatalogVersion>
118+
<MicrosoftVisualStudioImagingVersion>16.1.28917.181</MicrosoftVisualStudioImagingVersion>
119119
<MicrosoftVisualStudioLanguageServerClientVersion>16.1.3121</MicrosoftVisualStudioLanguageServerClientVersion>
120-
<MicrosoftVisualStudioLanguageStandardClassificationVersion>16.0.467</MicrosoftVisualStudioLanguageStandardClassificationVersion>
121-
<MicrosoftVisualStudioLanguageVersion>16.0.467</MicrosoftVisualStudioLanguageVersion>
122-
<MicrosoftVisualStudioLanguageIntellisenseVersion>16.0.467</MicrosoftVisualStudioLanguageIntellisenseVersion>
120+
<MicrosoftVisualStudioLanguageStandardClassificationVersion>16.1.89</MicrosoftVisualStudioLanguageStandardClassificationVersion>
121+
<MicrosoftVisualStudioLanguageVersion>16.1.89</MicrosoftVisualStudioLanguageVersion>
122+
<MicrosoftVisualStudioLanguageIntellisenseVersion>16.1.89</MicrosoftVisualStudioLanguageIntellisenseVersion>
123123
<MicrosoftVisualStudioManagedInterfacesVersion>8.0.50728</MicrosoftVisualStudioManagedInterfacesVersion>
124124
<MicrosoftVisualStudioOLEInteropVersion>7.10.6071</MicrosoftVisualStudioOLEInteropVersion>
125-
<MicrosoftVisualStudioPackageLanguageService150Version>16.0.28729</MicrosoftVisualStudioPackageLanguageService150Version>
125+
<MicrosoftVisualStudioPackageLanguageService150Version>16.1.28917.181</MicrosoftVisualStudioPackageLanguageService150Version>
126126
<MicrosoftVisualStudioProjectAggregatorVersion>8.0.50728</MicrosoftVisualStudioProjectAggregatorVersion>
127127
<MicrosoftVisualStudioProjectSystemVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemVersion>
128128
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
129129
<MicrosoftVisualStudioShell140Version>14.3.25407</MicrosoftVisualStudioShell140Version>
130-
<MicrosoftVisualStudioShell150Version>16.0.28729</MicrosoftVisualStudioShell150Version>
131-
<MicrosoftVisualStudioShellDesignVersion>16.0.28729</MicrosoftVisualStudioShellDesignVersion>
132-
<MicrosoftVisualStudioShellFrameworkVersion>16.0.28729</MicrosoftVisualStudioShellFrameworkVersion>
130+
<MicrosoftVisualStudioShell150Version>16.1.28917.181</MicrosoftVisualStudioShell150Version>
131+
<MicrosoftVisualStudioShellDesignVersion>16.1.28917.181</MicrosoftVisualStudioShellDesignVersion>
132+
<MicrosoftVisualStudioShellFrameworkVersion>16.1.28917.181</MicrosoftVisualStudioShellFrameworkVersion>
133133
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
134134
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
135135
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
@@ -139,15 +139,15 @@
139139
<MicrosoftVisualStudioShellInterop100Version>10.0.30320</MicrosoftVisualStudioShellInterop100Version>
140140
<MicrosoftVisualStudioShellInterop110Version>11.0.61031</MicrosoftVisualStudioShellInterop110Version>
141141
<MicrosoftVisualStudioShellInterop120Version>12.0.30111</MicrosoftVisualStudioShellInterop120Version>
142-
<MicrosoftVisualStudioTextDataVersion>16.0.467</MicrosoftVisualStudioTextDataVersion>
142+
<MicrosoftVisualStudioTextDataVersion>16.1.89</MicrosoftVisualStudioTextDataVersion>
143143
<MicrosoftVisualStudioTextManagerInteropVersion>7.10.6071</MicrosoftVisualStudioTextManagerInteropVersion>
144144
<MicrosoftVisualStudioTextManagerInterop80Version>8.0.50728</MicrosoftVisualStudioTextManagerInterop80Version>
145145
<MicrosoftVisualStudioTextManagerInterop100Version>10.0.30320</MicrosoftVisualStudioTextManagerInterop100Version>
146146
<MicrosoftVisualStudioTextManagerInterop120Version>12.0.30112</MicrosoftVisualStudioTextManagerInterop120Version>
147-
<MicrosoftVisualStudioTextUIVersion>16.0.467</MicrosoftVisualStudioTextUIVersion>
148-
<MicrosoftVisualStudioTextUIWpfVersion>16.0.467</MicrosoftVisualStudioTextUIWpfVersion>
147+
<MicrosoftVisualStudioTextUIVersion>16.1.89</MicrosoftVisualStudioTextUIVersion>
148+
<MicrosoftVisualStudioTextUIWpfVersion>16.1.89</MicrosoftVisualStudioTextUIWpfVersion>
149149
<MicrosoftVisualStudioThreadingVersion>16.0.102</MicrosoftVisualStudioThreadingVersion>
150-
<MicrosoftVisualStudioUtilitiesVersion>16.0.28729</MicrosoftVisualStudioUtilitiesVersion>
150+
<MicrosoftVisualStudioUtilitiesVersion>16.1.28917.181</MicrosoftVisualStudioUtilitiesVersion>
151151
<MicrosoftVisualStudioValidationVersion>15.3.58</MicrosoftVisualStudioValidationVersion>
152152
<MicrosoftVisualStudioWCFReferenceInteropVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropVersion>
153153
<MicrosoftVSSDKBuildToolsVersion>16.0.2264</MicrosoftVSSDKBuildToolsVersion>
@@ -179,4 +179,4 @@
179179
<StrawberryPerl64Version>5.22.2.1</StrawberryPerl64Version>
180180
<StreamJsonRpcVersion>2.0.187</StreamJsonRpcVersion>
181181
</PropertyGroup>
182-
</Project>
182+
</Project>

‎eng/build-utils.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string]
230230
# Important to not set $script:bootstrapDir here yet as we're actually in the process of
231231
# building the bootstrap.
232232
function Make-BootstrapBuild() {
233-
Write-Host "Building bootstrap compiler"
233+
Write-Host "Building bootstrap '$bootstrapTfm' compiler"
234234

235235
$dir = Join-Path $ArtifactsDir "Bootstrap"
236236
Remove-Item -re $dir -ErrorAction SilentlyContinue
@@ -244,7 +244,7 @@ function Make-BootstrapBuild() {
244244

245245
# prepare compiler
246246
$projectPath = "$RepoRoot\proto.proj"
247-
Run-MSBuild $projectPath "/restore /t:Publish" -logFileName "Bootstrap" -configuration $bootstrapConfiguration
247+
Run-MSBuild $projectPath "/restore /t:Publish /p:TargetFramework=$bootstrapTfm;ProtoTargetFramework=$bootstrapTfm" -logFileName "Bootstrap" -configuration $bootstrapConfiguration
248248
Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsc" -Force -Recurse
249249
Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsi" -Force -Recurse
250250

‎eng/build.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,11 @@ function TestUsingNUnit() {
176176
projectname="${projectname%.*}"
177177
testlogpath="$artifacts_dir/TestResults/$configuration/${projectname}_$targetframework.xml"
178178
args="test \"$testproject\" --no-restore --no-build -c $configuration -f $targetframework --test-adapter-path . --logger \"nunit;LogFilePath=$testlogpath\""
179-
"$DOTNET_INSTALL_DIR/dotnet" $args
179+
"$DOTNET_INSTALL_DIR/dotnet" $args || {
180+
local exit_code=$?
181+
echo "dotnet test failed (exit code '$exit_code')." >&2
182+
ExitWithExitCode $exit_code
183+
}
180184
}
181185

182186
function BuildSolution {

‎eng/common/PSScriptAnalyzerSettings.psd1‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@{
2+
IncludeRules=@('PSAvoidUsingCmdletAliases',
3+
'PSAvoidUsingWMICmdlet',
4+
'PSAvoidUsingPositionalParameters',
5+
'PSAvoidUsingInvokeExpression',
6+
'PSUseDeclaredVarsMoreThanAssignments',
7+
'PSUseCmdletCorrectly',
8+
'PSStandardDSCFunctionsInResource',
9+
'PSUseIdenticalMandatoryParametersForDSC',
10+
'PSUseIdenticalParametersForDSC')
11+
}

‎eng/common/PublishToPackageFeed.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'WINDOWSDESKTOP'">https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json</TargetStaticFeed>
5555
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'NUGETCLIENT'">https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json</TargetStaticFeed>
5656
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETENTITYFRAMEWORK6'">https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json</TargetStaticFeed>
57+
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETBLAZOR'">https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json</TargetStaticFeed>
5758
</PropertyGroup>
5859

5960
<Error

‎eng/common/SigningValidation.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
This MSBuild file is intended to be used as the body of the default
55
publishing release pipeline. The release pipeline will use this file
6-
to invoke the the SignCheck tool to validate that packages about to
6+
to invoke the SignCheck tool to validate that packages about to
77
be published are correctly signed.
88
99
Parameters:

‎eng/common/build.ps1‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[CmdletBinding(PositionalBinding=$false)]
22
Param(
33
[string][Alias('c')]$configuration = "Debug",
4+
[string]$platform = $null,
45
[string] $projects,
56
[string][Alias('v')]$verbosity = "minimal",
67
[string] $msbuildEngine = $null,
@@ -29,6 +30,7 @@ Param(
2930
function Print-Usage() {
3031
Write-Host "Common settings:"
3132
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
33+
Write-Host " -platform <value> Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild"
3234
Write-Host " -verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
3335
Write-Host " -binaryLog Output binary log (short: -bl)"
3436
Write-Host " -help Print help and exit"
@@ -77,6 +79,7 @@ function Build {
7779
InitializeCustomToolset
7880

7981
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
82+
$platformArg = if ($platform) { "/p:Platform=$platform" } else { "" }
8083

8184
if ($projects) {
8285
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -88,6 +91,7 @@ function Build {
8891

8992
MSBuild $toolsetBuildProj `
9093
$bl `
94+
$platformArg `
9195
/p:Configuration=$configuration `
9296
/p:RepoRoot=$RepoRoot `
9397
/p:Restore=$restore `
@@ -129,9 +133,8 @@ try {
129133
Build
130134
}
131135
catch {
132-
Write-Host $_
133-
Write-Host $_.Exception
134136
Write-Host $_.ScriptStackTrace
137+
Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_
135138
ExitWithExitCode 1
136139
}
137140

‎eng/common/build.sh‎

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ ci=false
6666
warn_as_error=true
6767
node_reuse=true
6868
binary_log=false
69+
pipelines_log=false
6970

7071
projects=''
7172
configuration='Debug'
@@ -92,6 +93,9 @@ while [[ $# > 0 ]]; do
9293
-binarylog|-bl)
9394
binary_log=true
9495
;;
96+
-pipelineslog|-pl)
97+
pipelines_log=true
98+
;;
9599
-restore|-r)
96100
restore=true
97101
;;
@@ -146,6 +150,7 @@ while [[ $# > 0 ]]; do
146150
done
147151

148152
if [[ "$ci" == true ]]; then
153+
pipelines_log=true
149154
binary_log=true
150155
node_reuse=false
151156
fi

0 commit comments

Comments
 (0)