From 77ce1058b951f5c2f79173364868a4f6567900c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2019 01:48:29 +0100 Subject: [PATCH] [master] Update dependencies from dotnet/arcade Microsoft/vstest (#790) * Update dependencies from https://github.com/dotnet/arcade build 20191211.6 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19611.6 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19611.6 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19611.6 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19611.6 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19611.6 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19611.6 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19611.6 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19611.6 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19611.6 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19611.6 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19611.6 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19611.6 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19611.6 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19611.6 * Update dependencies from https://github.com/microsoft/vstest build 20191211-02 - Microsoft.NET.Test.Sdk - 16.5.0-preview-20191211-02 --- eng/Version.Details.xml | 60 ++++++++++++++++++++++++------------------------- eng/Versions.props | 22 +++++++++--------- eng/common/tools.ps1 | 10 +++++++-- eng/common/tools.sh | 2 ++ global.json | 8 +++---- 5 files changed, 55 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9a147d..1638ffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,61 +58,61 @@ - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 - + https://github.com/dotnet/arcade - 71ce4c736b882e6112b395a0e92313be5dcb4328 + 71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -126,9 +126,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest - 3a92a4095e41879c80f0ced17e3443a0ca5c39b2 + f75b45caec00e16206262b24ce6b5b3419371516 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 121c757..e631ea5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,16 +31,16 @@ - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 - 2.5.1-beta.19608.1 - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 - 5.0.0-beta.19608.1 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 + 2.5.1-beta.19611.6 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 + 5.0.0-beta.19611.6 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 @@ -88,7 +88,7 @@ 4.4.0 - 16.5.0-preview-20191210-01 + 16.5.0-preview-20191211-02 2.4.1 2.0.5 12.0.3 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7753e75..09c3a33 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -232,7 +232,10 @@ function InstallDotNet([string] $dotnetRoot, } catch { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 } + } else { + ExitWithExitCode 1 } } } @@ -290,8 +293,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $vsMajorVersion = $vsMinVersion.Major $xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha" } - - $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install + + $vsInstallDir = $null + if ($xcopyMSBuildVersion.Trim() -ine "none") { + $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install + } if ($vsInstallDir -eq $null) { throw 'Unable to find Visual Studio that has required version and components installed' } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index f58db5e..e071af4 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -211,6 +211,8 @@ function InstallDotNet { Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." ExitWithExitCode $exit_code } + else + ExitWithExitCode $exit_code fi fi } diff --git a/global.json b/global.json index d7e856d..85141fa 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19608.1", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19608.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19608.1", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19608.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19611.6", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19611.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19611.6", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19611.6", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3", "Microsoft.Build.NoTargets": "1.0.53", -- 2.7.4