Skip to content

Commit 29da875

Browse files
maestro-prod-Primaryvseanreesermsft
maestro-prod-Primary
authored and
vseanreesermsft
committed
Merged PR 42780: [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.34-servicing.24417.2 to 6.0.35-servicing.24462.2 (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**: 20240912.8 - **Date Produced**: September 12, 2024 8:09:55 PM UTC - **Commit**: 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.35][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.34-servicing.24417.2 to 6.0.35-servicing.24462.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7132545b5ef9cfe30512311811ee420b1f208971&targetVersion=GC01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC0716b4331761db24b6c5f2f52e8bcd32b6bd065b&targetVersion=GC869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
2 parents 853c4ee + 578d95d commit 29da875

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

‎NuGet.config

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@
2323
<add key="darc-int-dotnet-templating-1a1d03f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb-1/nuget/v3/index.json" />
2424
<!-- End: Package sources from dotnet-templating -->
2525
<!-- Begin: Package sources from dotnet-windowsdesktop -->
26-
<add key="darc-int-dotnet-windowsdesktop-7132545" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-windowsdesktop-7132545-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-5/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-windowsdesktop-7132545-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-4/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-windowsdesktop-7132545-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-3/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-windowsdesktop-7132545-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-2/nuget/v3/index.json" />
31-
<add key="darc-int-dotnet-windowsdesktop-7132545-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7132545b-1/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-01c5bea" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-01c5bea2/nuget/v3/index.json" />
3227
<!-- End: Package sources from dotnet-windowsdesktop -->
3328
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3429
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -62,12 +57,7 @@
6257
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
6358
<!-- End: Package sources from dotnet-runtime -->
6459
<!-- Begin: Package sources from dotnet-windowsdesktop -->
65-
<add key="darc-int-dotnet-windowsdesktop-7132545-1" value="true" />
66-
<add key="darc-int-dotnet-windowsdesktop-7132545-2" value="true" />
67-
<add key="darc-int-dotnet-windowsdesktop-7132545-3" value="true" />
68-
<add key="darc-int-dotnet-windowsdesktop-7132545-4" value="true" />
69-
<add key="darc-int-dotnet-windowsdesktop-7132545-5" value="true" />
70-
<add key="darc-int-dotnet-windowsdesktop-7132545" value="true" />
60+
<add key="darc-int-dotnet-windowsdesktop-01c5bea" value="true" />
7161
<!-- End: Package sources from dotnet-windowsdesktop -->
7262
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
7363
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,25 @@
174174
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
175175
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
176176
</Dependency>
177-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.34">
177+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.35">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
179+
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
180180
</Dependency>
181-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.34-servicing.24419.1">
181+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.35-servicing.24462.8">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
183+
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
184184
</Dependency>
185-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.34-servicing.24419.1">
185+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.35-servicing.24462.8">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
187-
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
187+
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
188188
</Dependency>
189-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.34">
189+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.35">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
191-
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
191+
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
192192
</Dependency>
193-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.34-servicing.24417.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
193+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
194194
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
195-
<Sha>0716b4331761db24b6c5f2f52e8bcd32b6bd065b</Sha>
195+
<Sha>869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe</Sha>
196196
</Dependency>
197197
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.35">
198198
<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
@@ -152,11 +152,11 @@
152152
</PropertyGroup>
153153
<PropertyGroup>
154154
<!-- Dependencies from https://github.com/dotnet/wpf -->
155-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.34-servicing.24417.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
155+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.35-servicing.24462.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
159-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.34-servicing.24419.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
159+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.35-servicing.24462.8</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
160160
</PropertyGroup>
161161
<PropertyGroup Label="Manually updated">
162162
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)