Skip to content

Commit b426ce9

Browse files
maestro-prod-Primaryvseanreesermsft
authored andcommitted
Merged PR 41865: [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.24415.6 to 6.0.34-servicing.24417.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**: 20240819.1 - **Date Produced**: August 19, 2024 5:18:35 PM UTC - **Commit**: 7132545b5ef9cfe30512311811ee420b1f208971 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&targetVersion=GC7132545b5ef9cfe30512311811ee420b1f208971&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&targetVersion=GC0716b4331761db24b6c5f2f52e8bcd32b6bd065b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
1 parent 082c978 commit b426ce9

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
@@ -18,7 +18,7 @@
1818
<add key="darc-int-dotnet-templating-1a1d03f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1a1d03fb/nuget/v3/index.json" />
1919
<!-- End: Package sources from dotnet-templating -->
2020
<!-- Begin: Package sources from dotnet-windowsdesktop -->
21-
<add key="darc-int-dotnet-windowsdesktop-4e04405" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-4e044058/nuget/v3/index.json" />
21+
<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" />
2222
<!-- End: Package sources from dotnet-windowsdesktop -->
2323
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2424
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -47,7 +47,7 @@
4747
<add key="darc-int-dotnet-runtime-98588b0" value="true" />
4848
<!-- End: Package sources from dotnet-runtime -->
4949
<!-- Begin: Package sources from dotnet-windowsdesktop -->
50-
<add key="darc-int-dotnet-windowsdesktop-4e04405" value="true" />
50+
<add key="darc-int-dotnet-windowsdesktop-7132545" value="true" />
5151
<!-- End: Package sources from dotnet-windowsdesktop -->
5252
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5353
</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.34">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>4e044058aadccd22bc0dc7ecb27ca7f5ab270584</Sha>
179+
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
180180
</Dependency>
181-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.34-servicing.24415.7">
181+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.34-servicing.24419.1">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>4e044058aadccd22bc0dc7ecb27ca7f5ab270584</Sha>
183+
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
184184
</Dependency>
185-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.34-servicing.24415.7">
185+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.34-servicing.24419.1">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
187-
<Sha>4e044058aadccd22bc0dc7ecb27ca7f5ab270584</Sha>
187+
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.34">
190190
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
191-
<Sha>4e044058aadccd22bc0dc7ecb27ca7f5ab270584</Sha>
191+
<Sha>7132545b5ef9cfe30512311811ee420b1f208971</Sha>
192192
</Dependency>
193-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.34-servicing.24415.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
193+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.34-servicing.24417.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
194194
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
195-
<Sha>5429ff1d84d93927157f54d620a0ad9ebf1f10b9</Sha>
195+
<Sha>0716b4331761db24b6c5f2f52e8bcd32b6bd065b</Sha>
196196
</Dependency>
197197
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.34">
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.24415.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
155+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.34-servicing.24417.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
159-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.34-servicing.24415.7</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
159+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.34-servicing.24419.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
160160
</PropertyGroup>
161161
<PropertyGroup Label="Manually updated">
162162
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)