Skip to content

Commit 9edbc4d

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 31459: [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.18-servicing.23269.6 to 6.0.18-servicing.23272.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**: 20230522.2 - **Date Produced**: May 22, 2023 4:44:54 PM UTC - **Commit**: 44b3a005f161dfc735446e61cbf1e792124170da - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.18 to 6.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.18-servicing.23269.6 to 6.0.18-servicing.23272.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC6cc1fd96eb&targetVersion=GC44b3a005f1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC7cd35b1648&targetVersion=GCa29a62bc7a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
1 parent dfaebba commit 9edbc4d

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-85e4c28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-85e4c282/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-6cc1fd9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6cc1fd96/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-windowsdesktop-44b3a00" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-44b3a005/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-c76ac56" value="true" />
4747
<!-- End: Package sources from dotnet-runtime -->
4848
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-6cc1fd9" value="true" />
49+
<add key="darc-int-dotnet-windowsdesktop-44b3a00" 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.18">
170170
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
171-
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
171+
<Sha>44b3a005f161dfc735446e61cbf1e792124170da</Sha>
172172
</Dependency>
173-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.18-servicing.23269.7">
173+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.18-servicing.23272.2">
174174
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
175-
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
175+
<Sha>44b3a005f161dfc735446e61cbf1e792124170da</Sha>
176176
</Dependency>
177-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.18-servicing.23269.7">
177+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.18-servicing.23272.2">
178178
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
179-
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
179+
<Sha>44b3a005f161dfc735446e61cbf1e792124170da</Sha>
180180
</Dependency>
181181
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.18">
182182
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
183-
<Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
183+
<Sha>44b3a005f161dfc735446e61cbf1e792124170da</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.18-servicing.23269.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
185+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.18-servicing.23272.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
186186
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
187-
<Sha>7cd35b1648ac297ea6404c1f7645aaae8a216938</Sha>
187+
<Sha>a29a62bc7aa91d9e7509261a138af3c27c0506ea</Sha>
188188
</Dependency>
189189
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.18">
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
@@ -149,11 +149,11 @@
149149
</PropertyGroup>
150150
<PropertyGroup>
151151
<!-- Dependencies from https://github.com/dotnet/wpf -->
152-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.18-servicing.23269.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
152+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.18-servicing.23272.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
153153
</PropertyGroup>
154154
<PropertyGroup>
155155
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
156-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
156+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.18-servicing.23272.2</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
157157
</PropertyGroup>
158158
<PropertyGroup Label="Manually updated">
159159
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)