[main] Update dependencies from dotnet/arcade

[dotnet-maestro]

This pull request updates the following dependencies

From https://github.com/dotnet/arcade

• Subscription: 840bf684-917a-4879-f62c-08d8e93a0c51
• Build: 20210628.2
• Date Produced: 6/28/2021 2:34 PM
• Commit: 685c1a4fa207d81e881a402a32ffa1c0fb191b42
• Branch: refs/heads/main

• Updates:
  • Microsoft.DotNet.Arcade.Sdk: from 6.0.0-beta.21323.1 to 6.0.0-beta.21328.2
  • Microsoft.DotNet.ApiCompat: from 6.0.0-beta.21323.1 to 6.0.0-beta.21328.2
  • Microsoft.DotNet.CodeAnalysis: from 6.0.0-beta.21323.1 to 6.0.0-beta.21328.2
  • Microsoft.DotNet.GenAPI: from 6.0.0-beta.21323.1 to 6.0.0-beta.21328.2
  • Microsoft.DotNet.Helix.Sdk: from 6.0.0-beta.21323.1 to 6.0.0-beta.21328.2

[ryalanms]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[ryalanms]

@mmitche: This script update is causing the build to fail. Could you take a look?

https://github.com/dotnet/wpf/pull/4750/files#diff-72b8f8e899b94872c6ead31fd06ec109da15bcb9ad2af6e78103d6763a31c637R381

(NETCORE_ENGINEERING_TELEMETRY=InitializeToolset) The property 'Prefer64bit' cannot be found on this object. Verify that the property exists.

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

[mmitche]

@dougbu Looks like that msbuild change broke something.

[dougbu]

Looks like that msbuild change broke something.

That's so weird. $GlobalJson.tools.vs exists in the global.json file and therefore $vsRequirements shouldn't be $null. And if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } is very similar to if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } earlier in the same function. I don't get it but will try to reproduce the issue locally after my (late) lunch…

[mmitche]

Looks like that msbuild change broke something.

That's so weird. $GlobalJson.tools.vs exists in the global.json file and therefore $vsRequirements shouldn't be $null. And if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } is very similar to if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } earlier in the same function. I don't get it but will try to reproduce the issue locally after my (late) lunch…

Thanks!

[dougbu]

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

Suggested change

	$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

[dougbu]

If this is urgent, take my suggestion even though this is an eng/common/ file. Wait for another Arcade build and validation if not.

[dougbu]

Fix for 'main' coming in dotnet/arcade#7564 @mmitche has already approved it (you are now pre-approved 😄)