Skip to content

Commit 211ad1a

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 38385: [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.18-servicing.24168.10 to 7.0.18-servicing.24169.14 (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**: - **Date Produced**: March 20, 2024 7:36:29 PM UTC - **Commit**: af494c5c30f33cdb12a68420c4d4a7d791b21ed0 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.18 to 7.0.18][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.18 to 7.0.18][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.18-servicing.24168.10 to 7.0.18-servicing.24169.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC769e1471d5b304a50d0dbaa45d9be58c5764d140&targetVersion=GCaf494c5c30f33cdb12a68420c4d4a7d791b21ed0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC4ee6b308b4cc05cf92d7552cb00f52041a1e4793&targetVersion=GC71273b560061b69cef763838282ef085e53a73cb&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:02937b88-6922-429c-2a20-08db797f5caf)
2 parents f7fb0a3 + e503e8d commit 211ad1a

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
@@ -18,7 +18,7 @@
1818
<add key="darc-pub-dotnet-templating-afb365f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-afb365fb/nuget/v3/index.json" />
1919
<!-- End: Package sources from dotnet-templating -->
2020
<!-- Begin: Package sources from dotnet-windowsdesktop -->
21-
<add key="darc-int-dotnet-windowsdesktop-769e147" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-769e1471/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-windowsdesktop-af494c5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af494c5c/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-windowsdesktop -->
2323
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2424
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -46,7 +46,7 @@
4646
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
4747
<!-- End: Package sources from dotnet-runtime -->
4848
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-769e147" value="true" />
49+
<add key="darc-int-dotnet-windowsdesktop-af494c5" value="true" />
5050
<!-- End: Package sources from dotnet-windowsdesktop -->
5151
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5252
</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.18">
159159
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
160-
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
160+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
161161
</Dependency>
162-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.11">
162+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24170.3">
163163
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
164-
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
164+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
165165
</Dependency>
166166
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.18">
167167
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
168-
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
168+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
169169
</Dependency>
170-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24169.11">
170+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24170.3">
171171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
172-
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
172+
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.18-servicing.24168.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
174+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.18-servicing.24169.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
175175
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
176-
<Sha>4ee6b308b4cc05cf92d7552cb00f52041a1e4793</Sha>
176+
<Sha>71273b560061b69cef763838282ef085e53a73cb</Sha>
177177
</Dependency>
178178
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.18">
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.18-servicing.24168.10</MicrosoftNETSdkWindowsDesktopPackageVersion>
174+
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.18-servicing.24169.14</MicrosoftNETSdkWindowsDesktopPackageVersion>
175175
</PropertyGroup>
176176
<PropertyGroup Label="Manually updated">
177177
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)