Skip to content

Commit 040861c

Browse files
maestro-prod-Primaryvseanreesermsft
authored andcommitted
Merged PR 42838: [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.35-servicing.24462.2 to 6.0.35-servicing.24462.14 (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**: 20240913.5 - **Date Produced**: September 13, 2024 7:27:11 PM UTC - **Commit**: fc5b097885ceb7463eb7163477356a39a359846f - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.35][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3&targetVersion=GCfc5b097885ceb7463eb7163477356a39a359846f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe&targetVersion=GCc9e44425226553e639116ff82698cfd2808f7769&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
2 parents e96b946 + 1cc7dea commit 040861c

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
@@ -23,7 +23,7 @@
2323
<add key="darc-int-dotnet-templating-b66746d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-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-01c5bea" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-01c5bea2/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
2727
<!-- End: Package sources from dotnet-windowsdesktop -->
2828
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2929
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -56,7 +56,7 @@
5656
<add key="darc-int-dotnet-templating-b66746d" value="true" />
5757
<!-- End: Package sources from dotnet-templating -->
5858
<!-- Begin: Package sources from dotnet-windowsdesktop -->
59-
<add key="darc-int-dotnet-windowsdesktop-01c5bea" value="true" />
59+
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
6060
<!-- End: Package sources from dotnet-windowsdesktop -->
6161
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6262
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,23 +176,23 @@
176176
</Dependency>
177177
<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>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
179+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
180180
</Dependency>
181-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.35-servicing.24462.8">
181+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.35-servicing.24463.5">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
183+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
184184
</Dependency>
185-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.35-servicing.24462.8">
185+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.35-servicing.24463.5">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
187-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
187+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.35">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
191-
<Sha>01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3</Sha>
191+
<Sha>fc5b097885ceb7463eb7163477356a39a359846f</Sha>
192192
</Dependency>
193-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
193+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.35-servicing.24462.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
194194
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
195-
<Sha>869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe</Sha>
195+
<Sha>c9e44425226553e639116ff82698cfd2808f7769</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
@@ -145,11 +145,11 @@
145145
</PropertyGroup>
146146
<PropertyGroup>
147147
<!-- Dependencies from https://github.com/dotnet/wpf -->
148-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.35-servicing.24462.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
148+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.35-servicing.24462.14</MicrosoftNETSdkWindowsDesktopPackageVersion>
149149
</PropertyGroup>
150150
<PropertyGroup>
151151
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
152-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.35-servicing.24462.8</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
152+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.35-servicing.24463.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
153153
</PropertyGroup>
154154
<PropertyGroup Label="Manually updated">
155155
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)