Skip to content

Commit 9872069

Browse files
dotnet-botdkurepa
authored andcommitted
Merged PR 28259: [internal/release/7.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 7.0.2-servicing.22601.4 to 7.0.2-servicing.22606.2 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fcff5d67-4caf-41c6-139b-08da7ef5fa55) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: fcff5d67-4caf-41c6-139b-08da7ef5fa55 - **Build**: 20221207.1 - **Date Produced**: December 7, 2022 10:21:27 AM UTC - **Commit**: f51697b054c6691ed59209ef8524013d44bb449c - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.2 to 7.0.2][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.2 to 7.0.2][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.2-servicing.22601.4 to 7.0.2-servicing.22606.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC44aec6b&targetVersion=GCf51697b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC7d3c040&targetVersion=GCdf04c57&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:fcff5d67-4caf-41c6-139b-08da7ef5fa55)
1 parent 51a3713 commit 9872069

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

NuGet.config

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
<add key="darc-int-dotnet-templating-0a0686f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-0a0686fa/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-44aec6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-44aec6b7/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-windowsdesktop-44aec6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-44aec6b7-1/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-windowsdesktop-f51697b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f51697b0/nuget/v3/index.json" />
2322
<!-- End: Package sources from dotnet-windowsdesktop -->
2423
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2524
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -48,8 +47,7 @@
4847
<add key="darc-int-dotnet-runtime-d037e07" value="true" />
4948
<!-- End: Package sources from dotnet-runtime -->
5049
<!-- Begin: Package sources from dotnet-windowsdesktop -->
51-
<add key="darc-int-dotnet-windowsdesktop-44aec6b-1" value="true" />
52-
<add key="darc-int-dotnet-windowsdesktop-44aec6b" value="true" />
50+
<add key="darc-int-dotnet-windowsdesktop-f51697b" value="true" />
5351
<!-- End: Package sources from dotnet-windowsdesktop -->
5452
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5553
</disabledPackageSources>

eng/Version.Details.xml

+8-8
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.2">
159159
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
160-
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
160+
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
161161
</Dependency>
162-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.2-servicing.22601.5">
162+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.2-servicing.22607.1">
163163
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
164-
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
164+
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
165165
</Dependency>
166166
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.2">
167167
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
168-
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
168+
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
169169
</Dependency>
170-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.2-servicing.22601.5">
170+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.2-servicing.22607.1">
171171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
172-
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
172+
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.2-servicing.22601.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
174+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.2-servicing.22606.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
175175
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
176-
<Sha>7d3c040a09d0a9a7434c291e353df73b7bb0ef37</Sha>
176+
<Sha>df04c57b2e2bb986f0afc2384cbebb3c950447b5</Sha>
177177
</Dependency>
178178
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.2">
179179
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/dotnet/wpf -->
171-
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.2-servicing.22601.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
171+
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.2-servicing.22606.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
172172
</PropertyGroup>
173173
<PropertyGroup Label="Manually updated">
174174
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)