diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-07-05 16:23:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 16:23:35 +0300 |
| commit | 935d08dd541ba19c63dc009e53d06cc580bacbda (patch) | |
| tree | 4f06ec37b656ba8a7d831a1eb76ed6d41da0fb90 | |
| parent | 51c322893cff67a67e503d00e9c328d9d40b6a06 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20210701.2 (#121)
[release/11.x] Update dependencies from dotnet/arcade
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rw-r--r-- | eng/common/tools.ps1 | 2 | ||||
| -rw-r--r-- | global.json | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fd4f420045b..e8719729ac37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21324.3"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21351.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha> + <Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21324.3"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21351.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha> + <Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21324.3"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21351.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha> + <Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index ca46666d9afd..9f3844b37b57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21324.3</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21351.2</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf4cb3..4b2552032493 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -380,7 +380,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" - $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" } else { diff --git a/global.json b/global.json index a1e5f714a292..16c7173cb9dd 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "6.0.100-preview.4.21255.9" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21351.2", "Microsoft.Build.Traversal": "2.0.2" } } |