From 5b55aa567a7fbaebade68055b52745305a897b36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Jun 2021 12:23:43 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20210624.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21323.1 -> To Version 6.0.0-beta.21324.3 Dependency coherency updates XliffTasks From Version 1.0.0-beta.21312.1 -> To Version 1.0.0-beta.21320.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 11 ++++++++++- global.json | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1abefa99c505..aa852fc7affb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -233,22 +233,22 @@ - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c https://github.com/dotnet/source-build @@ -259,9 +259,9 @@ https://github.com/dotnet/runtime 7833828914a42f8c99dfa6f18ccd47f99dc2b56e - + https://github.com/dotnet/xliff-tasks - d4e95f2cca463823ce9c8e3394554883b6e3c091 + 5836ac11931b8e663c5cf81027dc834cbf41ecdd diff --git a/eng/Versions.props b/eng/Versions.props index 088e0f414136..9385943f6341 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 2.0.0-beta1.21223.1 4.0.0 5.0.0 - 6.0.0-beta.21323.1 + 6.0.0-beta.21324.3 3.1.0 6.0.0-preview.7.21324.1 4.3.0 @@ -154,7 +154,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.21323.1 + 6.0.0-beta.21324.3 4.8.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aaee1d..7942ffaf4cb3 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 55eb12bad5d7..f911be01c18c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21323.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3" } } From d488aaf3f796ee020fd903ca73865e4fd470338c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 12:26:57 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20210628.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21323.1 -> To Version 6.0.0-beta.21328.2 Dependency coherency updates XliffTasks From Version 1.0.0-beta.21320.1 -> To Version 1.0.0-beta.21325.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa852fc7affb..9fd206695768 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -233,22 +233,22 @@ - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 https://github.com/dotnet/source-build @@ -259,9 +259,9 @@ https://github.com/dotnet/runtime 7833828914a42f8c99dfa6f18ccd47f99dc2b56e - + https://github.com/dotnet/xliff-tasks - 5836ac11931b8e663c5cf81027dc834cbf41ecdd + 71c811561ad4dcf46825a5077fbcc668ab74754f diff --git a/eng/Versions.props b/eng/Versions.props index 9385943f6341..a6ee08403254 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 2.0.0-beta1.21223.1 4.0.0 5.0.0 - 6.0.0-beta.21324.3 + 6.0.0-beta.21328.2 3.1.0 6.0.0-preview.7.21324.1 4.3.0 @@ -154,7 +154,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.21324.3 + 6.0.0-beta.21328.2 4.8.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf4cb3..4b2552032493 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 { diff --git a/global.json b/global.json index f911be01c18c..2f413109ad9a 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21328.2" } }