From 826dd31829109fd9d3ff95325452a6167a417516 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Jun 2021 12:03:28 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20210623.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21321.2 -> To Version 6.0.0-beta.21323.1 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1c9aeec802..d1e74bb5d1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + 1685a12f35cfb396f9352d63736eb675673b0e20 diff --git a/global.json b/global.json index 0884f406b36..906d7be94b5 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "5.0.300", + "version": "6.0.100-preview.4.21255.9", "rollForward": "minor" }, "tools": { - "dotnet": "5.0.300", + "dotnet": "6.0.100-preview.4.21255.9", "vs": { "version": "16.8", "components": [ @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 20581550108e67e9b7e36e65c2f1a79e46e3e767 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Jun 2021 12:03:25 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade build 20210624.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21321.2 -> To Version 6.0.0-beta.21324.3 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 11 ++++++++++- global.json | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1e74bb5d1e..2bf4e34e71f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c 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) { diff --git a/global.json b/global.json index 906d7be94b5..3006e1288e3 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From cd5ef956612b6e7e1560368b8de4336152abd51b Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Fri, 25 Jun 2021 14:34:41 +0200 Subject: [PATCH 3/7] Stick with 5.0.300 sdk until migrated to net6 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 3006e1288e3..1d889f1a515 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "5.0.300", "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9", + "dotnet": "5.0.300", "vs": { "version": "16.8", "components": [ From f056202b632964806dfa7df9b776c96e1a08b26b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Jun 2021 12:03:21 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/arcade build 20210624.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21321.2 -> To Version 6.0.0-beta.21324.3 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 1d889f1a515..3006e1288e3 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "5.0.300", + "version": "6.0.100-preview.4.21255.9", "rollForward": "minor" }, "tools": { - "dotnet": "5.0.300", + "dotnet": "6.0.100-preview.4.21255.9", "vs": { "version": "16.8", "components": [ From e74ec1ee0fe3a8a71dbed5bbe0b0809e3a3d5d0a Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Mon, 28 Jun 2021 15:29:04 +0200 Subject: [PATCH 5/7] Stick to stable SDK --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 3006e1288e3..1d889f1a515 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "5.0.300", "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9", + "dotnet": "5.0.300", "vs": { "version": "16.8", "components": [ From 15414dff88c43530fc0c7b11da19025aae5c66d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 12:06:21 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20210628.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21321.2 -> To Version 6.0.0-beta.21328.2 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 2 +- global.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bf4e34e71f..8a59a1999df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf4cb..4b255203249 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 1d889f1a515..6336fccd4e0 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "5.0.300", + "version": "6.0.100-preview.4.21255.9", "rollForward": "minor" }, "tools": { - "dotnet": "5.0.300", + "dotnet": "6.0.100-preview.4.21255.9", "vs": { "version": "16.8", "components": [ @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2" } } From 0446c0d9a970f3b900f32b9d6af0b0f4a95d580b Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 29 Jun 2021 17:52:15 +0200 Subject: [PATCH 7/7] Stick to 5.0.300 until sdk fix for F# is shipped into NET6 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 6336fccd4e0..fd94b4b71a4 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "5.0.300", "rollForward": "minor" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9", + "dotnet": "5.0.300", "vs": { "version": "16.8", "components": [