diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-06-28 15:27:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 15:27:51 +0300 |
| commit | 84338086c5f36f4847b85242b1c8c2d3ea7177ac (patch) | |
| tree | 8241b4b97cfe6a18fadc2c73d9626bb8652e379f | |
| parent | 4768d09e44005032df7c2aaa836fe0147568e5eb (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20210624.3 (#2119)
[main] Update dependencies from dotnet/arcade
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rw-r--r-- | eng/common/tools.ps1 | 11 | ||||
| -rw-r--r-- | global.json | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d09dc666b..84a58b79e 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.21319.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21324.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha> + <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21319.2"> + <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21324.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha> + <Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.7.21328.2"> <Uri>https://github.com/dotnet/runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b63bbd86d..5b50ce9a1 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.21319.2</MicrosoftDotNetApiCompatVersion> + <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21324.3</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 5619c7aae..7942ffaf4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if ($vsRequirements.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 { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { diff --git a/global.json b/global.json index 1194af1fe..c523cd732 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21328.2" } |