Skip to content

Commit

Permalink
Merged PR 40494: [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.32-servicing.24313.5 to 6.0.32-servicing.24314.4 (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**: 20240614.6
- **Date Produced**: June 15, 2024 4:56:39 AM UTC
- **Commit**: ef2ca68feb305bd9ebc3934b8488526caee3d118
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.32 to 6.0.32][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.6][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24313.6 to 6.0.32-servicing.24314.6][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.32-servicing.24313.5 to 6.0.32-servicing.24314.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1e1b31012836aad0ec30e4d376b58d55d38382f4&targetVersion=GCef2ca68feb305bd9ebc3934b8488526caee3d118&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC2bc8523eac0e97b48cbed2f1e08a8ef97985c933&targetVersion=GC798cc6d4922db482f84fb72a8244f0da898bc5d6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Jun 15, 2024
2 parents 048243a + 417c3c5 commit d1ba189
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 @@ -18,7 +18,7 @@
<add key="darc-int-dotnet-templating-89f5155" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1e1b310" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1e1b3101/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f/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 @@ -47,7 +47,7 @@
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1e1b310" value="true" />
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" 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 @@ -172,23 +172,23 @@
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.32-servicing.24313.6">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.32-servicing.24313.6">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.32-servicing.24314.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24313.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24314.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>2bc8523eac0e97b48cbed2f1e08a8ef97985c933</Sha>
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.32">
<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 @@ -151,11 +151,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.32-servicing.24313.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.32-servicing.24314.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.32-servicing.24313.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.32-servicing.24314.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit d1ba189

Please sign in to comment.