Skip to content

Commit d297319

Browse files
dotnet-botdkurepa
authored andcommitted
Merged PR 27864: [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.1-servicing.22567.2 to 7.0.1-servicing.22569.3 (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**: 20221129.1 - **Date Produced**: November 29, 2022 10:33:02 AM UTC - **Commit**: 379885d35ea74fc97f382116b98f05bc5c5503b0 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.1 to 7.0.1][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.1 to 7.0.1][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.1-servicing.22578.5 to 7.0.1-servicing.22579.1][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.1-servicing.22567.2 to 7.0.1-servicing.22569.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0d6ee94&targetVersion=GC379885d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCa6985a3&targetVersion=GCb824ea7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:fcff5d67-4caf-41c6-139b-08da7ef5fa55)
1 parent 9190935 commit d297319

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
@@ -19,7 +19,7 @@
1919
<add key="darc-int-dotnet-templating-5dfa83c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-5dfa83c6-1/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-templating -->
2121
<!-- Begin: Package sources from dotnet-windowsdesktop -->
22-
<add key="darc-int-dotnet-windowsdesktop-0d6ee94" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0d6ee94e/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-windowsdesktop-379885d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-379885d3/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-windowsdesktop -->
2424
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2525
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -50,7 +50,7 @@
5050
<add key="darc-int-dotnet-runtime-97203d3" value="true" />
5151
<!-- End: Package sources from dotnet-runtime -->
5252
<!-- Begin: Package sources from dotnet-windowsdesktop -->
53-
<add key="darc-int-dotnet-windowsdesktop-0d6ee94" value="true" />
53+
<add key="darc-int-dotnet-windowsdesktop-379885d" value="true" />
5454
<!-- End: Package sources from dotnet-windowsdesktop -->
5555
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5656
</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.1">
159159
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
160-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
160+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
161161
</Dependency>
162-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.1-servicing.22578.5">
162+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.1-servicing.22579.1">
163163
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
164-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
164+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
165165
</Dependency>
166166
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.1">
167167
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
168-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
168+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
169169
</Dependency>
170-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.1-servicing.22578.5">
170+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.1-servicing.22579.1">
171171
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
172-
<Sha>0d6ee94e04df94a546ac952599a2e736294932b7</Sha>
172+
<Sha>379885d35ea74fc97f382116b98f05bc5c5503b0</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.1-servicing.22567.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
174+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.1-servicing.22569.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
175175
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
176-
<Sha>a6985a3e91f88860fd72ccc712c143b0a1dbd852</Sha>
176+
<Sha>b824ea7e65424cd8b0121cc7d2dea88a4a2cb4aa</Sha>
177177
</Dependency>
178178
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.1">
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
@@ -168,7 +168,7 @@
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/dotnet/wpf -->
171-
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.1-servicing.22567.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
171+
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.1-servicing.22569.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
172172
</PropertyGroup>
173173
<PropertyGroup Label="Manually updated">
174174
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

0 commit comments

Comments
 (0)