Skip to content

Commit 996ed6b

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 32667: [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.10-servicing.23363.13 to 7.0.10-servicing.23364.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.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**: 20230714.4 - **Date Produced**: July 14, 2023 9:33:21 PM UTC - **Commit**: 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4][1] - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][2] - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][2] - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][2] - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC5461ffc0ad&targetVersion=GC9a9892f520&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC05b68f8296&targetVersion=GC1f1ac283c5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:763b3cc5-38c8-458a-6639-08da7ef6346a)
2 parents f387463 + 1b22dde commit 996ed6b

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>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.10-servicing.23363.13" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha>
10+
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.10-servicing.23364.1">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.10-servicing.23364.4">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
14+
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.1">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.4">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
18+
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.10" 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>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23363.13" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha>
34+
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.1">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
38+
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</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>7.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.10-servicing.23363.13</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -35,9 +35,9 @@
3535
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.10-servicing.23363.12</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
3636
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.10-servicing.23363.13</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.10-servicing.23364.5</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)