Skip to content

Commit b07b2e2

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 38327: [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.4-servicing.24169.8 to 8.0.4-servicing.24169.10 (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 20, 2024 4:29:47 AM UTC - **Commit**: 04094d116496e0bd1d376fd346397ec7900141f8 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.4 to 8.0.4][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.4 to 8.0.4][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.4-servicing.24169.21 to 8.0.4-servicing.24169.24][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.4-servicing.24169.21 to 8.0.4-servicing.24169.24][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.4-servicing.24169.8 to 8.0.4-servicing.24169.10][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC161450e0bd8de91351085bf794ef73018105b2bc&targetVersion=GC04094d116496e0bd1d376fd346397ec7900141f8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC29ccbeca12c26d35acfea8fd4033168fdc2edcb8&targetVersion=GCebbf01f54996755566db36e2e962ba6364da2ecc&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
2 parents 68ccc9e + fc08775 commit b07b2e2

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
@@ -30,7 +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-161450e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-161450e0/nuget/v3/index.json" />
33+
<add key="darc-int-dotnet-windowsdesktop-04094d1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-04094d11/nuget/v3/index.json" />
3434
<!-- End: Package sources from dotnet-windowsdesktop -->
3535
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3636
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -64,7 +64,7 @@
6464
<add key="darc-int-dotnet-runtime-2d7eea2" value="true" />
6565
<!-- End: Package sources from dotnet-runtime -->
6666
<!-- Begin: Package sources from dotnet-windowsdesktop -->
67-
<add key="darc-int-dotnet-windowsdesktop-161450e" value="true" />
67+
<add key="darc-int-dotnet-windowsdesktop-04094d1" value="true" />
6868
<!-- End: Package sources from dotnet-windowsdesktop -->
6969
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
7070
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,23 +218,23 @@
218218
</Dependency>
219219
<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>161450e0bd8de91351085bf794ef73018105b2bc</Sha>
221+
<Sha>04094d116496e0bd1d376fd346397ec7900141f8</Sha>
222222
</Dependency>
223-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.4-servicing.24169.21">
223+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.4-servicing.24169.24">
224224
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
225-
<Sha>161450e0bd8de91351085bf794ef73018105b2bc</Sha>
225+
<Sha>04094d116496e0bd1d376fd346397ec7900141f8</Sha>
226226
</Dependency>
227227
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.4">
228228
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
229-
<Sha>161450e0bd8de91351085bf794ef73018105b2bc</Sha>
229+
<Sha>04094d116496e0bd1d376fd346397ec7900141f8</Sha>
230230
</Dependency>
231-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.4-servicing.24169.21">
231+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.4-servicing.24169.24">
232232
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
233-
<Sha>161450e0bd8de91351085bf794ef73018105b2bc</Sha>
233+
<Sha>04094d116496e0bd1d376fd346397ec7900141f8</Sha>
234234
</Dependency>
235-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.4-servicing.24169.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
235+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.4-servicing.24169.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
236236
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
237-
<Sha>29ccbeca12c26d35acfea8fd4033168fdc2edcb8</Sha>
237+
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</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.4-servicing.24169.8</MicrosoftNETSdkWindowsDesktopPackageVersion>
180+
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.4-servicing.24169.10</MicrosoftNETSdkWindowsDesktopPackageVersion>
181181
</PropertyGroup>
182182
<PropertyGroup Label="Manually updated">
183183
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)