Skip to content

Commit

Permalink
Merged PR 40493: [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.32-servicing.24313.6 to 6.0.32-servicing.24314.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.32-servicing.24313.8 to 6.0.32-servicing.24314.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.32-servicing.24313.8 to 6.0.32-servicing.24314.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5 (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**: 20240614.4
- **Date Produced**: June 14, 2024 11:42:20 PM UTC
- **Commit**: 798cc6d4922db482f84fb72a8244f0da898bc5d6
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.32-servicing.24313.5 to 6.0.32-servicing.24314.4][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.32-servicing.24313.5 to 6.0.32-servicing.24314.4][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.32-servicing.24313.5 to 6.0.32-servicing.24314.4][1]
  - **Microsoft.Private.Winforms**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5][2]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.32-servicing.24313.8 to 6.0.32-servicing.24314.7][3]
  - **Microsoft.Private.Winforms**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.32][3]
  - **Microsoft.Private.Winforms**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.5][2]
  - **...
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jun 15, 2024
2 parents 1e1b310 + 5f50b4b commit ef2ca68
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-afb18ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-afb18ba9/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -22,7 +22,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-afb18ba" value="true" />
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.32-servicing.24313.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.32-servicing.24314.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.32-servicing.24313.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.32-servicing.24314.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>2e544744bf8fc5ee2ff1462531b7dd8e3c4af885</Sha>
<Sha>670045968593e524941ef480423796ceb50c5e2f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.32-servicing.24313.5">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.32-servicing.24314.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>2bc8523eac0e97b48cbed2f1e08a8ef97985c933</Sha>
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24313.5">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24314.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>2bc8523eac0e97b48cbed2f1e08a8ef97985c933</Sha>
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.32" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24313.8" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.32" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24313.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24314.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>2e544744bf8fc5ee2ff1462531b7dd8e3c4af885</Sha>
<Sha>670045968593e524941ef480423796ceb50c5e2f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.32-servicing.24313.5">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.32-servicing.24314.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>2bc8523eac0e97b48cbed2f1e08a8ef97985c933</Sha>
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
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.32-servicing.24313.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.32-servicing.24313.5</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.32-servicing.24314.5</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.32-servicing.24314.4</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--
Expand Down Expand Up @@ -57,12 +57,12 @@
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>6.0.32</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.32</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.32-servicing.24313.8</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24313.8</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.32-servicing.24314.7</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24314.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>6.0.32-servicing.24313.6</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.32-servicing.24314.5</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>6.0.32-servicing.24313.5</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>6.0.32-servicing.24314.4</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit ef2ca68

Please sign in to comment.