Skip to content

Commit

Permalink
Merged PR 33211: [internal/release/6.0.4xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…dnceng/internal/dotnet-windowsdesktop

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.NET.Sdk.WindowsDesktop**: from 6.0.22-servicing.23415.8 to 6.0.22-servicing.23416.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20230816.7
- **Date Produced**: August 16, 2023 9:09:59 PM UTC
- **Commit**: 22cc81b45d1c04f1bf12a6acda58e341704a2858
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.22 to 6.0.22][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.22 to 6.0.22][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.22-servicing.23415.6 to 6.0.22-servicing.23416.7][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.22-servicing.23415.6 to 6.0.22-servicing.23416.7][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.22-servicing.23415.8 to 6.0.22-servicing.23416.8][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCd13a7c399c&targetVersion=GC22cc81b45d&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC7b82fc319b&targetVersion=GC6e6b474ef5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Aug 16, 2023
2 parents 18cfeb7 + b4fd671 commit d055edd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<add key="darc-int-dotnet-templating-acea295" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-acea295c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d13a7c3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d13a7c39/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-22cc81b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-22cc81b4/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand Down Expand Up @@ -46,7 +46,7 @@
<add key="darc-int-dotnet-runtime-ad40cc3" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d13a7c3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-22cc81b" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,23 +168,23 @@
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d13a7c399c119654dfc02eac26c4b31ab16a5cfe</Sha>
<Sha>22cc81b45d1c04f1bf12a6acda58e341704a2858</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.22-servicing.23415.6">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.22-servicing.23416.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d13a7c399c119654dfc02eac26c4b31ab16a5cfe</Sha>
<Sha>22cc81b45d1c04f1bf12a6acda58e341704a2858</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.22-servicing.23415.6">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.22-servicing.23416.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d13a7c399c119654dfc02eac26c4b31ab16a5cfe</Sha>
<Sha>22cc81b45d1c04f1bf12a6acda58e341704a2858</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>d13a7c399c119654dfc02eac26c4b31ab16a5cfe</Sha>
<Sha>22cc81b45d1c04f1bf12a6acda58e341704a2858</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.22-servicing.23415.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.22-servicing.23416.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>7b82fc319b73beb7dd40ff77bd4c9403711b35a7</Sha>
<Sha>6e6b474ef5222e55160a289e666bc156f4718f66</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.22-servicing.23415.8</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.22-servicing.23416.8</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.22-servicing.23415.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.22-servicing.23416.7</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit d055edd

Please sign in to comment.