Skip to content

Commit a17cfad

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20210701.2 (#25200)
[main] Update dependencies from dotnet/arcade
1 parent ae02adc commit a17cfad

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Diff for: eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
</Dependency>
5050
</ProductDependencies>
5151
<ToolsetDependencies>
52-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21324.3">
52+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21351.2">
5353
<Uri>https://github.com/dotnet/arcade</Uri>
54-
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
54+
<Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21324.3">
56+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21351.2">
5757
<Uri>https://github.com/dotnet/arcade</Uri>
58-
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
58+
<Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha>
5959
</Dependency>
6060
</ToolsetDependencies>
6161
</Dependencies>

Diff for: eng/common/tools.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
380380
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
381381

382382
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
383-
$local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false }
383+
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
384384
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
385385
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
386386
} else {

Diff for: global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"rollForward": "latestMajor"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3",
22-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3"
21+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2",
22+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21351.2"
2323
}
2424
}

0 commit comments

Comments
 (0)