Skip to content

Commit f715bc8

Browse files
dotnet-botvseanreesermsft
dotnet-bot
authored and
vseanreesermsft
committed
Merged PR 40335: [internal/release/8.0.1xx] 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.7-servicing.24271.5 to 8.0.7-servicing.24312.2 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:43ca46dd-3142-499e-f076-08dbd5a5cbe7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 43ca46dd-3142-499e-f076-08dbd5a5cbe7 - **Build**: 20240612.4 - **Date Produced**: June 12, 2024 10:30:04 PM UTC - **Commit**: 5968e003a1be7052fd5f52b529a47bb718ce86e6 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.7 to 8.0.7][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.7-servicing.24271.4 to 8.0.7-servicing.24312.4][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.7-servicing.24271.4 to 8.0.7-servicing.24312.4][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.7-servicing.24271.5 to 8.0.7-servicing.24312.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCba84675a76a8c12ecf4549f9ec9d98a587ef3e75&targetVersion=GC5968e003a1be7052fd5f52b529a47bb718ce86e6&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC7db8d5b8559d931e0b5555b7d3eec6c083dd6e59&targetVersion=GCb10cd0c3e35e17582d9f2b8079daf7c115e0bf53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
1 parent 2795318 commit f715bc8

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

‎NuGet.config

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,7 @@
3838
<add key="darc-pub-dotnet-templating-224824f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-224824ff/nuget/v3/index.json" />
3939
<!-- End: Package sources from dotnet-templating -->
4040
<!-- Begin: Package sources from dotnet-windowsdesktop -->
41-
<add key="darc-int-dotnet-windowsdesktop-ba84675" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a/nuget/v3/index.json" />
42-
<add key="darc-int-dotnet-windowsdesktop-ba84675-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-7/nuget/v3/index.json" />
43-
<add key="darc-int-dotnet-windowsdesktop-ba84675-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-6/nuget/v3/index.json" />
44-
<add key="darc-int-dotnet-windowsdesktop-ba84675-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-5/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-windowsdesktop-ba84675-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-4/nuget/v3/index.json" />
46-
<add key="darc-int-dotnet-windowsdesktop-ba84675-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-3/nuget/v3/index.json" />
47-
<add key="darc-int-dotnet-windowsdesktop-ba84675-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-2/nuget/v3/index.json" />
48-
<add key="darc-int-dotnet-windowsdesktop-ba84675-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ba84675a-1/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-windowsdesktop-5968e00" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5968e003/nuget/v3/index.json" />
4942
<!-- End: Package sources from dotnet-windowsdesktop -->
5043
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5144
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -95,14 +88,7 @@
9588
<add key="darc-int-dotnet-runtime-e0b6a81" value="true" />
9689
<!-- End: Package sources from dotnet-runtime -->
9790
<!-- Begin: Package sources from dotnet-windowsdesktop -->
98-
<add key="darc-int-dotnet-windowsdesktop-ba84675-1" value="true" />
99-
<add key="darc-int-dotnet-windowsdesktop-ba84675-2" value="true" />
100-
<add key="darc-int-dotnet-windowsdesktop-ba84675-3" value="true" />
101-
<add key="darc-int-dotnet-windowsdesktop-ba84675-4" value="true" />
102-
<add key="darc-int-dotnet-windowsdesktop-ba84675-5" value="true" />
103-
<add key="darc-int-dotnet-windowsdesktop-ba84675-6" value="true" />
104-
<add key="darc-int-dotnet-windowsdesktop-ba84675-7" value="true" />
105-
<add key="darc-int-dotnet-windowsdesktop-ba84675" value="true" />
91+
<add key="darc-int-dotnet-windowsdesktop-5968e00" value="true" />
10692
<!-- End: Package sources from dotnet-windowsdesktop -->
10793
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
10894
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,23 +222,23 @@
222222
</Dependency>
223223
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.7">
224224
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
225-
<Sha>ba84675a76a8c12ecf4549f9ec9d98a587ef3e75</Sha>
225+
<Sha>5968e003a1be7052fd5f52b529a47bb718ce86e6</Sha>
226226
</Dependency>
227-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.7-servicing.24271.4">
227+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.7-servicing.24312.4">
228228
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
229-
<Sha>ba84675a76a8c12ecf4549f9ec9d98a587ef3e75</Sha>
229+
<Sha>5968e003a1be7052fd5f52b529a47bb718ce86e6</Sha>
230230
</Dependency>
231231
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.7">
232232
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
233-
<Sha>ba84675a76a8c12ecf4549f9ec9d98a587ef3e75</Sha>
233+
<Sha>5968e003a1be7052fd5f52b529a47bb718ce86e6</Sha>
234234
</Dependency>
235-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.7-servicing.24271.4">
235+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.7-servicing.24312.4">
236236
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
237-
<Sha>ba84675a76a8c12ecf4549f9ec9d98a587ef3e75</Sha>
237+
<Sha>5968e003a1be7052fd5f52b529a47bb718ce86e6</Sha>
238238
</Dependency>
239-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.7-servicing.24271.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
239+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.7-servicing.24312.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
240240
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
241-
<Sha>7db8d5b8559d931e0b5555b7d3eec6c083dd6e59</Sha>
241+
<Sha>b10cd0c3e35e17582d9f2b8079daf7c115e0bf53</Sha>
242242
</Dependency>
243243
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.7">
244244
<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
@@ -178,7 +178,7 @@
178178
</PropertyGroup>
179179
<PropertyGroup>
180180
<!-- Dependencies from https://github.com/dotnet/wpf -->
181-
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.7-servicing.24271.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
181+
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.7-servicing.24312.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
182182
</PropertyGroup>
183183
<PropertyGroup Label="Manually updated">
184184
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)