From eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 25 May 2023 13:50:04 +0000 Subject: [PATCH] Merged PR 31537: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-wpf 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.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:763b3cc5-38c8-458a-6639-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 763b3cc5-38c8-458a-6639-08da7ef6346a - **Build**: 20230524.5 - **Date Produced**: May 25, 2023 5:52:47 AM UTC - **Commit**: 512eac4b458953da405f51ec0ae7766bcb7b32e5 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][3] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][3] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][2] - **VS.Redist.Common.NetCore.SharedFrame... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e165e5b90..a43b216fa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f5c9aaf2..b3bf25a38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,41 +1,41 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e3bf366a7361267ba472521190d62c9d22f39b14 + b4a5f0c6839363dea534f21736a9d0726c14b41c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 24923547018835429e8d08a35b6d1e9eec97b735 + 512eac4b458953da405f51ec0ae7766bcb7b32e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 24923547018835429e8d08a35b6d1e9eec97b735 + 512eac4b458953da405f51ec0ae7766bcb7b32e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e3442dd52923615959c161ce49b9960375ea07b + 5b20af47d99620150c53eaf5db8636fdf730b126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e3bf366a7361267ba472521190d62c9d22f39b14 + b4a5f0c6839363dea534f21736a9d0726c14b41c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 24923547018835429e8d08a35b6d1e9eec97b735 + 512eac4b458953da405f51ec0ae7766bcb7b32e5 diff --git a/eng/Versions.props b/eng/Versions.props index 58910ba4e..f35abc6be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,8 @@ 7.0 7.0 net$(NETCoreAppFrameworkVersion) - 7.0.7-servicing.23272.2 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23274.5 + 7.0.7-servicing.23274.5 @@ -32,12 +32,12 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23269.6 - 7.0.7-servicing.23269.6 + 7.0.7-servicing.23274.4 + 7.0.7-servicing.23274.4 - 7.0.7-servicing.23272.2 + 7.0.7-servicing.23274.5 - 7.0.7-servicing.23272.4 + 7.0.7-servicing.23274.5 15.7.179 $(MicrosoftBuildVersion)