Skip to content

Commit 1209a00

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 35844: [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.26-servicing.23573.8 to 6.0.26-servicing.23605.3 (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**: 20231205.4 - **Date Produced**: December 5, 2023 11:41:04 PM UTC - **Commit**: 84ebced93b7a69ba3332fe6000354306d4eea9dd - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.26 to 6.0.26][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23604.3 to 6.0.26-servicing.23605.4][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23604.3 to 6.0.26-servicing.23605.4][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.26-servicing.23573.8 to 6.0.26-servicing.23605.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC456adb551c&targetVersion=GC84ebced93b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC981ef8014a&targetVersion=GCe5b72d0fb5&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
2 parents d25cefa + df56ee2 commit 1209a00

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
@@ -17,7 +17,7 @@
1717
<add key="darc-int-dotnet-templating-766ee83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-766ee832/nuget/v3/index.json" />
1818
<!-- End: Package sources from dotnet-templating -->
1919
<!-- Begin: Package sources from dotnet-windowsdesktop -->
20-
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-456adb55/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-windowsdesktop-84ebced" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-84ebced9/nuget/v3/index.json" />
2121
<!-- End: Package sources from dotnet-windowsdesktop -->
2222
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2323
<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-runtime-dc45e96" value="true" />
4747
<!-- End: Package sources from dotnet-runtime -->
4848
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="true" />
49+
<add key="darc-int-dotnet-windowsdesktop-84ebced" 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
@@ -168,23 +168,23 @@
168168
</Dependency>
169169
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.26">
170170
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
171-
<Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
171+
<Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
172172
</Dependency>
173-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.26-servicing.23604.3">
173+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.4">
174174
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
175-
<Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
175+
<Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
176176
</Dependency>
177-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.26-servicing.23604.3">
177+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.26-servicing.23605.4">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
179+
<Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
180180
</Dependency>
181181
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.26">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
183+
<Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.26-servicing.23573.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
185+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.26-servicing.23605.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
187-
<Sha>981ef8014ab994eb3fce88dd81b815fce930dfa5</Sha>
187+
<Sha>e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26">
190190
<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
@@ -150,11 +150,11 @@
150150
</PropertyGroup>
151151
<PropertyGroup>
152152
<!-- Dependencies from https://github.com/dotnet/wpf -->
153-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.26-servicing.23573.8</MicrosoftNETSdkWindowsDesktopPackageVersion>
153+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.26-servicing.23605.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
154154
</PropertyGroup>
155155
<PropertyGroup>
156156
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
157-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.26-servicing.23604.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
157+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.26-servicing.23605.4</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
158158
</PropertyGroup>
159159
<PropertyGroup Label="Manually updated">
160160
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)