Skip to content

Commit 1be930b

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 36636: [internal/release/8.0.2xx] 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 8.0.2-servicing.24060.15 to 8.0.2-servicing.24068.6 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fb2a2599-b072-4edc-df8c-08dc11e0730b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: fb2a2599-b072-4edc-df8c-08dc11e0730b - **Build**: 20240118.6 - **Date Produced**: January 18, 2024 11:16:49 PM UTC - **Commit**: 593444ad8328a5a933c006c6564469666f45ad2e - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.2 to 8.0.2][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.2 to 8.0.2][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.2-servicing.24061.2 to 8.0.2-servicing.24068.6][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.2-servicing.24061.2 to 8.0.2-servicing.24068.6][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.2-servicing.24060.15 to 8.0.2-servicing.24068.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCd409ddaf7da38b20f30f260f5b84ffdadb5626c8&targetVersion=GC593444ad8328a5a933c006c6564469666f45ad2e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC4c5c25180f2937b7c0691483dc892169fc13ddb3&targetVersion=GC472140dd926227876848e48f41cfc9acb9275492&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:fb2a2599-b072-4edc-df8c-08dc11e0730b)
2 parents fd7f68c + 9861ce8 commit 1be930b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- Begin: Package sources from dotnet-templating -->
2626
<!-- End: Package sources from dotnet-templating -->
2727
<!-- Begin: Package sources from dotnet-windowsdesktop -->
28-
<add key="darc-int-dotnet-windowsdesktop-d409dda" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d409ddaf/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-windowsdesktop-593444a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-593444ad/nuget/v3/index.json" />
2929
<!-- End: Package sources from dotnet-windowsdesktop -->
3030
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3131
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -61,7 +61,7 @@
6161
<add key="darc-int-dotnet-runtime-1381d5e" value="true" />
6262
<!-- End: Package sources from dotnet-runtime -->
6363
<!-- Begin: Package sources from dotnet-windowsdesktop -->
64-
<add key="darc-int-dotnet-windowsdesktop-d409dda" value="true" />
64+
<add key="darc-int-dotnet-windowsdesktop-593444a" value="true" />
6565
<!-- End: Package sources from dotnet-windowsdesktop -->
6666
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6767
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,23 +214,23 @@
214214
</Dependency>
215215
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.2">
216216
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
217-
<Sha>d409ddaf7da38b20f30f260f5b84ffdadb5626c8</Sha>
217+
<Sha>593444ad8328a5a933c006c6564469666f45ad2e</Sha>
218218
</Dependency>
219-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.2-servicing.24061.2">
219+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.2-servicing.24068.6">
220220
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
221-
<Sha>d409ddaf7da38b20f30f260f5b84ffdadb5626c8</Sha>
221+
<Sha>593444ad8328a5a933c006c6564469666f45ad2e</Sha>
222222
</Dependency>
223223
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.2">
224224
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
225-
<Sha>d409ddaf7da38b20f30f260f5b84ffdadb5626c8</Sha>
225+
<Sha>593444ad8328a5a933c006c6564469666f45ad2e</Sha>
226226
</Dependency>
227-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.2-servicing.24061.2">
227+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.2-servicing.24068.6">
228228
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
229-
<Sha>d409ddaf7da38b20f30f260f5b84ffdadb5626c8</Sha>
229+
<Sha>593444ad8328a5a933c006c6564469666f45ad2e</Sha>
230230
</Dependency>
231-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24060.15" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
231+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24068.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
232232
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
233-
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
233+
<Sha>472140dd926227876848e48f41cfc9acb9275492</Sha>
234234
</Dependency>
235235
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.2">
236236
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</PropertyGroup>
167167
<PropertyGroup>
168168
<!-- Dependencies from https://github.com/dotnet/wpf -->
169-
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.2-servicing.24060.15</MicrosoftNETSdkWindowsDesktopPackageVersion>
169+
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.2-servicing.24068.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
170170
</PropertyGroup>
171171
<PropertyGroup Label="Manually updated">
172172
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)