Merge pull request #8993 from dotnet/merges/master-to-release/fsharp5

KevinRansom · web-flow · commit 1bcfb7bc27dc · 2020-04-18T01:51:55.000-07:00
Merge master to release/fsharp5
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -286,6 +286,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   if (Test-Path variable:global:_MSBuildExe) {
     return $global:_MSBuildExe
   }
+
   if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
   $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { '15.9' }
   $vsMinVersion = [Version]::new($vsMinVersionStr)
@@ -631,7 +632,6 @@ function MSBuild-Core() {
     }
   }
 
-  Write-Host "$buildTool.Path: $buildTool.Path --- $cmdArgs"
   $exitCode = Exec-Process $buildTool.Path $cmdArgs
 
   if ($exitCode -ne 0) {

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =`
`286`	`286`	`if (Test-Path variable:global:_MSBuildExe) {`
`287`	`287`	`return $global:_MSBuildExe`
`288`	`288`	`}`
	`289`	`+`
`289`	`290`	`if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }`
`290`	`291`	`$vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { '15.9' }`
`291`	`292`	`$vsMinVersion = [Version]::new($vsMinVersionStr)`
`@@ -631,7 +632,6 @@ function MSBuild-Core() {`
`631`	`632`	`}`
`632`	`633`	`}`
`633`	`634`
`634`		`- Write-Host "$buildTool.Path: $buildTool.Path --- $cmdArgs"`
`635`	`635`	`$exitCode = Exec-Process $buildTool.Path $cmdArgs`
`636`	`636`
`637`	`637`	`if ($exitCode -ne 0) {`