From e8dc3a1d34c08d1079df13de3d37fabec1a50a90 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2020 16:31:11 +0100
Subject: [PATCH] [master] Update dependencies from dotnet/arcade
dotnet/runtime-assets (#31855)
* Update dependencies from https://github.com/dotnet/arcade build 20200205.2
- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20105.2
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20105.2
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20105.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20105.2
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20105.2
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20105.2
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20105.2
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20105.2
- Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20105.2
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20105.2
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20105.2
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20105.2
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20105.2
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20105.2
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20105.2
* Update dependencies from https://github.com/dotnet/runtime-assets build 20200205.1
- System.Windows.Extensions.TestData - 5.0.0-beta.20105.1
- System.Security.Cryptography.X509Certificates.TestData - 5.0.0-beta.20105.1
- System.Private.Runtime.UnicodeData - 5.0.0-beta.20105.1
- System.Net.TestData - 5.0.0-beta.20105.1
- System.IO.Packaging.TestData - 5.0.0-beta.20105.1
- System.IO.Compression.TestData - 5.0.0-beta.20105.1
- System.Drawing.Common.TestData - 5.0.0-beta.20105.1
- System.ComponentModel.TypeConverter.TestData - 5.0.0-beta.20105.1
---
eng/Version.Details.xml | 92 ++++++++++++++--------------
eng/Versions.props | 36 +++++------
eng/common/performance/performance-setup.ps1 | 2 +-
eng/common/performance/performance-setup.sh | 2 +-
global.json | 8 +--
5 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 23dea9a..68cefee 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -42,65 +42,65 @@
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 27c8467294a4e64ac6642b4c12ca63495ff126c8
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
-
+
https://github.com/dotnet/arcade
- 0b404cb7575c8addc5e10f3fac57e79c596db28e
+ b65df96ccb820fd5f7ea226aeba310485f395130
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -126,37 +126,37 @@
https://github.com/microsoft/vstest
fd0fe3df347a081b56c4da89f85a3e1ff463a4e7
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
-
+
https://github.com/dotnet/runtime-assets
- bb1d9660e3adf9acb81a229c91a8de9d25a020e1
+ 572e952eae1d4fc6e83300031c5f7c401014ff34
diff --git a/eng/Versions.props b/eng/Versions.props
index a579595..854eb25 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,16 +57,16 @@
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
- 2.5.1-beta.20104.2
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
- 5.0.0-beta.20104.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
+ 2.5.1-beta.20105.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
+ 5.0.0-beta.20105.2
5.0.0-alpha.1.20080.9
5.0.0-alpha.1.20080.9
@@ -81,14 +81,14 @@
5.0.0-alpha.1.19563.6
5.0.0-alpha.1.19563.3
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
- 5.0.0-beta.20072.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
+ 5.0.0-beta.20105.1
2.2.0-prerelease.19564.1
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index c521dc4..a6916d2 100644
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -50,7 +50,7 @@ if ($Internal) {
}
# FIX ME: This is a workaround until we get this from the actual pipeline
-$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
+$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
if ($RunFromPerformanceRepo) {
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 5dafe74..ba8bfc1 100755
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
fi
fi
-common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
+common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
if [[ "$run_from_perf_repo" = true ]]; then
diff --git a/global.json b/global.json
index 8e04b4b..02938d4 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python": "2.7.15"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20103.5",
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20104.2",
- "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20104.2",
- "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20104.2",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20105.2",
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20105.2",
+ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20105.2",
+ "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20105.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2",
"Microsoft.Build.NoTargets": "1.0.53",
--
2.7.4