Skip to content

Commit d409dda

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 36346: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-wpf
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.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24060.4 (parent: Microsoft.DotNet....
2 parents f195aa9 + 6c8d62d commit d409dda

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

NuGet.config

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
<add key="darc-int-dotnet-runtime-bf5e279-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-1/nuget/v3/index.json" />
1515
<!-- End: Package sources from dotnet-runtime -->
1616
<!-- Begin: Package sources from dotnet-winforms -->
17-
<add key="darc-int-dotnet-winforms-0b4028e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-0b4028eb/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-winforms-0b4028e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-0b4028eb-2/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-winforms-0b4028e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-0b4028eb-1/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-35307d0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-35307d0f/nuget/v3/index.json" />
2018
<!-- End: Package sources from dotnet-winforms -->
2119
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2220
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -34,9 +32,7 @@
3432
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
3533
<!-- End: Package sources from dotnet-runtime -->
3634
<!-- Begin: Package sources from dotnet-winforms -->
37-
<add key="darc-int-dotnet-winforms-0b4028e-1" value="true" />
38-
<add key="darc-int-dotnet-winforms-0b4028e-2" value="true" />
39-
<add key="darc-int-dotnet-winforms-0b4028e" value="true" />
35+
<add key="darc-int-dotnet-winforms-35307d0" value="true" />
4036
<!-- End: Package sources from dotnet-winforms -->
4137
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4238
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.1-servicing.23580.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.2-servicing.24060.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
10+
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.2-servicing.24060.10">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.2-servicing.24060.15">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>0ede9037ff59dc76c37ec87659a641cfbccd6e30</Sha>
14+
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24060.10">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24060.15">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>0ede9037ff59dc76c37ec87659a641cfbccd6e30</Sha>
18+
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -29,13 +29,13 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.1-servicing.23580.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.2-servicing.24060.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
34+
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.2-servicing.24060.10">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.2-servicing.24060.15">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>0ede9037ff59dc76c37ec87659a641cfbccd6e30</Sha>
38+
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -145,9 +145,9 @@
145145
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
146146
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
147147
</Dependency>
148-
<Dependency Name="System.Drawing.Common" Version="8.0.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
148+
<Dependency Name="System.Drawing.Common" Version="8.0.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
149149
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
150-
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
150+
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
<!-- wcf -->
6666
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
6767
<!-- winforms -->
68-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.1-servicing.23580.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69-
<MicrosoftPrivateWinformsVersion>8.0.1-servicing.23580.6</MicrosoftPrivateWinformsVersion>
70-
<SystemDrawingCommonVersion>8.0.1</SystemDrawingCommonVersion>
68+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.2-servicing.24060.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69+
<MicrosoftPrivateWinformsVersion>8.0.2-servicing.24060.4</MicrosoftPrivateWinformsVersion>
70+
<SystemDrawingCommonVersion>8.0.2</SystemDrawingCommonVersion>
7171
<!-- wpf -->
72-
<MicrosoftDotNetWpfGitHubVersion>8.0.2-servicing.24060.10</MicrosoftDotNetWpfGitHubVersion>
73-
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.2-servicing.24060.10</MicrosoftDotNetWpfProjectTemplatesVersion>
72+
<MicrosoftDotNetWpfGitHubVersion>8.0.2-servicing.24060.15</MicrosoftDotNetWpfGitHubVersion>
73+
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.2-servicing.24060.15</MicrosoftDotNetWpfProjectTemplatesVersion>
7474
</PropertyGroup>
7575
</Project>

0 commit comments

Comments
 (0)