Skip to content

Commit 77f6d12

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 38251: [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.3-servicing.24116.6 to 8.0.4-servicing.24168.11 (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**: - **Date Produced**: March 19, 2024 9:56:06 PM UTC - **Commit**: 46b32935e3cfb625735564f8db5719df3186daa2 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.3 to 8.0.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.3 to 8.0.4][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.3-servicing.24116.9 to 8.0.4-servicing.24169.14][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.3-servicing.24116.9 to 8.0.4-servicing.24169.14][3] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.3-servicing.24116.6 to 8.0.4-servicing.24168.11][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCbaf3c0df45e13d065884f7e84260f645295f219e&targetVersion=GC46b32935e3cfb625735564f8db5719df3186daa2&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC46fb08cfa8160d0885b74c7f28a7b187ab86efed&targetVersion=GC3e809dd609fe55ed129b89efaec03baa86ff539d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
2 parents 4273e07 + d2d7537 commit 77f6d12

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<add key="darc-pub-dotnet-templating-820701e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-820701e1/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-templating -->
3232
<!-- Begin: Package sources from dotnet-windowsdesktop -->
33+
<add key="darc-int-dotnet-windowsdesktop-46b3293" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-46b32935/nuget/v3/index.json" />
3334
<!-- End: Package sources from dotnet-windowsdesktop -->
3435
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3536
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -63,6 +64,7 @@
6364
<add key="darc-int-dotnet-runtime-a1a9440" value="true" />
6465
<!-- End: Package sources from dotnet-runtime -->
6566
<!-- Begin: Package sources from dotnet-windowsdesktop -->
67+
<add key="darc-int-dotnet-windowsdesktop-46b3293" value="true" />
6668
<!-- End: Package sources from dotnet-windowsdesktop -->
6769
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6870
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -216,25 +216,25 @@
216216
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
217217
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
218218
</Dependency>
219-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.3">
219+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.4">
220220
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
221-
<Sha>baf3c0df45e13d065884f7e84260f645295f219e</Sha>
221+
<Sha>46b32935e3cfb625735564f8db5719df3186daa2</Sha>
222222
</Dependency>
223-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.3-servicing.24116.9">
223+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.4-servicing.24169.14">
224224
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
225-
<Sha>baf3c0df45e13d065884f7e84260f645295f219e</Sha>
225+
<Sha>46b32935e3cfb625735564f8db5719df3186daa2</Sha>
226226
</Dependency>
227-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.3">
227+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.4">
228228
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
229-
<Sha>baf3c0df45e13d065884f7e84260f645295f219e</Sha>
229+
<Sha>46b32935e3cfb625735564f8db5719df3186daa2</Sha>
230230
</Dependency>
231-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.3-servicing.24116.9">
231+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.4-servicing.24169.14">
232232
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
233-
<Sha>baf3c0df45e13d065884f7e84260f645295f219e</Sha>
233+
<Sha>46b32935e3cfb625735564f8db5719df3186daa2</Sha>
234234
</Dependency>
235-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.3-servicing.24116.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
235+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.4-servicing.24168.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
236236
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
237-
<Sha>46fb08cfa8160d0885b74c7f28a7b187ab86efed</Sha>
237+
<Sha>3e809dd609fe55ed129b89efaec03baa86ff539d</Sha>
238238
</Dependency>
239239
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.4">
240240
<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
@@ -177,7 +177,7 @@
177177
</PropertyGroup>
178178
<PropertyGroup>
179179
<!-- Dependencies from https://github.com/dotnet/wpf -->
180-
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.3-servicing.24116.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
180+
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.4-servicing.24168.11</MicrosoftNETSdkWindowsDesktopPackageVersion>
181181
</PropertyGroup>
182182
<PropertyGroup Label="Manually updated">
183183
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)