Skip to content

Commit 3c2bb80

Browse files
author
Ricardo Bossan (BEYONDSOFT CONSULTING INC) (from Dev Box)
committed
Merge branch 'main' of github.com:dotnet/winforms into Add_Code_Coverage_For_Buttons
2 parents 617ca4d + c2fbbda commit 3c2bb80

File tree

825 files changed

+11167
-11523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

825 files changed

+11167
-11523
lines changed

.editorconfig

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ insert_final_newline = true
2626
trim_trailing_whitespace = true
2727

2828
# avoid this. unless absolutely necessary
29-
dotnet_style_qualification_for_field = false:suggestion
30-
dotnet_style_qualification_for_property = false:suggestion
31-
dotnet_style_qualification_for_method = false:suggestion
32-
dotnet_style_qualification_for_event = false:suggestion
29+
dotnet_style_qualification_for_field = false:error
30+
dotnet_style_qualification_for_property = false:error
31+
dotnet_style_qualification_for_method = false:error
32+
dotnet_style_qualification_for_event = false:error
3333
# use language keywords instead of BCL types
3434
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
3535
dotnet_style_predefined_type_for_member_access = true:suggestion
@@ -92,9 +92,45 @@ dotnet_style_allow_multiple_blank_lines_experimental = true:silent
9292
dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
9393
dotnet_style_prefer_collection_expression = true:suggestion
9494

95+
# IDE0040: Add accessibility modifiers
96+
dotnet_diagnostic.IDE0040.severity = error
97+
9598
# C# files
99+
96100
[*.cs]
97101

102+
# These two conflict with our usage of CsWin32
103+
104+
# SYSLIB1054: Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time
105+
dotnet_diagnostic.SYSLIB1054.severity = none
106+
107+
# SYSLIB1096: Convert to 'GeneratedComInterface'
108+
dotnet_diagnostic.SYSLIB1096.severity = none
109+
110+
# IDE1006: Naming Styles
111+
dotnet_diagnostic.IDE1006.severity = error
112+
113+
# CA1725: Parameter names should match base declaration
114+
dotnet_diagnostic.CA1725.severity = error
115+
116+
# DOC100: Place text in paragraphs
117+
dotnet_diagnostic.DOC100.severity = error
118+
119+
# CA1859: Use concrete types when possible for improved performance
120+
dotnet_diagnostic.CA1859.severity = error
121+
122+
# IDE0002: Simplify Member Access
123+
dotnet_diagnostic.IDE0002.severity = error
124+
125+
# IDE0003: Remove qualification
126+
dotnet_diagnostic.IDE0003.severity = error
127+
128+
# IDE0079: Remove unnecessary suppression
129+
dotnet_diagnostic.IDE0079.severity = error
130+
131+
# IDE0044: Add readonly modifier
132+
dotnet_diagnostic.IDE0044.severity = warning
133+
98134
# .NET diagnostic
99135
dotnet_diagnostic.RS0041.severity = none
100136
dotnet_diagnostic.IDE0005.severity = error
@@ -182,9 +218,6 @@ csharp_style_deconstructed_variable_declaration = true:suggestion
182218

183219
# Visual Basic files
184220

185-
# SYSLIB1054: Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time
186-
dotnet_diagnostic.SYSLIB1054.severity = none
187-
188221
[*.vb]
189222
# Modifier preferences
190223
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
@@ -222,3 +255,16 @@ end_of_line = lf
222255

223256
[*.{cmd,bat}]
224257
end_of_line = crlf
258+
259+
# Test specific
260+
[**/tests/**/*.cs]
261+
262+
# CA1861: Avoid constant arrays as arguments - expected to be inline for test readability (4000 hits)
263+
dotnet_diagnostic.CA1861.severity = silent
264+
265+
# This should be fixed https://github.com/dotnet/winforms/issues/11041
266+
# xUnit1042: The member referenced by the MemberData attribute returns untyped data rows
267+
dotnet_diagnostic.xUnit1042.severity = none
268+
269+
# CA1859: Use concrete types when possible for improved performance
270+
dotnet_diagnostic.CA1859.severity = none

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ bld/
2929
[Oo]bj/
3030
[Ll]og/
3131

32-
# Visual Studio 2015/2017 cache/options directory
32+
# Visual Studio cache/options directory
3333
.vs/
34+
.vscode/
35+
3436
# Uncomment if you have tasks that create the project's static files in wwwroot
3537
#wwwroot/
3638

azure-pipelines-PR.yml

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# Parameters ARE available in template expressions, and parameters can have default values,
2+
# so they can be used to control yaml flow.
3+
4+
# trigger ci builds for completed checkins into main and any release branches
5+
trigger:
6+
branches:
7+
include:
8+
- main
9+
- release/*
10+
- internal/release/*
11+
- internal/experimental/*
12+
paths:
13+
include:
14+
- '*'
15+
exclude:
16+
- .github/*
17+
- docs/*
18+
- CODE-OF-CONDUCT.md
19+
- CONTRIBUTING.md
20+
- LICENSE.TXT
21+
- PATENTS.TXT
22+
- README.md
23+
- SECURITY.md
24+
- THIRD-PARTY-NOTICES.TXT
25+
26+
# trigger ci builds on pull requests into main and any release branches
27+
pr:
28+
autoCancel: true
29+
branches:
30+
include:
31+
- main
32+
- vnext
33+
- release/*
34+
- internal/release/*
35+
- internal/experimental/*
36+
- feature/win32
37+
- feature/9.0
38+
paths:
39+
include:
40+
- '*'
41+
exclude:
42+
- .github/*
43+
- docs/*
44+
- CODE-OF-CONDUCT.md
45+
- CONTRIBUTING.md
46+
- LICENSE.TXT
47+
- PATENTS.TXT
48+
- README.md
49+
- SECURITY.md
50+
- THIRD-PARTY-NOTICES.TXT
51+
52+
variables:
53+
- name: TeamName
54+
value: DotNetCore
55+
# clean the local repo on the build agents
56+
- name: Build.Repository.Clean
57+
value: true
58+
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
59+
- name: PostBuildSign
60+
value: false
61+
- ${{ else }}:
62+
- name: PostBuildSign
63+
value: true
64+
- name: EnableLoc
65+
value: ${{ contains(variables['Build.SourceBranch'], 'main') }}
66+
- name: NativeToolsOnMachine
67+
value: true
68+
69+
# used for post-build phases, no value for non-internal build
70+
- name: _InternalRuntimeDownloadArgs
71+
value: ''
72+
73+
# Produce test-signed build for PR and Public builds
74+
# needed for darc (dependency flow) publishing
75+
- name: _PublishArgs
76+
value: ''
77+
- name: _OfficialBuildIdArgs
78+
value: ''
79+
# needed for signing
80+
- name: _SignType
81+
value: test
82+
- name: _SignArgs
83+
value: ''
84+
- name: _Sign
85+
value: false
86+
87+
stages:
88+
89+
- stage: Build
90+
jobs:
91+
92+
# Windows x64
93+
- template: /eng/pipelines/build-PR.yml
94+
parameters:
95+
name: Windows_x64
96+
targetArchitecture: x64
97+
skipTests: $(SkipTests)
98+
99+
# Windows x86
100+
- template: /eng/pipelines/build-PR.yml
101+
parameters:
102+
name: Windows_x86
103+
targetArchitecture: x86
104+
skipTests: $(SkipTests)
105+
106+
# Windows arm64
107+
- template: /eng/pipelines/build-PR.yml
108+
parameters:
109+
name: Windows_arm64
110+
targetArchitecture: arm64
111+
skipTests: $(SkipTests)

0 commit comments

Comments
 (0)