Skip to content

Commit 2838d93

Browse files
dotnet-botmarcpopMSFT
authored andcommitted
Merged PR 33415: [internal/release/7.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 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:02937b88-6922-429c-2a20-08db797f5caf) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 02937b88-6922-429c-2a20-08db797f5caf - **Build**: 20230825.5 - **Date Produced**: August 25, 2023 8:22:26 PM UTC - **Commit**: b193aa2e8630cef7ac1d858be3677b0c129e2faf - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.11 to 7.0.11][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC721967ad57&targetVersion=GCb193aa2e86&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCaea83fde38&targetVersion=GC6432861c5a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:02937b88-6922-429c-2a20-08db797f5caf)
2 parents 17024f4 + e660432 commit 2838d93

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
@@ -17,7 +17,7 @@
1717
<!-- Begin: Package sources from dotnet-templating -->
1818
<!-- End: Package sources from dotnet-templating -->
1919
<!-- Begin: Package sources from dotnet-windowsdesktop -->
20-
<add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-windowsdesktop-b193aa2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-b193aa2e/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" />
@@ -45,7 +45,7 @@
4545
<add key="darc-int-dotnet-runtime-ecb34f8" value="true" />
4646
<!-- End: Package sources from dotnet-runtime -->
4747
<!-- Begin: Package sources from dotnet-windowsdesktop -->
48-
<add key="darc-int-dotnet-windowsdesktop-721967a" value="true" />
48+
<add key="darc-int-dotnet-windowsdesktop-b193aa2" value="true" />
4949
<!-- End: Package sources from dotnet-windowsdesktop -->
5050
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5151
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,23 @@
157157
</Dependency>
158158
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.11">
159159
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
160-
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
160+
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
161161
</Dependency>
162-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.3">
162+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23425.5">
163163
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
164-
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
164+
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
165165
</Dependency>
166166
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.11">
167167
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
168-
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
168+
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
169169
</Dependency>
170-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23422.3">
170+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23425.5">
171171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
172-
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
172+
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.11-servicing.23422.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
174+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.11-servicing.23425.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
175175
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
176-
<Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha>
176+
<Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha>
177177
</Dependency>
178178
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.11">
179179
<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
@@ -171,7 +171,7 @@
171171
</PropertyGroup>
172172
<PropertyGroup>
173173
<!-- Dependencies from https://github.com/dotnet/wpf -->
174-
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.11-servicing.23422.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
174+
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.11-servicing.23425.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
175175
</PropertyGroup>
176176
<PropertyGroup Label="Manually updated">
177177
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)