diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-07-05 15:23:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 15:23:32 +0300 |
| commit | 41fd293dda27c099b063f51d8917e607271a508e (patch) | |
| tree | 243472f4a0af8cad8d08f83cab35bb575840ad20 /eng | |
| parent | b04497912ad20817a845900d7a732835c2963ce9 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20210701.2 (#2131)
[main] Update dependencies from dotnet/arcade
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rw-r--r-- | eng/common/tools.ps1 | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37c673542..72a3142d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,14 +3,14 @@ <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> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21324.3"> + <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21351.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha> + <Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.7.21355.1"> <Uri>https://github.com/dotnet/runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index e2ed040e8..874e405be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion> <MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion> <MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion> - <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21324.3</MicrosoftDotNetApiCompatVersion> + <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21351.2</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion> <MicrosoftCodeAnalysisVersion>3.10.0-2.final</MicrosoftCodeAnalysisVersion> diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf4..4b2552032 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 { |