From e346a9e945fd8fb247ca06c129c68458b0713cd8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 20:50:52 +0000 Subject: [PATCH] Merged PR 32124: [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.8-servicing.23316.4 to 7.0.9-servicing.23321.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6 (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**: 20230621.9 - **Date Produced**: June 21, 2023 7:54:37 PM UTC - **Commit**: d41bd7da4139331ef02657deb7944df43b8a181c - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.9-servicing.23319.8 to 7.0.9-servicing.23321.9][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.9-servicing.23319.8 to 7.0.9-servicing.23321.9][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.9-servicing.23319.8 to 7.0.9-servicing.23321.9][1] - **Microsoft.Private.Winforms**: [from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18][3] - **Microsoft.Private.Winforms**: [from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.8 to 7.0.9][3] - **Microsoft.Private.Winforms**: [from 7.0.8-servicing.23316.4 to 7.0.9-servicing.23321.6][2] - **VS.Redist.Common.NetCore.Shar... --- 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 6c40bff47..624c78e53 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 aaaba0922..c75b9b795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,41 +1,41 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 51b465932569873b7b66ac6f19f62762535d08be + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9366e1f7d0743a7396be44e198f64ab88e5bd8c8 + d41bd7da4139331ef02657deb7944df43b8a181c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9366e1f7d0743a7396be44e198f64ab88e5bd8c8 + d41bd7da4139331ef02657deb7944df43b8a181c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 156597d90421cdb1c22f803f5d48dfbf5d1dbe7f + 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 51b465932569873b7b66ac6f19f62762535d08be + dd121ee97234c7490f6111cf0c7bfa9235923f81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9366e1f7d0743a7396be44e198f64ab88e5bd8c8 + d41bd7da4139331ef02657deb7944df43b8a181c diff --git a/eng/Versions.props b/eng/Versions.props index ed8339b65..757e31312 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,8 @@ 7.0 7.0 net$(NETCoreAppFrameworkVersion) - 7.0.8-servicing.23316.4 - 7.0.9-servicing.23319.8 + 7.0.9-servicing.23321.6 + 7.0.9-servicing.23321.9 @@ -30,14 +30,14 @@ 7.0.0-beta.23313.4 7.0.0-beta.23313.4 - 7.0.8 - 7.0.8 - 7.0.8-servicing.23313.27 - 7.0.8-servicing.23313.27 + 7.0.9 + 7.0.9 + 7.0.9-servicing.23320.18 + 7.0.9-servicing.23320.18 - 7.0.8-servicing.23316.4 + 7.0.9-servicing.23321.6 - 7.0.9-servicing.23319.8 + 7.0.9-servicing.23321.9 15.7.179 $(MicrosoftBuildVersion)