10000 [main] Source code updates from dotnet/winforms (#340) · dotnet/dotnet@d4cd773 · GitHub
[go: up one dir, main page]

Skip to content

Commit d4cd773

Browse files
[main] Source code updates from dotnet/winforms (#340)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent e9f84be commit d4cd773

File tree

16 files changed

+233
-226
lines changed

16 files changed

+233
-226
lines changed

prereqs/git-info/winforms.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>a345d2c077aad9aad8346aef79938c26ca029857</GitCommitHash>
5-
<OfficialBuildId>20250429.4</OfficialBuildId>
6-
<OutputPackageVersion>10.0.0-preview.5.25229.4</OutputPackageVersion>
4+
<GitCommitHash>9be7da7fea56e690de436d155aa917e9cd0598a2</GitCommitHash>
5+
<OfficialBuildId>20250501.3</OfficialBuildId>
6+
<OutputPackageVersion>10.0.0-preview.5.25251.3</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@
176176
"commitSha": "2ebb7d189eccf908c7121a5c1e5e71da0085c4dc"
177177
},
178178
{
179-
"packageVersion": "10.0.0-preview.5.25229.4",
180-
"barId": 266349,
179+
"packageVersion": "10.0.0-preview.5.25251.3",
180+
"barId": 266580,
181181
"path": "winforms",
182182
"remoteUri": "https://github.com/dotnet/winforms",
183-
"commitSha": "a345d2c077aad9aad8346aef79938c26ca029857"
183+
"commitSha": "9be7da7fea56e690de436d155aa917e9cd0598a2"
184184
},
185185
{
186186
"packageVersion": "10.0.0-preview.5.25229.1",

src/winforms/.github/policies/resourceManagement.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ configuration:
1515
filters:
1616
- isOpen
1717
- hasLabel:
18-
label: ':mailbox_with_no_mail: waiting-author-feedback'
18+
label: 'waiting-author-feedback'
1919
- hasLabel:
2020
label: ':zzz: no-recent-activity'
2121
- noActivitySince:
@@ -30,7 +30,7 @@ configuration:
3030
filters:
3131
- isOpen
3232
- hasLabel:
33-
label: ':mailbox_with_no_mail: waiting-author-feedback'
33+
label: 'waiting-author-feedback'
3434
- noActivitySince:
3535
days: 14
3636
- isNotLabeledWith:
@@ -95,7 +95,7 @@ configuration:
9595
reviewState: Changes_requested
9696
then:
9797
- addLabel:
98-
label: ':mailbox_with_no_mail: waiting-author-feedback'
98+
label: 'waiting-author-feedback'
9999
description: Add needs author feedback label to pull requests when changes are requested
100100
- if:
101101
- payloadType: Pull_Request
@@ -105,30 +105,30 @@ configuration:
105105
isAction:
106106
action: Closed
107107
- hasLabel:
108-
label: ':mailbox_with_no_mail: waiting-author-feedback'
108+
label: 'waiting-author-feedback'
109109
then:
110110
- removeLabel:
111-
label: ':mailbox_with_no_mail: waiting-author-feedback'
111+
label: 'waiting-author-feedback'
112112
description: Remove needs author feedback label when the author responds to a pull request
113113
- if:
114114
- payloadType: Issue_Comment
115115
- isActivitySender:
116116
issueAuthor: True
117117
- hasLabel:
118-
label: ':mailbox_with_no_mail: waiting-author-feedback'
118+
label: 'waiting-author-feedback'
119119
then:
120120
- removeLabel:
121-
label: ':mailbox_with_no_mail: waiting-author-feedback'
121+
label: 'waiting-author-feedback'
122122
description: Remove needs author feedback label when the author comments on a pull request
123123
- if:
124124
- payloadType: Pull_Request_Review
125125
- isActivitySender:
126126
issueAuthor: True
127127
- hasLabel:
128-
label: ':mailbox_with_no_mail: waiting-author-feedback'
128+
label: 'waiting-author-feedback'
129129
then:
130130
- removeLabel:
131-
label: ':mailbox_with_no_mail: waiting-author-feedback'
131+
label: 'waiting-author-feedback'
132132
description: Remove needs author feedback label when the author responds to a pull request review comment
133133
- if:
134134
- payloadType: Pull_Request
@@ -237,10 +237,10 @@ configuration:
237237
- isActivitySender:
238238
issueAuthor: True
239239
- hasLabel:
240-
label: ':mailbox_with_no_mail: waiting-author-feedback'
240+
label: 'waiting-author-feedback'
241241
then:
242242
- removeLabel:
243-
label: ':mailbox_with_no_mail: waiting-author-feedback'
243+
label: 'waiting-author-feedback'
244244
- addLabel:
245245
label: 'untriaged'
246246
description: Remove needs author feedback label when the author comments on an issue and adds untriaged label
@@ -312,7 +312,7 @@ configuration:
312312
- removeLabel:
313313
label: ':mailbox_with_mail: waiting-for-testing'
314314
- removeLabel:
315-
label: ':mailbox_with_no_mail: waiting-author-feedback'
315+
label: 'waiting-author-feedback'
316316
- removeLabel:
317317
label: ready-to-merge
318318
- removeLabel:
@@ -329,7 +329,7 @@ configuration:
329329
- removeLabel:
330330
label: untriaged
331331
- removeLabel:
332-
label: ':mailbox_with_no_mail: waiting-author-feedback'
332+
label: 'waiting-author-feedback'
333333
- removeLabel:
334334
label: ':mailbox_with_mail: waiting-for-testing'
335335
description: Remove intermediate labels from closed issue.

src/winforms/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ flags: # which files to include in the reporting
2626
- src/System.Drawing.Design/src/
2727
- src/System.Private.Windows.Core/src/
2828
- src/System.Private.Windows.GdiPlus/
29-
- src/System.Windows.Forms/src/
29+
- src/System.Windows.Forms/
3030
- src/System.Windows.Forms.Analyzers/src/
3131
- src/System.Windows.Forms.Analyzers.CSharp/src/
3232
- src/System.Windows.Forms.Design/src/
@@ -39,7 +39,7 @@ flags: # which files to include in the reporting
3939
- src/Microsoft.VisualBasic/tests/
4040
- src/Microsoft.VisualBasic.Forms/tests/
4141
- src/System.Drawing.Common/tests/
42-
- src/System.Windows.Forms/tests/
42+
- src/test/unit/System.Windows.Forms/
4343
- src/System.Windows.Forms.Analyzers/tests/
4444
- src/System.Windows.Forms.Analyzers.CSharp/tests/
4545
- src/System.Windows.Forms.Design/tests/

src/winforms/docs/developer-guide.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,22 @@ The [Issue Guide](issue-guide.md) describes our approach to using GitHub issues.
66

77
## Machine Setup
88

9-
Windows Forms requires the following workloads and components be selected when installing Visual Studio 2022 (17.0.0):
9+
Windows Forms development requires the following workloads and components be selected when installing Visual Studio 2022 (17.0.0):
1010

1111
* Required Workloads:
1212
* .NET Desktop Development
1313
* Desktop development with C++
1414
* [Required Individual Components][required-individual-components]:
1515
* Windows 10 SDK
16-
* C++/CLI support
16+
* C++ CMake tools for Windows
1717
* Required Windows Features
18-
* 'Media Features' including 'Windows Media Player Legacy (App)' (Windows 11) or 'Windows Media Player' (Windows 10)
19-
20-
21-
:warning: CMake 3.21.0 or later is required. Install CMake from the [official website][cmake-download] or via [Chocolatey][chocolatey]:
22-
```
23-
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
24-
```
25-
18+
* 'Media Features' including 'Windows Media Player Legacy (App)' (Windows 11) or 'Windows Media Player' (Windows 10)
2619
* Useful Visual Studio extensions:
2720
* [Editor guidelines](https://marketplace.dev.azure.com/items?itemName=PaulHarrington.EditorGuidelines), see https://github.com/dotnet/winforms/pull/4836 for more information
2821
* [VS Color Output](https://marketplace.dev.azure.com/items?itemName=MikeWard-AnnArbor.VSColorOutput64)
2922
* [Productivity Power Tools](https://marketplace.dev.azure.com/items?itemName=VisualStudioPlatformTeam.ProductivityPowerPack2022)
23+
24+
Optional: To get the latest C# features in Visual Studio or to experiment with the latest runtime when not using the `start-vs.cmd`, install the [latest SDK build](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
3025

3126
## Workflow
3227

src/winforms/eng/Version.Details.xml

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,114 +6,114 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="78c5fa9a48d469a19ab5a61c16c955c1f370b5be" BarId="266331" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="35ccf19f39389d127ab037709b8e9c5a1b111a20" BarId="266496" />
1010
<ProductDependencies>
11-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25229.109">
11+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25230.108">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
13+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25229.109">
15+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25230.108">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
17+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25229.109">
19+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.5.25230.108">
2020
<Uri>https://github.com/dotnet/dotnet</Uri 10000 >
21-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
21+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
2222
</Dependency>
23-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25229.109">
23+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.5.25230.108">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
25+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25229.109">
27+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.5.25230.108">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
29+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25229.109">
31+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25230.108">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
33+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25229.109">
35+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25230.108">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
37+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
3838
</Dependency>
39-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25229.109">
39+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-preview.5.25230.108">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
41+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
4242
</Dependency>
43-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25229.109">
43+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.5.25230.108">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
45+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
4646
</Dependency>
47-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25229.109">
47+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.5.25230.108">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
49+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25229.109">
51+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.5.25230.108">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
53+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
5454
</Dependency>
55-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25229.109">
55+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.5.25230.108">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
57+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25229.109">
59+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25230.108">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
61+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25229.109">
63+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25230.108">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
65+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
6666
</Dependency>
67-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25229.109">
67+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.5.25230.108">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
69+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25229.109">
71+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-preview.5.25230.108">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
73+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
7474
</Dependency>
75-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25229.109">
75+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.5.25230.108">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
77+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
7878
</Dependency>
79-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25229.109">
79+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.5.25230.108">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
81+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
8282
</Dependency>
83-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25229.109">
83+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.5.25230.108">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
85+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
8686
</Dependency>
87-
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25229.109">
87+
<Dependency Name="System.IO.Hashing" Version="10.0.0-preview.5.25230.108">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
89+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
9090
</Dependency>
9191
</ProductDependencies>
9292
<ToolsetDependencies>
9393
<!-- Arcade -->
94-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25229.109">
94+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25230.108">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
96+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25229.109">
98+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25230.108">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
100+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25229.109">
102+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25230.108">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
104+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25229.109">
106+
<Dependency Name="Microsoft.DotNet.He 9D01 lix.Sdk" Version="10.0.0-beta.25230.108">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
108+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25229.109">
110+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25230.108">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
112+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25229.109">
114+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25230.108">
115115
<Uri>https://github.com/dotnet/dotnet</Uri>
116-
<Sha>78c5fa9a48d469a19ab5a61c16c955c1f370b5be</Sha>
116+
<Sha>35ccf19f39389d127ab037709b8e9c5a1b111a20</Sha>
117117
</Dependency>
118118
</ToolsetDependencies>
119119
</Dependencies>

0 commit comments

Comments
 (0)
0