Skip to content

Commit

Permalink
Merged PR 32667: [internal/release/7.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history 
…ng/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)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Jul 17, 2023
2 parents f387463 + 1b22dde commit 996ed6b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.10-servicing.23363.13" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha>
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.10-servicing.23364.1">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.10-servicing.23364.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.1">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -29,13 +29,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23363.13" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>05b68f8296b45fa76b27abcb8e5666e73a4873b7</Sha>
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.1">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<NETCoreAppMaximumVersion>7.0</NETCoreAppMaximumVersion>
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.10-servicing.23363.13</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
Expand All @@ -35,9 +35,9 @@
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.10-servicing.23363.12</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>7.0.10-servicing.23363.13</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.10-servicing.23364.5</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>7.0.10-servicing.23364.1</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit 996ed6b

Please sign in to comment.