From f17cf3399bf2c462560153987d39d9b14d185688 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2020 21:06:10 +0000 Subject: [PATCH] [master] Update dependencies from dotnet/sdk (#8966) [master] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.0-alpha.1.20514.1 to 6.0.0-alpha.1.20552.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.1 to 6.0.0-alpha.1.20528.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20417.3 to 6.0.0-alpha.1.20529.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 16.9.0-preview-20201013-01 to 16.8.0-release-20201022-02 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.0-alpha.1.20514.1 to 6.0.0-alpha.1.20527.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 3.9.0-1.20513.7 to 3.9.0-2.20552.4 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.9.0-preview-20513-07 to 16.9.0-preview-20530-04 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 5.8.0-rc.6860 to 5.8.0-rc.6930 (parent: Microsoft.NET.Sdk) - Update name of VS.Redist package - Update VS.Redist - Update Version.Details.xml - Update Versions.props - Merge branch 'master' into darc-master-e43dc338-58af-4dcb-8f48-e598405b6d80 - Disable test --- eng/Version.Details.xml | 104 +++++++++++++++++------------------ eng/Versions.props | 44 +++++++-------- test/SdkTests/TestConfig.xml | 4 ++ 3 files changed, 78 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe340ab28..76b5b97bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + 8cd5669a12a56d25b1c1d756ee6cbf08b4c9a57d - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + 8cd5669a12a56d25b1c1d756ee6cbf08b4c9a57d - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + 8cd5669a12a56d25b1c1d756ee6cbf08b4c9a57d - + https://github.com/dotnet/runtime - eea2256e56f32d70e3fbe72a1473a7ffd2f5c16e + ecd979c9860caee8326f8678736ae98a77bdae5b - + https://github.com/dotnet/runtime - eea2256e56f32d70e3fbe72a1473a7ffd2f5c16e + ecd979c9860caee8326f8678736ae98a77bdae5b - + https://github.com/dotnet/runtime - eea2256e56f32d70e3fbe72a1473a7ffd2f5c16e + ecd979c9860caee8326f8678736ae98a77bdae5b - + https://github.com/dotnet/runtime - eea2256e56f32d70e3fbe72a1473a7ffd2f5c16e + ecd979c9860caee8326f8678736ae98a77bdae5b - + https://github.com/dotnet/runtime - eea2256e56f32d70e3fbe72a1473a7ffd2f5c16e + ecd979c9860caee8326f8678736ae98a77bdae5b @@ -39,41 +39,41 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - eea2256e56f32d70e3fbe72a1473a7ffd2f5c16e + ecd979c9860caee8326f8678736ae98a77bdae5b - + https://github.com/dotnet/aspnetcore - be472db60f4711404ba5de268f7b9d4a887926f8 + 062237e054487e2e53c186660e459eda69b75e59 - + https://github.com/dotnet/aspnetcore - be472db60f4711404ba5de268f7b9d4a887926f8 + 062237e054487e2e53c186660e459eda69b75e59 - + https://github.com/dotnet/aspnetcore - be472db60f4711404ba5de268f7b9d4a887926f8 + 062237e054487e2e53c186660e459eda69b75e59 - + https://github.com/dotnet/aspnetcore - b866b765b3493c7943829ce830e509d61f958102 + 062237e054487e2e53c186660e459eda69b75e59 https://github.com/dotnet/efcore 2352499b52cdfc95ddcfd81c4967e12512e00eee - + https://github.com/dotnet/aspnetcore - be472db60f4711404ba5de268f7b9d4a887926f8 + 062237e054487e2e53c186660e459eda69b75e59 - + https://github.com/dotnet/aspnetcore - be472db60f4711404ba5de268f7b9d4a887926f8 + 062237e054487e2e53c186660e459eda69b75e59 - + https://github.com/dotnet/aspnetcore - be472db60f4711404ba5de268f7b9d4a887926f8 + 062237e054487e2e53c186660e459eda69b75e59 https://github.com/dotnet/test-templates @@ -83,51 +83,51 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - b930c7c022425a92b0f153728bfee1df9d354477 + f7852759a89c245167c090657576c11c8e1839ee - + https://github.com/dotnet/sdk - 3aadcbd5a27b46b6372b5594b27e6b5b92fd1111 + 637aaef99a9aee3af4e0089807596cf322039c95 - + https://github.com/dotnet/sdk - 3aadcbd5a27b46b6372b5594b27e6b5b92fd1111 + 637aaef99a9aee3af4e0089807596cf322039c95 - + https://github.com/dotnet/winforms - b014c89fafff342c92c27968f8231b5032b12954 + 03fe14c2e92ccb595a0e336e3c8ab199720a643e - + https://github.com/dotnet/wpf - b91ba697c48bc7825580e3c7fa09c5c3781c3788 + abe92cece7f3cb3f913bc209d1832e585421c60b https://github.com/dotnet/fsharp da6be68280c89131cdba2045525b80890401defd - + https://github.com/microsoft/vstest - d834b9b8c4337438622cb7b7d77f1520b479cb88 + b195e2589980861425b331e73a859252c3f2b71a - + https://github.com/mono/linker - 6939a85f7ed2eb1a3b2f8c9384ebf675c7007464 + 57974c1f5790e6fb33f5fce161707be5cd86c4d3 linker - + https://github.com/dotnet/roslyn - c69d99cbdc5de6c330bf86a44ca7af1547906bb6 + 352a73835662667665a5c6df20d6852f2402a954 - + https://github.com/dotnet/msbuild - c10f34c4e00644e06120cb87f323c330f29a1e89 + 47e6ac1bcff02d4cfbf2ff8ea0c957c072f697cc - + https://github.com/NuGet/NuGet.Client - 2582e3e232c7f8b0834509d39b8e0cca2bc57e21 + 830c8be45dbbccd411ecf6080abff0c2c98079cf https://github.com/dotnet/cliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 5d0a01033..5df515588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 5.0.0-rc.1.20417.1 + 6.0.0-alpha.1.20528.3 - 5.0.0-rc.1.20417.3 + 6.0.0-alpha.1.20529.2 - 6.0.0-alpha.1.20514.1 + 6.0.0-alpha.1.20552.1 @@ -45,43 +45,43 @@ - 6.0.0-alpha.1.20513.8 - 6.0.0-alpha.1.20513.8 - 6.0.0-alpha.1.20513.8 - 6.0.0-alpha.1.20513.8 - 6.0.0-alpha.1.20513.8 - 6.0.0-alpha.1.20513.8 - 6.0.0-alpha.1.20513.8 + 6.0.0-alpha.1.20526.6 + 6.0.0-alpha.1.20526.6 + 6.0.0-alpha.1.20526.6 + 6.0.0-alpha.1.20526.6 + 6.0.0-alpha.1.20526.6 + 6.0.0-alpha.1.20526.6 + 6.0.0-alpha.1.20526.6 0.2.0 - 6.0.100-alpha.1.20514.6 - 6.0.100-alpha.1.20514.6 + 6.0.100-alpha.1.20553.1 + 6.0.100-alpha.1.20553.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-alpha.1.20513.9 + 6.0.0-alpha.1.20551.7 - 6.0.0-alpha.1.20513.9 - 6.0.0-alpha.1.20513.9 - 6.0.0-alpha.1.20513.9 - 6.0.0-alpha.1.20513.9 - 6.0.0-alpha.1.20513.9 + 6.0.0-alpha.1.20551.7 + 6.0.0-alpha.1.20551.7 + 6.0.0-alpha.1.20551.7 + 6.0.0-alpha.1.20551.7 + 6.0.0-alpha.1.20551.7 2.1.0 - 5.0.0-rc.1.20417.4 - 5.0.0-rc.1.20417.4 - 5.0.0-rc.1.20417.4 + 6.0.0-alpha.1.20531.1 + 6.0.0-alpha.1.20531.1 + 6.0.0-alpha.1.20531.1 @@ -143,7 +143,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-preview-20201013-01 + 16.8.0-release-20201022-02 diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 794dd1478..7f25ca27a 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -141,5 +141,9 @@ Skip="true" Issue="" Reason="Need all .NET core runtime"/> +