From 2f22c390e034ba0877ca4dea4985256019dc28ba Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 18 May 2022 19:54:48 +0000 Subject: [PATCH] Merged PR 23022: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22263.3 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22263.9 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22263.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.106-servicing.22263.3 to 6.0.106-servicing.22267.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.106 to 6.0.106 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22262.5 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22262.12 to 6.0.6-servicing.22267.2 (parent... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b958ca2d..7132d739a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a195dd13a..b7b90e356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a6abee58c814e3dcf3626a5130dbcc11a2934f57 + 9d7c7030992e13a9b810b19e79de56759a78d6bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3b853d76c5431da4ce836751dc23b0b4886cf278 + 7cca709db2944a09b4db6ca7b20c457ff260fb5a @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - be98e88c760526452df94ef452fff4602fb5bded + 7cca709db2944a09b4db6ca7b20c457ff260fb5a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5158b1f9c6a80a02ffa1c8e1291be15668b58973 + b90b48141f0ae7aeb382ff740ff3820ff19e7e29 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6a76a0832326bf4205ea7c7d667c6799d062609 + 26322bd46d41c0307d94d6555fdf10f88fa7b449 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6a76a0832326bf4205ea7c7d667c6799d062609 + 26322bd46d41c0307d94d6555fdf10f88fa7b449 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d6a76a0832326bf4205ea7c7d667c6799d062609 + 26322bd46d41c0307d94d6555fdf10f88fa7b449 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d63f71c200563163e0fcff8f4a77c9e60b428f1 + e63285207de6e585dc4be11472a284ed57fa2e35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5d63f71c200563163e0fcff8f4a77c9e60b428f1 + e63285207de6e585dc4be11472a284ed57fa2e35 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 54bce5195f3b5bdfd25a40d86f71c344d1a53052 + 7acd4abcc9c6a4268b2b52e7f64e27b614431a29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b42c3f500c891e4cfcdb67ff07c7a911e9db96a7 + e36f1456f1c6aff57150a30ac06f3cceaf2b2785 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7d93987b4..e28eda2d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.6-servicing.22262.5 + 6.0.6-servicing.22266.9 - 6.0.6-servicing.22262.12 + 6.0.6-servicing.22267.2 @@ -46,30 +46,30 @@ 6.0.6 6.0.6 - 6.0.6-servicing.22263.10 - 6.0.6-servicing.22263.10 - 6.0.6-servicing.22263.10 - 6.0.6-servicing.22263.10 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 + 6.0.6-servicing.22267.6 0.2.0 - 6.0.106-servicing.22267.4 - 6.0.106-servicing.22267.4 + 6.0.106-servicing.22268.6 + 6.0.106-servicing.22268.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.3 + 6.0.4 - 6.0.6-servicing.22263.9 - 6.0.6-servicing.22263.9 + 6.0.6-servicing.22267.7 + 6.0.6-servicing.22267.7 6.0.6 6.0.6 6.0.6 @@ -78,8 +78,8 @@ - 6.0.6-servicing.22263.3 - 6.0.6-servicing.22263.3 + 6.0.6-servicing.22267.5 + 6.0.6-servicing.22267.5 6.0.6 6.0.6