Skip to content

Commit 3fa53f1

Browse files
maestro-prod-Primaryvseanreesermsft
maestro-prod-Primary
authored and
vseanreesermsft
committed
Merged PR 41128: [internal/release/6.0.4xx] 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.24314.4 to 6.0.33-servicing.24366.5 (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**: 20240716.6 - **Date Produced**: July 17, 2024 3:06:14 AM UTC - **Commit**: db4e5a36567b85765753af097e878d894a3552c9 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.32 to 6.0.33][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.32 to 6.0.33][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24314.6 to 6.0.33-servicing.24366.6][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24314.6 to 6.0.33-servicing.24366.6][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.32-servicing.24314.4 to 6.0.33-servicing.24366.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCef2ca68feb305bd9ebc3934b8488526caee3d118&targetVersion=GCdb4e5a36567b85765753af097e878d894a3552c9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC798cc6d4922db482f84fb72a8244f0da898bc5d6&targetVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
2 parents 7d90dd0 + c7b2e9c commit 3fa53f1

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

‎NuGet.config

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@
2222
<add key="darc-int-dotnet-templating-8413a0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-templating -->
2424
<!-- Begin: Package sources from dotnet-windowsdesktop -->
25-
<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" />
26-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f-5/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f-3/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f-2/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f-1/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36/nuget/v3/index.json" />
3026
<!-- End: Package sources from dotnet-windowsdesktop -->
3127
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3228
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -59,11 +55,7 @@
5955
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
6056
<!-- End: Package sources from dotnet-runtime -->
6157
<!-- Begin: Package sources from dotnet-windowsdesktop -->
62-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-1" value="true" />
63-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-2" value="true" />
64-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-3" value="true" />
65-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-5" value="true" />
66-
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="true" />
58+
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="true" />
6759
<!-- End: Package sources from dotnet-windowsdesktop -->
6860
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6961
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,25 +170,25 @@
170170
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
171171
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.32">
173+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.33">
174174
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
175-
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
175+
<Sha>db4e5a36567b85765753af097e878d894a3552c9</Sha>
176176
</Dependency>
177-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.32-servicing.24314.6">
177+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.33-servicing.24366.6">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
179+
<Sha>db4e5a36567b85765753af097e878d894a3552c9</Sha>
180180
</Dependency>
181-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.32-servicing.24314.6">
181+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.33-servicing.24366.6">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
183+
<Sha>db4e5a36567b85765753af097e878d894a3552c9</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.32">
185+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.33">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
187-
<Sha>ef2ca68feb305bd9ebc3934b8488526caee3d118</Sha>
187+
<Sha>db4e5a36567b85765753af097e878d894a3552c9</Sha>
188188
</Dependency>
189-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.32-servicing.24314.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
189+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.33-servicing.24366.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
191-
<Sha>798cc6d4922db482f84fb72a8244f0da898bc5d6</Sha>
191+
<Sha>b660c1e83039451abe9d9190a7aabe87c03fd7ae</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
@@ -151,11 +151,11 @@
151151
</PropertyGroup>
152152
<PropertyGroup>
153153
<!-- Dependencies from https://github.com/dotnet/wpf -->
154-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.32-servicing.24314.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
154+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.33-servicing.24366.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
155155
</PropertyGroup>
156156
<PropertyGroup>
157157
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
158-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.32-servicing.24314.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
158+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.33-servicing.24366.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
159159
</PropertyGroup>
160160
<PropertyGroup Label="Manually updated">
161161
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)