Skip to content

Commit

Permalink
Merged PR 33385: [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.22-servicing.23416.4 to 6.0.22-servicing.23424.7 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 6.0.22 to 6.0.22 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.22 to 6.0.22 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7 (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**: 20230825.2
- **Date Produced**: August 25, 2023 7:51:36 AM UTC
- **Commit**: f501934867fd4723518c1c7b03c6033c2e52ecad
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.22-servicing.23416.8 to 6.0.22-servicing.23425.2][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.22-servicing.23416.8 to 6.0.22-servicing.23425.2][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.22-servicing.23416.8 to 6.0.22-servicing.23425.2][1]
  - **Microsoft.Private.Winforms**: [from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7][2]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.22-servicing.23415.11 to 6.0.22-servicing.23424.25][3]
  - **Microsoft.Private.Winforms**: [from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.22 to 6.0.22][3]
  - **Microsoft.Private.Winforms**: [from 6.0.22-servicing.23416.4 to 6.0.22-servicing.23424.7][2]
...
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Aug 25, 2023
2 parents 22cc81b + 4e55edd commit 017f844
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-ad40cc3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ad40cc35/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-4bb6dc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4bb6dc19/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-ad40cc3" value="true" />
<add key="darc-int-dotnet-runtime-4bb6dc1" 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.22-servicing.23415.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.22-servicing.23424.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.22-servicing.23416.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.22-servicing.23424.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>0db2312765488a8a77ba6cef692fa53c636a47e9</Sha>
<Sha>53190af510e57c1c146bd8a23725509771a42ae0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.22-servicing.23416.8">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.22-servicing.23425.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6e6b474ef5222e55160a289e666bc156f4718f66</Sha>
<Sha>f501934867fd4723518c1c7b03c6033c2e52ecad</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.22-servicing.23416.8">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.22-servicing.23425.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6e6b474ef5222e55160a289e666bc156f4718f66</Sha>
<Sha>f501934867fd4723518c1c7b03c6033c2e52ecad</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.22" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.22-servicing.23415.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.22-servicing.23424.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.22" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf</Sha>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.22-servicing.23416.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.22-servicing.23424.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>0db2312765488a8a77ba6cef692fa53c636a47e9</Sha>
<Sha>53190af510e57c1c146bd8a23725509771a42ae0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.22-servicing.23416.8">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.22-servicing.23425.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6e6b474ef5222e55160a289e666bc156f4718f66</Sha>
<Sha>f501934867fd4723518c1c7b03c6033c2e52ecad</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.22-servicing.23416.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.22-servicing.23416.8</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.22-servicing.23424.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.22-servicing.23425.2</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--
Expand Down Expand Up @@ -57,12 +57,12 @@
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>6.0.22</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.22</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.22-servicing.23415.11</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.22-servicing.23415.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.22-servicing.23424.25</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.22-servicing.23424.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>6.0.22-servicing.23416.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.22-servicing.23424.7</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>6.0.22-servicing.23416.8</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>6.0.22-servicing.23425.2</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit 017f844

Please sign in to comment.