From 73eec1b1223eb5d974a3ceff2419f2dc425ae4d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2019 17:06:41 +0100 Subject: [PATCH] [master] Update dependencies from dotnet/arcade Microsoft/vstest (#614) * Update dependencies from https://github.com/dotnet/arcade build 20191205.6 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19605.6 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19605.6 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19605.6 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19605.6 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19605.6 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19605.6 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19605.6 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19605.6 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19605.6 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19605.6 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19605.6 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19605.6 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19605.6 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19605.6 * Update dependencies from https://github.com/dotnet/arcade build 20191206.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19606.1 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19606.1 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19606.1 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19606.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19606.1 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19606.1 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19606.1 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19606.1 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19606.1 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19606.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19606.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19606.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19606.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19606.1 * Update dependencies from https://github.com/dotnet/arcade build 20191207.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19607.1 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19607.1 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19607.1 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19607.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19607.1 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19607.1 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19607.1 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19607.1 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19607.1 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19607.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19607.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19607.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19607.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19607.1 * Update dependencies from https://github.com/dotnet/arcade build 20191208.1 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19608.1 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19608.1 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19608.1 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19608.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19608.1 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19608.1 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19608.1 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19608.1 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19608.1 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19608.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19608.1 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19608.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19608.1 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19608.1 * Update dependencies from https://github.com/microsoft/vstest build 20191210-01 - Microsoft.NET.Test.Sdk - 16.5.0-preview-20191210-01 --- eng/Version.Details.xml | 60 +++++++++++------------ eng/Versions.props | 22 ++++----- eng/common/pipeline-logging-functions.ps1 | 4 +- global.json | 8 +-- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 595cb442cf1..a9a147d7ec7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,61 +58,61 @@ - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 - + https://github.com/dotnet/arcade - f2999360b70f05d7738cbfa2b61d1fdaff4ee77d + 71ce4c736b882e6112b395a0e92313be5dcb4328 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 - daf9b36c71391c47d4bebae35071a5e7ac2cdc5a + 3a92a4095e41879c80f0ced17e3443a0ca5c39b2 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index bc5bbeb6dd8..121c757fce0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,16 +31,16 @@ - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 - 2.5.1-beta.19604.4 - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 - 5.0.0-beta.19604.4 + 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-alpha.1.19562.8 5.0.0-alpha.1.19563.6 @@ -88,7 +88,7 @@ 4.4.0 - 16.5.0-preview-20191202-02 + 16.5.0-preview-20191210-01 2.4.1 2.0.5 12.0.3 diff --git a/eng/common/pipeline-logging-functions.ps1 b/eng/common/pipeline-logging-functions.ps1 index 2688c389bd9..a3e1317ad43 100644 --- a/eng/common/pipeline-logging-functions.ps1 +++ b/eng/common/pipeline-logging-functions.ps1 @@ -101,7 +101,7 @@ function Write-PipelineTaskError { [string]$Path, [switch]$AsOutput) - if(-Not (Test-Path variable:ci) -Or !$ci) { + if((Test-Path variable:ci) -And $ci) { Write-LoggingCommand -Area 'task' -Event 'prependpath' -Data $Path -AsOutput:$AsOutput } } @@ -237,4 +237,4 @@ function Write-LogIssue { } Write-Host $command -ForegroundColor $foregroundColor -BackgroundColor $backgroundColor -} \ No newline at end of file +} diff --git a/global.json b/global.json index 54da9f3fe14..d7e856ddb74 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.19604.4", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19604.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19604.4", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19604.4", + "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", "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.34.1