diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-06-29 19:02:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 19:02:32 +0300 |
| commit | 8103a7e3f21f67bf85763ae5703d53c0aaf591ab (patch) | |
| tree | 8a4fba8b3eb4fbdbb93b9f0236460bd519a7612b /eng/common/tools.ps1 | |
| parent | f3bad4f82787f3f2f0e949c750cd3c6f78705468 (diff) | |
[main] Update dependencies from 11 repositories (#54741)
[main] Update dependencies from 11 repositories
- Address new IL3002 and IL3003 warnings for the latest linker to unblock the build.
- Disable the trim analyzer for tests with EnableAggressiveTrimming
- Merge branch 'main' into darc-main-997daf91-1bd1-4e82-9eac-1347a9231dc5
Diffstat (limited to 'eng/common/tools.ps1')
| -rw-r--r-- | eng/common/tools.ps1 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aaee1..7942ffaf4cb 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) { |