From 57b0d2bac14e817eca9a3267626bc4d76a229f9f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 19:22:18 +0000 Subject: [PATCH] Merged PR 31394: [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.23268.2 to 7.0.7-servicing.23268.9 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.7-servicing.23266.4 to 7.0.7-servicing.23268.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9 (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.23268.2 to 7.0.7-servicing.23268.9 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23266.4 to 7.0.7-servicing.23268.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9 (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.23268.2 to 7.0.7-servicing.23268.9 (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**: 20230519.7 - **Date Produced**: May 19, 2023 6:56:46 PM UTC - **Commit**: e43abfbcc8ce872b9ba591d87ec791e3f25423c0 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.7-servicing.23269.2 to 7.0.7-servicing.23269.7][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23269.2 to 7.0.7-servicing.23269.7][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.7-servicing.23269.2 to 7.0.7-servicing.23269.7][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.7-servicing.23266.4 to 7.0.7-servicing.23268.2][3] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][3] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23268.9][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 2f03e0361..de328c1f7 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 ae1c35bfc..a44a4ed31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,41 +1,41 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7d21bfd55c642c753a86950ba1aa0685db900279 + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fafc9aa56432f1e5728f082b222c3ef519b3dd59 + 3632207d619ad47c9933baa5806b67b67d1a4b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 + e43abfbcc8ce872b9ba591d87ec791e3f25423c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 + e43abfbcc8ce872b9ba591d87ec791e3f25423c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7d21bfd55c642c753a86950ba1aa0685db900279 + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7d21bfd55c642c753a86950ba1aa0685db900279 + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7d21bfd55c642c753a86950ba1aa0685db900279 + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fafc9aa56432f1e5728f082b222c3ef519b3dd59 + 3632207d619ad47c9933baa5806b67b67d1a4b77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08 + e43abfbcc8ce872b9ba591d87ec791e3f25423c0 diff --git a/eng/Versions.props b/eng/Versions.props index a3a4e4410..be30234c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,8 @@ 7.0 7.0 net$(NETCoreAppFrameworkVersion) - 7.0.7-servicing.23268.2 - 7.0.7-servicing.23269.2 + 7.0.7-servicing.23268.9 + 7.0.7-servicing.23269.7 @@ -32,12 +32,12 @@ 7.0.7 7.0.7 - 7.0.7-servicing.23266.4 - 7.0.7-servicing.23266.4 + 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.2 - 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.9 - 7.0.7-servicing.23269.2 + 7.0.7-servicing.23269.7 15.7.179 $(MicrosoftBuildVersion)