From 8d4b127d00301a21fa9f9b25f06647cc99b28c6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Mar 2020 16:57:37 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20200312.3 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20162.3 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20162.3 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20162.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20162.3 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20162.3 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20162.3 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20162.3 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20162.3 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20162.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20162.3 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20162.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20162.3 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20162.3 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20162.3 --- 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 ce405a25a04853..ecc990227be245 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,61 +6,61 @@ - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + 16d4350184cf362cd59807b589d1c93803025abc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e4e2a47b7d20d7..e0099e6bca9001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,16 +60,16 @@ - 5.0.0-beta.20162.4 - 5.0.0-beta.20160.4 - 5.0.0-beta.20160.4 - 5.0.0-beta.20160.4 - 5.0.0-beta.20160.4 - 5.0.0-beta.20160.4 - 2.5.1-beta.20160.4 - 5.0.0-beta.20160.4 - 5.0.0-beta.20160.4 - 5.0.0-beta.20160.4 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 + 2.5.1-beta.20162.3 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 + 5.0.0-beta.20162.3 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/global.json b/global.json index bcff5c30e77c44..6d71700e679e06 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.20160.4", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20160.4", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20160.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20160.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20162.3", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20162.3", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20162.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20162.3", "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", From 565e061e301a8fd296d487b5513206a894de16d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Mar 2020 17:25:22 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/runtime-assets build 20200312.1 - System.Windows.Extensions.TestData - 5.0.0-beta.20162.1 - System.Security.Cryptography.X509Certificates.TestData - 5.0.0-beta.20162.1 - System.Private.Runtime.UnicodeData - 5.0.0-beta.20162.1 - System.Net.TestData - 5.0.0-beta.20162.1 - System.IO.Packaging.TestData - 5.0.0-beta.20162.1 - System.IO.Compression.TestData - 5.0.0-beta.20162.1 - System.Drawing.Common.TestData - 5.0.0-beta.20162.1 - System.ComponentModel.TypeConverter.TestData - 5.0.0-beta.20162.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecc990227be245..a8853aa0a6ef63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,37 +86,37 @@ https://github.com/microsoft/vstest 53da99a8a1ed39d1df63429fc2d61011fb57fb23 - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c - + https://github.com/dotnet/runtime-assets - d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 + 9f99c474432904fadab3bcda4a65b20c1e990a6c https://github.com/dotnet/llvm-project diff --git a/eng/Versions.props b/eng/Versions.props index e0099e6bca9001..8bf6452e9d2e16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,14 +82,14 @@ 5.0.0-alpha.1.19563.3 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 - 5.0.0-beta.20125.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 + 5.0.0-beta.20162.1 2.2.0-prerelease.19564.1 From 33181ca7dca196295e4516104d9295b98de1a96b Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Fri, 13 Mar 2020 11:44:38 -0700 Subject: [PATCH 3/3] Remove APICompat downgrade --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8853aa0a6ef63..570feed7184d14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,7 +14,7 @@ https://github.com/dotnet/arcade 16d4350184cf362cd59807b589d1c93803025abc - + https://github.com/dotnet/arcade 16d4350184cf362cd59807b589d1c93803025abc diff --git a/eng/Versions.props b/eng/Versions.props index 8bf6452e9d2e16..aebceaa9fb0cb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ - 5.0.0-beta.20162.3 + 5.0.0-beta.20162.4 5.0.0-beta.20162.3 5.0.0-beta.20162.3 5.0.0-beta.20162.3