From 8a22a19fc5403b7af38b0682343a54a15d3592d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 03:40:36 +0000 Subject: [PATCH] [master] Update dependencies from dotnet/sdk (#8129) [master] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3 - Address corssgen target issues - Merge branch 'darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9 - Merge branch 'master' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9 --- eng/Version.Details.xml | 80 ++++++++++++++--------------- eng/Versions.props | 40 +++++++-------- src/redist/targets/Crossgen.targets | 8 ++- 3 files changed, 66 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddc5459f4..7f5198643 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 8be1ccd1047a7febcb347a18f4cc9f5b9e99cdd7 + 85186023c8de8237268033cadc41d738b7f2005e - + https://github.com/dotnet/windowsdesktop - 8be1ccd1047a7febcb347a18f4cc9f5b9e99cdd7 + 85186023c8de8237268033cadc41d738b7f2005e - + https://github.com/dotnet/windowsdesktop - 8be1ccd1047a7febcb347a18f4cc9f5b9e99cdd7 + 85186023c8de8237268033cadc41d738b7f2005e - + https://github.com/dotnet/runtime - b497143c168c8df00f070e95a4c6fee4092d2ea6 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - b497143c168c8df00f070e95a4c6fee4092d2ea6 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - b497143c168c8df00f070e95a4c6fee4092d2ea6 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - b497143c168c8df00f070e95a4c6fee4092d2ea6 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - b497143c168c8df00f070e95a4c6fee4092d2ea6 + 907f7da59b40c80941b02ac2a46650adf3f606bc @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b497143c168c8df00f070e95a4c6fee4092d2ea6 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/aspnetcore - b052c4fcc200633443ccfedb0007e03b4b2340a8 + 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 - + https://github.com/dotnet/aspnetcore - b052c4fcc200633443ccfedb0007e03b4b2340a8 + 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 - + https://github.com/dotnet/aspnetcore - b052c4fcc200633443ccfedb0007e03b4b2340a8 + 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 - + https://github.com/dotnet/aspnetcore - b052c4fcc200633443ccfedb0007e03b4b2340a8 + 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 - + https://github.com/dotnet/aspnetcore - b052c4fcc200633443ccfedb0007e03b4b2340a8 + 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 - + https://github.com/dotnet/aspnetcore - b052c4fcc200633443ccfedb0007e03b4b2340a8 + 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 https://github.com/dotnet/test-templates @@ -75,26 +75,26 @@ https://github.com/dotnet/test-templates 8ff52387853520863ad09a84b23c63ac5a471886 - + https://github.com/dotnet/templating - de8e4533a04456bf079a88866dedd98339cd768b + 633dff0b4bc05682536941936379f4dff4531c7e - + https://github.com/dotnet/sdk - 5550ac2fabb8bfae46d6a4de884bfbad71bbad99 + 5cb7e1f18108838001f96c5dd1292162861fc949 - + https://github.com/dotnet/sdk - 5550ac2fabb8bfae46d6a4de884bfbad71bbad99 + 5cb7e1f18108838001f96c5dd1292162861fc949 - + https://github.com/dotnet/winforms - 5854f1b352559b04cc4969b0ea2241af517fcdfa + b014c89fafff342c92c27968f8231b5032b12954 - + https://github.com/dotnet/wpf - 973ffc6e2edf170124176e7ebf0a850bdc1b359f + b91ba697c48bc7825580e3c7fa09c5c3781c3788 diff --git a/eng/Versions.props b/eng/Versions.props index 00cc68227..7dd548c17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,15 +21,15 @@ - 5.0.0-rc.1.20370.3 + 5.0.0-rc.1.20417.1 - 5.0.0-rc.1.20405.1 + 5.0.0-rc.1.20417.3 - 5.0.0-rc.1.20407.1 + 5.0.0-rc.1.20407.2 @@ -41,41 +41,41 @@ - 5.0.0-rc.1.20405.9 - 5.0.0-rc.1.20405.9 - 5.0.0-rc.1.20405.9 - 5.0.0-rc.1.20405.9 - 5.0.0-rc.1.20405.9 - 5.0.0-rc.1.20405.9 + 5.0.0-rc.1.20418.28 + 5.0.0-rc.1.20418.28 + 5.0.0-rc.1.20418.28 + 5.0.0-rc.1.20418.28 + 5.0.0-rc.1.20418.28 + 5.0.0-rc.1.20418.28 0.2.0 - 5.0.100-rc.1.20407.9 - 5.0.100-rc.1.20407.9 + 5.0.100-rc.1.20419.19 + 5.0.100-rc.1.20419.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20404.16 - 5.0.0-rc.1.20404.16 - 5.0.0-rc.1.20404.16 - 5.0.0-rc.1.20404.16 - 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 2.1.0 - 5.0.0-rc.1.20405.1 - 5.0.0-rc.1.20405.1 - 5.0.0-rc.1.20405.1 + 5.0.0-rc.1.20417.4 + 5.0.0-rc.1.20417.4 + 5.0.0-rc.1.20417.4 diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 837a8323e..cc81a3f58 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -38,8 +38,12 @@ - - + + + + + +