Skip to content

Commit 198e1c4

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 32121: [internal/release/6.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 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [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.8 - **Date Produced**: June 21, 2023 7:42:54 PM UTC - **Commit**: 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.20-servicing.23321.5 to 6.0.20-servicing.23321.8][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.20-servicing.23321.5 to 6.0.20-servicing.23321.8][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.20-servicing.23321.5 to 6.0.20-servicing.23321.8][1] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2] - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC6298294127&targetVersion=GC0a2507dd21&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5b48321b-d791-47a4-da08-08d961c27f17)
1 parent be36537 commit 198e1c4

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23320.10" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23321.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
10+
<Sha>7f67c1539dcfa02ef740306820b44a713bdcb525</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.20-servicing.23321.5">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.20-servicing.23321.8">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
14+
<Sha>0a2507dd214349c40c4f1e9aba2ce6a91e8675a8</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.20-servicing.23321.5">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.20-servicing.23321.8">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
18+
<Sha>0a2507dd214349c40c4f1e9aba2ce6a91e8675a8</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -29,13 +29,13 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23320.10" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23321.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
34+
<Sha>7f67c1539dcfa02ef740306820b44a713bdcb525</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.20-servicing.23321.5">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.20-servicing.23321.8">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
38+
<Sha>0a2507dd214349c40c4f1e9aba2ce6a91e8675a8</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>6.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.20-servicing.23320.10</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.20-servicing.23321.5</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.20-servicing.23321.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.20-servicing.23321.8</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--
2626
@@ -60,9 +60,9 @@
6060
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.20-servicing.23320.17</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
6161
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.20-servicing.23320.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6262
<!-- winforms -->
63-
<MicrosoftPrivateWinformsVersion>6.0.20-servicing.23320.10</MicrosoftPrivateWinformsVersion>
63+
<MicrosoftPrivateWinformsVersion>6.0.20-servicing.23321.4</MicrosoftPrivateWinformsVersion>
6464
<!-- wpf -->
65-
<MicrosoftDotNetWpfGitHubVersion>6.0.20-servicing.23321.5</MicrosoftDotNetWpfGitHubVersion>
65+
<MicrosoftDotNetWpfGitHubVersion>6.0.20-servicing.23321.8</MicrosoftDotNetWpfGitHubVersion>
6666
<!-- Not auto-updated. -->
6767
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
6868
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)