Commit dfe5e08
Merging internal commits for release/6.0 (#9371)
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
* Fixes PenIMC UAF MSRC .NET 6
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240311.13
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.29-servicing.24158.7 -> To Version 6.0.29-servicing.24161.13
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240312.6
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.29-servicing.24158.7 -> To Version 6.0.29-servicing.24162.6
* Local dependencies updated based on build with BAR id 217668 (20240315.6 from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms@refs/heads/internal/release/6.0)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.29-servicing.24165.6 -> To Version 6.0.29-servicing.24169.15
Dependency coherency updates
Microsoft.NETCore.Platforms,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.13 -> To Version 6.0.13 (parent: Microsoft.Private.Winforms
* Merged PR 38439: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
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.NETCore.Platforms**: from 6.0.13 to 6.0.13 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILDAsm**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**:
- **Date Produced**: March 21, 2024 8:50:10 PM UTC
- **Commit**: 6525c5174ef1b8ee5b29c397e8a4b76e76487927
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][1]
- **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][1]
- **Microsoft.NETCore.Platforms**: [from 6.0.13 to 6.0.13][2]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2]
- **Microsoft.NETCore.ILAsm**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2]
- **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC8b4de777b2ddf7e0f4a06dec30bbc152315fdef8&targetVersion=GC6525c5174ef1b8ee5b29c397e8a4b76e76487927&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc95b68327d40062beb0c9d4cd08295a85d86bd27&targetVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
* Merged PR 38452: [internal/release/6.0] Merge from public
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
* Merged PR 38997: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
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.NETCore.ILDAsm**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20240416.19
- **Date Produced**: April 16, 2024 11:16:24 PM UTC
- **Commit**: 431a1dcb7d4eafa215951499ad374ffde8622e61
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19][1]
- **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19][1]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
- **Microsoft.NETCore.ILAsm**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
- **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6525c5174ef1b8ee5b29c397e8a4b76e76487927&targetVersion=GC431a1dcb7d4eafa215951499ad374ffde8622e61&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&targetVersion=GC97d8f4cade971b93794a3805e7d72ee388f14c9b&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240516.3
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.30-servicing.24216.19 -> To Version 6.0.31-servicing.24266.3
Dependency coherency updates
Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.30-servicing.24215.25 -> To Version 6.0.31-servicing.24251.12 (parent: Microsoft.Private.Winforms
* Merged PR 39731: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
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.NETCore.ILDAsm**: from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.31 to 6.0.32 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.31 to 6.0.32 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20240517.12
- **Date Produced**: May 18, 2024 5:18:34 AM UTC
- **Commit**: 8460a2e74768942ee0c5d081be831cf53c2e609a
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.31-servicing.24266.3 to 6.0.31-servicing.24267.12][1]
- **Microsoft.Private.Winforms**: [from 6.0.31-servicing.24266.3 to 6.0.31-servicing.24267.12][1]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29][2]
- **Microsoft.NETCore.ILAsm**: [from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29][2]
- **Microsoft.NETCore.App.Ref**: [from 6.0.31 to 6.0.32][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.31 to 6.0.32][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.31-servicing.24251.12 to 6.0.32-servicing.24267.29][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCcc6b27b00d494617f99060eb9e4ab4b362d06806&targetVersion=GC8460a2e74768942ee0c5d081be831cf53c2e609a&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC62ae1c7ea14aaf03499e83fcc5c0cad5d8559b06&targetVersion=GCabb709d623326fec5088c154377059f646653af0&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240519.13
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.31-servicing.24267.12 -> To Version 6.0.31-servicing.24269.13
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240519.17
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.31-servicing.24267.12 -> To Version 6.0.32-servicing.24269.17
* [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
- Coherency Updates:
- Microsoft.NETCore.ILDAsm: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.ILAsm: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Ref: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.32-servicing.24267.29 to 6.0.32-servicing.24270.20 (parent: Microsoft.Private.Winforms)
* Merged PR 40334: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
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.NETCore.ILDAsm**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.ILAsm**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Ref**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33 (parent: Microsoft.Private.Winforms)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20240612.1
- **Date Produced**: June 12, 2024 10:19:34 PM UTC
- **Commit**: 0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.32-servicing.24270.7 to 6.0.32-servicing.24312.1][1]
- **Microsoft.Private.Winforms**: [from 6.0.32-servicing.24270.7 to 6.0.32-servicing.24312.1][1]
- **Microsoft.NETCore.ILDAsm**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2]
- **Microsoft.NETCore.ILAsm**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2]
- **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.32][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24270.20 to 6.0.32-servicing.24310.33][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7ab526075c97945087f09fbc7696c307d2fa9ce&targetVersion=GC0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCa1d71935158bdc68901bd014feca5fb68c43fb7c&targetVersion=GCc1b0b27947208969c44a51033aef7fea048f3e55&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240613.6
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.32-servicing.24312.1 -> To Version 6.0.32-servicing.24313.6
Dependency coherency updates
Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.32-servicing.24310.33 -> To Version 6.0.32-servicing.24313.8 (parent: Microsoft.Private.Winforms
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20240614.5
Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
From Version 6.0.32-servicing.24313.6 -> To Version 6.0.32-servicing.24314.5
Dependency coherency updates
Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.32-servicing.24313.8 -> To Version 6.0.32-servicing.24314.7 (parent: Microsoft.Private.Winforms
---------
Co-authored-by: dotnet-bot <[email protected]>
Co-authored-by: DotNet Bot <[email protected]>
Co-authored-by: dipeshmsft <[email protected]>1 parent a0ac911 commit dfe5e08
3 files changed
+22
-20
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| 22 | + | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | | - | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | | - | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
85 | 85 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
| 34 | + | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
41 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
0 commit comments