[main] Update dependencies from dotnet/arcade #4750
Conversation
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
…624.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21323.1 -> To Version 6.0.0-beta.21324.3
ghost
requested review from
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@mmitche: This script update is causing the build to fail. Could you take a look? eng/common/tools.ps1 $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 |
|
@dougbu Looks like that msbuild change broke something. |
That's so weird. |
Thanks! |
eng/common/tools.ps1
Outdated
| 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 } |
There was a problem hiding this comment.
Found the problem that's on this line. All goes back to set-strictmode -version 2.0 which exists in the release/5.0 and main copies of eng/common/tools.ps1 but not the release/3.x one. See https://github.com/dotnet/wpf/pull/4750/files#diff-72b8f8e899b94872c6ead31fd06ec109da15bcb9ad2af6e78103d6763a31c637R59
Quick fix
| $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } | |
| $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } |
Tested this locally in dotnet/aspnetcore with same Arcade version
There was a problem hiding this comment.
If this is urgent, take my suggestion even though this is an eng/common/ file. Wait for another Arcade build and validation if not.
There was a problem hiding this comment.
Fix for 'main' coming in dotnet/arcade#7564 @mmitche has already approved it (you are now pre-approved 😄)
…628.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21323.1 -> To Version 6.0.0-beta.21328.2
dotnet-maestro
bot
deleted the
darc-main-8a8136c1-1867-4bc0-8b4f-9e040d168d6b
branch
ghost
locked as resolved and limited conversation to collaborators
This pull request updates the following dependencies
From https://github.com/dotnet/arcade