From be36537646f7793e42f33e5c417e44fc3351d0f7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:17:18 +0000 Subject: [PATCH] Merged PR 32064: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-wpf This pull request updates the following dependencies [marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17 - **Build**: 20230621.5 - **Date Produced**: June 21, 2023 4:27:02 PM UTC - **Commit**: 6298294127ccd64bc544dae38d09a4cd6be1d7a0 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.5][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.5][2] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.5][2] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][4] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][4] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][4] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][4] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb2fc6c7933&targetVersion=GC6298294127&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5b48321b-d791-47a4-da08-08d961c27f17) [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.Private.Winforms**: from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.19-servicing.2331... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47ff8ec2a..370394dc9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21ca00ca7..82ff49cc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,41 +1,41 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 2536781675df3fe4848e96605b0ee852fe3ee91b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 6298294127ccd64bc544dae38d09a4cd6be1d7a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 6298294127ccd64bc544dae38d09a4cd6be1d7a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 2536781675df3fe4848e96605b0ee852fe3ee91b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 6298294127ccd64bc544dae38d09a4cd6be1d7a0 diff --git a/eng/Versions.props b/eng/Versions.props index c8571dc3c..22f4662d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,8 @@ 6.0 6.0 net$(NETCoreAppFrameworkVersion) - 6.0.19-servicing.23316.2 - 6.0.19-servicing.23316.8 + 6.0.20-servicing.23320.10 + 6.0.20-servicing.23321.5 - 6.0.19 - 6.0.19 - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23320.10 - 6.0.19-servicing.23316.8 + 6.0.20-servicing.23321.5 15.7.179 $(MicrosoftBuildVersion)