Skip to content

Commit 53a7fb7

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 40495: [internal/release/6.0.1xx] Update dependencies from 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:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **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:258d4206-cc1e-4c20-39b6-08d960f4ca81)
2 parents c4d5b92 + 5495c70 commit 53a7fb7

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<add key="darc-int-dotnet-templating-c86b755" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556/nuget/v3/index.json" />
1919
<!-- End: Package sources from dotnet-templating -->
2020
<!-- Begin: Package sources from dotnet-windowsdesktop -->
21-
<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" />
21+
<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" />
2222
<!-- End: Package sources from dotnet-windowsdesktop -->
2323
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2424
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -46,7 +46,7 @@
4646
<add key="darc-int-dotnet-templating-c86b755" value="true" />
4747
<!-- End: Package sources from dotnet-templating -->
4848
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-1e1b310" value="true" />
49+
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="true" />
5050
<!-- End: Package sources from dotnet-windowsdesktop -->
5151
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5252
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,23 +172,23 @@
172172
</Dependency>
173173
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.32">
174174
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
175-
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
175+
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
176176
</Dependency>
177-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.32-servicing.24313.6">
177+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.6">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
179+
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
180180
</Dependency>
181-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.32-servicing.24313.6">
181+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.32-servicing.24314.6">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
183+
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
184184
</Dependency>
185185
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.32">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
187-
<Sha>1e1b31012836aad0ec30e4d376b58d55d38382f4</Sha>
187+
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
188188
</Dependency>
189-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24313.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
189+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24314.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
191-
<Sha>2bc8523eac0e97b48cbed2f1e08a8ef97985c933</Sha>
191+
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
192192
</Dependency>
193193
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.32">
194194
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
</PropertyGroup>
145145
<PropertyGroup>
146146
<!-- Dependencies from https://github.com/dotnet/wpf -->
147-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.32-servicing.24313.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
147+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.32-servicing.24314.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
148148
</PropertyGroup>
149149
<PropertyGroup>
150150
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
151-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.32-servicing.24313.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
151+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.32-servicing.24314.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
152152
</PropertyGroup>
153153
<PropertyGroup Label="Manually updated">
154154
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)