Skip to content

Commit

Permalink
Merge pull request #8981 from dotnet/darc-master-936e148d-434a-4231-9…
Browse files Browse the repository at this point in the history
…781-ca155a04c223

[master] Update dependencies from dotnet/arcade
  • Loading branch information
KevinRansom authored Apr 17, 2020
2 parents 3d7ea01 + b6c734c commit bdc57cd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20213.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20215.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1a55276ab9d16792cec595ba870df39a9d97d5ca</Sha>
<Sha>36fd49bf87b14b78d722179b787e6518b5205518</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,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)
Expand Down Expand Up @@ -578,7 +579,6 @@ function MSBuild-Core() {
}
}

Write-Host "$buildTool.Path: $buildTool.Path --- $cmdArgs"
$exitCode = Exec-Process $buildTool.Path $cmdArgs

if ($exitCode -ne 0) {
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20215.5",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
}
}

0 comments on commit bdc57cd

Please sign in to comment.