Commit 192ae85
Merging internal commits for release/9.0 (#4927)
* Merged PR 46637: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf
This pull request updates the following dependencies
[marker]: <> (Begin:96d60e53-364e-4c86-9944-2b28af49d9e4)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- **Subscription**: 96d60e53-364e-4c86-9944-2b28af49d9e4
- **Build**: 20250107.10
- **Date Produced**: January 8, 2025 5:50:59 AM UTC
- **Commit**: 268a89320f55f14cc8a2cec94020f7bf44417fbf
- **Branch**: refs/heads/internal/release/9.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.Wpf.GitHub**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1]
- **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1]
- **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25057.10][1]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCf26d48cd826cfd41bed05708d1cdc9e219bf8514&targetVersion=GC268a89320f55f14cc8a2cec94020f7bf44417fbf&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:96d60e53-364e-4c86-9944-2b28af49d9e4)
* Merged PR 46841: [internal/release/9.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 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **Microsoft.NETCore.App.Ref**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **Microsoft.Win32.Registry.AccessControl**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **Microsoft.Win32.SystemEvents**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **System.CodeDom**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **System.ComponentModel.Composition**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **System.Configuration.ConfigurationManager**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms)
- **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub)
- **System.Data.Odbc**: from 9.0.1 to 9.0.2 (parent: Microsoft...
---------
Co-authored-by: Mirroring <[email protected]>
Co-authored-by: ProductConstructionServiceProd <ProductConstructionServiceProd>1 parent 165dd80 commit 192ae85
3 files changed
+112
-132
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
| 12 | + | |
15 | 13 | | |
16 | 14 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
| 15 | + | |
26 | 16 | | |
27 | 17 | | |
28 | 18 | | |
| |||
37 | 27 | | |
38 | 28 | | |
39 | 29 | | |
40 | | - | |
41 | | - | |
42 | | - | |
| 30 | + | |
43 | 31 | | |
44 | 32 | | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
| 33 | + | |
54 | 34 | | |
55 | 35 | | |
56 | 36 | | |
| |||
0 commit comments