Skip to content

Commit

Permalink
Merged PR 42793: [internal/release/6.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 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (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**: 20240912.14
- **Date Produced**: September 13, 2024 6:34:12 AM UTC
- **Commit**: c9e44425226553e639116ff82698cfd2808f7769
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.35-servicing.24462.10 to 6.0.35-servicing.24462.14][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.35-servicing.24462.10 to 6.0.35-servicing.24462.14][3]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.35-servicing.24462.10 to 6.0.35-servicing.24462.14][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC1d8350d3b7b727488583300c1c232005304c3bb0&targetVersion=GCc9e44425226553e639116ff82698cfd2808f7769&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5b48321b-d791-47a4-da08-08d961c27f17)
  • Loading branch information
@vseanreesermsft
maestro-prod-Primary authored and vseanreesermsft committed Sep 13, 2024
2 parents 01c5bea + 9a8ca6e commit fc5b097
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>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.35-servicing.24461.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.35-servicing.24462.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1e8489e39e0709c40aa5540825b5e9e2c1c5a23b</Sha>
<Sha>9b5f402943986a66dfca2b6f4312cfca19d75c17</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.35-servicing.24462.2">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.35-servicing.24462.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe</Sha>
<Sha>c9e44425226553e639116ff82698cfd2808f7769</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.2">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe</Sha>
<Sha>c9e44425226553e639116ff82698cfd2808f7769</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.35" 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>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24461.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24462.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1e8489e39e0709c40aa5540825b5e9e2c1c5a23b</Sha>
<Sha>9b5f402943986a66dfca2b6f4312cfca19d75c17</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.35-servicing.24462.2">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.35-servicing.24462.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe</Sha>
<Sha>c9e44425226553e639116ff82698cfd2808f7769</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>6.0</NETCoreAppMaximumVersion>
<NETCoreAppFrameworkVersion>6.0</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.35-servicing.24461.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.35-servicing.24462.2</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.35-servicing.24462.9</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.35-servicing.24462.14</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--
Expand Down Expand Up @@ -60,9 +60,9 @@
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.35-servicing.24459.18</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.35-servicing.24459.18</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>6.0.35-servicing.24461.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.35-servicing.24462.9</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>6.0.35-servicing.24462.2</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>6.0.35-servicing.24462.14</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit fc5b097

Please sign in to comment.