Skip to content

Commit e35ea42

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 38479: [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.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (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**: - **Date Produced**: March 22, 2024 3:43:32 PM UTC - **Commit**: 75c9b26383d5e6908e8b07d68d134f115c696324 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0692302e909ffbc02bca94378eab9213ba3f4455&targetVersion=GC75c9b26383d5e6908e8b07d68d134f115c696324&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCf3f959782e4e407301c19cd90dc0d1da329425bf&targetVersion=GC6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
1 parent 6f9b739 commit e35ea42

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

NuGet.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<add key="darc-int-dotnet-templating-9ebb8d1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9ebb8d1d/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-0692302" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0692302e/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263/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-189fbbd" value="true" />
4747
<!-- End: Package sources from dotnet-runtime -->
4848
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-0692302" value="true" />
49+
<add key="darc-int-dotnet-windowsdesktop-75c9b26" 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

+8-8
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.29">
170170
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
171-
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
171+
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
172172
</Dependency>
173-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.29-servicing.24169.26">
173+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.29-servicing.24171.9">
174174
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
175-
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
175+
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
176176
</Dependency>
177-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.29-servicing.24169.26">
177+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.29-servicing.24171.9">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
179+
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
180180
</Dependency>
181181
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.29">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
183+
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.29-servicing.24169.12" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
185+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.29-servicing.24171.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
187-
<Sha>f3f959782e4e407301c19cd90dc0d1da329425bf</Sha>
187+
<Sha>6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.29">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

eng/Versions.props

+2-2
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.29-servicing.24169.12</MicrosoftNETSdkWindowsDesktopPackageVersion>
153+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.29-servicing.24171.7</MicrosoftNETSdkWindowsDesktopPackageVersion>
154154
</PropertyGroup>
155155
<PropertyGroup>
156156
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
157-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.29-servicing.24169.26</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
157+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.29-servicing.24171.9</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
158158
</PropertyGroup>
159159
<PropertyGroup Label="Manually updated">
160160
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)