From 7937c6902bcba0865dff416a75e74d6aaf935c3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2019 13:23:55 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20191126.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19576.2 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19576.2 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19576.2 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19576.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19576.2 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19576.2 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19576.2 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19576.2 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19576.2 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19576.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19576.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19576.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19576.2 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19576.2 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- eng/common/tools.ps1 | 2 +- global.json | 8 +++--- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 868b1eaf579ac4..28663217b176a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,61 +58,61 @@ - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 - + https://github.com/dotnet/arcade - 549475dff607986e6d9626f0dc8678e9736b7d0c + e1f099bf18a14e8ef5dc50f1a90078839aa102c8 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4dff17d691796e..a695b5171a333a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,16 +32,16 @@ - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 2.5.1-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 - 5.0.0-beta.19575.7 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 + 2.5.1-beta.19576.2 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 + 5.0.0-beta.19576.2 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 26a6d03c8a0a65..d762c9f044a652 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -247,7 +247,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if ($msbuildCmd -ne $null) { # Workaround for https://github.com/dotnet/roslyn/issues/35793 # Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+ - $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0]) + $msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split([char[]]@('-', '+'))[0]) if ($msbuildVersion -ge $vsMinVersion) { return $global:_MSBuildExe = $msbuildCmd.Path diff --git a/global.json b/global.json index dd4d5636a1cb2d..632f2b24203e93 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.19575.7", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19575.7", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19575.7", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19575.7", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19576.2", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19576.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19576.2", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19576.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3", "Microsoft.Build.NoTargets": "1.0.53", From 88450a0f60112e432945209c146e5054ecb167cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Nov 2019 18:53:02 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20191127.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.19577.2 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19577.2 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.19577.2 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.19577.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19577.2 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.19577.2 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.19577.2 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.19577.2 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.19577.2 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19577.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.19577.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.19577.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19577.2 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.19577.2 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- global.json | 8 +++--- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28663217b176a1..673a6767712732 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,61 +58,61 @@ - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a - + https://github.com/dotnet/arcade - e1f099bf18a14e8ef5dc50f1a90078839aa102c8 + d049b49aad6509d769ef9f308834a178eb66721a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a695b5171a333a..a4114c0bf4ad6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,16 +32,16 @@ - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 - 2.5.1-beta.19576.2 - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 - 5.0.0-beta.19576.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 2.5.1-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 + 5.0.0-beta.19577.2 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 diff --git a/global.json b/global.json index 632f2b24203e93..c3e309154be47e 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.19576.2", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19576.2", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19576.2", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19576.2", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19577.2", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19577.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19577.2", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19577.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3", "Microsoft.Build.NoTargets": "1.0.53",