Skip to content

Commit 5ba4557

Browse files
committed
Merge branch 'master' of https://github.com/dpaulino/WindowsCommunityToolkit-1 into feature/control-width-trigger
2 parents 5420874 + 18b86b7 commit 5ba4557

File tree

1,742 files changed

+18931
-7173
lines changed

Some content is hidden

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

1,742 files changed

+18931
-7173
lines changed

.editorconfig

Lines changed: 64 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,49 @@
11
# Remove the line below if you want to inherit .editorconfig settings from higher directories
22
root = true
33

4-
# C# files
5-
[*.cs]
4+
# All files
5+
[*]
66

77
#### Core EditorConfig Options ####
88

9+
# Encoding
10+
charset = utf-8
11+
912
# Indentation and spacing
13+
tab_width = 4
1014
indent_size = 4
1115
indent_style = space
12-
tab_width = 4
1316

1417
# New line preferences
15-
end_of_line = crlf
18+
end_of_line = unset
1619
insert_final_newline = false
1720

21+
#### Build files ####
22+
23+
# Solution files
24+
[*.{sln,slnx}]
25+
tab_width = 4
26+
indent_size = 4
27+
indent_style = tab
28+
29+
# Configuration files
30+
[*.{json,xml,yml,config,runsettings}]
31+
indent_size = 2
32+
33+
# MSBuild files
34+
[*.{slnf,props,targets,projitems,csproj,shproj}]
35+
indent_size = 2
36+
37+
#### Source files ####
38+
39+
# Markdown files
40+
[*.md]
41+
indent_size = 2
42+
insert_final_newline = true
43+
44+
# C# files
45+
[*.cs]
46+
1847
#### .NET Coding Conventions ####
1948

2049
# this. and Me. preferences
@@ -103,8 +132,8 @@ csharp_new_line_between_query_expression_clauses = true
103132
csharp_indent_block_contents = true
104133
csharp_indent_braces = false
105134
csharp_indent_case_contents = true
106-
csharp_indent_case_contents_when_block = true
107-
csharp_indent_labels = one_less_than_current
135+
csharp_indent_case_contents_when_block = false
136+
csharp_indent_labels = no_change
108137
csharp_indent_switch_labels = true
109138

110139
# Space preferences
@@ -135,8 +164,8 @@ csharp_space_between_square_brackets = false
135164
csharp_preserve_single_line_blocks = true
136165
csharp_preserve_single_line_statements = true
137166

138-
139167
# Naming Symbols
168+
140169
# constant_fields - Define constant fields
141170
dotnet_naming_symbols.constant_fields.applicable_kinds = field
142171
dotnet_naming_symbols.constant_fields.required_modifiers = const
@@ -168,6 +197,7 @@ dotnet_naming_symbols.non_interface_types.applicable_kinds
168197
dotnet_naming_symbols.interface_types.applicable_kinds = interface
169198

170199
# Naming Styles
200+
171201
# camel_case - Define the camelCase style
172202
dotnet_naming_style.camel_case.capitalization = camel_case
173203
# pascal_case - Define the Pascal_case style
@@ -236,15 +266,8 @@ dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style
236266
dotnet_naming_style.prefix_private_field_with_underscore.capitalization = camel_case
237267
dotnet_naming_style.prefix_private_field_with_underscore.required_prefix = _
238268

239-
# Code files
240-
241-
# SA1009: Closing parenthesis should be spaced correctly
242-
# Needed for null forgiving operator after functions, "foo()!"
243-
dotnet_diagnostic.SA1009.severity = none
269+
# .NET Code Analysis
244270

245-
[*.{cs,vb}]
246-
247-
# Migrate back from old Toolkit.ruleset
248271
dotnet_diagnostic.CA1001.severity = warning
249272
dotnet_diagnostic.CA1009.severity = warning
250273
dotnet_diagnostic.CA1016.severity = warning
@@ -307,24 +330,43 @@ dotnet_diagnostic.CA2238.severity = warning
307330
dotnet_diagnostic.CA2240.severity = warning
308331
dotnet_diagnostic.CA2241.severity = warning
309332
dotnet_diagnostic.CA2242.severity = warning
333+
334+
# StyleCop Code Analysis
335+
336+
# Closing parenthesis should be spaced correctly: "foo()!"
337+
dotnet_diagnostic.SA1009.severity = none
338+
339+
# Hide warnings when using the new() expression from C# 9.
340+
dotnet_diagnostic.SA1000.severity = none
341+
310342
dotnet_diagnostic.SA1011.severity = none
311343
dotnet_diagnostic.SA1101.severity = none
344+
345+
# Hide warnings when accessing properties without "this".
346+
dotnet_diagnostic.SA1101.severity = none
312347
dotnet_diagnostic.SA1118.severity = none
313348
dotnet_diagnostic.SA1200.severity = none
314349
dotnet_diagnostic.SA1201.severity = none
315350
dotnet_diagnostic.SA1202.severity = none
316351
dotnet_diagnostic.SA1309.severity = none
317352
dotnet_diagnostic.SA1310.severity = none
353+
354+
# Hide warnings for record parameters.
355+
dotnet_diagnostic.SA1313.severity = none
356+
357+
# TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this.
358+
dotnet_diagnostic.SA1314.severity = none
359+
360+
# UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not.
361+
dotnet_diagnostic.SA1413.severity = none
362+
318363
dotnet_diagnostic.SA1600.severity = none
319364
dotnet_diagnostic.SA1602.severity = none
320365
dotnet_diagnostic.SA1611.severity = none
366+
367+
# DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes.
368+
dotnet_diagnostic.SA1629.severity = none
369+
321370
dotnet_diagnostic.SA1633.severity = none
322371
dotnet_diagnostic.SA1634.severity = none
323372
dotnet_diagnostic.SA1652.severity = none
324-
325-
dotnet_diagnostic.SA1629.severity = none # DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes.
326-
dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not.
327-
dotnet_diagnostic.SA1314.severity = none # TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this.
328-
dotnet_diagnostic.SA1000.severity = none # Hide warnings when using the new() expression from C# 9.
329-
dotnet_diagnostic.SA1313.severity = none # Hide warnings for record parameters.
330-
dotnet_diagnostic.SA1101.severity = none # Hide warnings when accessing properties without "this".

.gitattributes

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818
# Merging from the command prompt will add diff markers to the files if there
1919
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
20+
# the diff markers are never inserted). Diff markers may cause the following
2121
# file extensions to fail to load in VS. An alternative would be to treat
2222
# these files as binary and thus will always conflict and require user
2323
# intervention with every merge. To do so, just uncomment the entries below
@@ -46,9 +46,9 @@
4646

4747
###############################################################################
4848
# diff behavior for common document formats
49-
#
49+
#
5050
# Convert binary document formats to text before diffing them. This feature
51-
# is only available from the command line. Turn it on by uncommenting the
51+
# is only available from the command line. Turn it on by uncommenting the
5252
# entries below.
5353
###############################################################################
5454
#*.doc diff=astextplain

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99

1010
<!-- 🚨 PLEASE DO NOT SKIP ANY INSTRUCTIONS AND INFORMATION MENTIONED BELOW AS THEY ARE ALL REQUIRED AND ESSENTIAL TO INVESTIGATE THE ISSUE. ISSUES WITH MISSING INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION
1111
...
12-
IF NOT CERTAIN ABOUT THE ISSUE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "QUESTIONS & HELP" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/windows-toolkit/WindowsCommunityToolkit/discussions/categories/questions-help] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE ISSUE 🚨 -->
12+
IF NOT CERTAIN ABOUT THE ISSUE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "QUESTIONS & HELP" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/questions-help] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE ISSUE 🚨 -->
1313

1414
## Describe the bug
1515
A clear and concise description of what the bug is.
@@ -38,9 +38,9 @@ If applicable, add screenshots to help explain your problem.
3838
## Environment
3939
<!-- Check one or more of the following options with "x" -->
4040
```
41-
NuGet Package(s):
41+
NuGet Package(s):
4242
43-
Package Version(s):
43+
Package Version(s):
4444
4545
Windows 10 Build Number:
4646
- [ ] Fall Creators Update (16299)
@@ -64,9 +64,9 @@ Device form factor:
6464
- [ ] Surface Hub
6565
- [ ] IoT
6666
67-
Visual Studio
67+
Visual Studio
6868
- [ ] 2017 (version: )
69-
- [ ] 2019 (version: )
69+
- [ ] 2019 (version: )
7070
- [ ] 2019 Preview (version: )
7171
7272
```

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ assignees: ''
99

1010
<!-- 🚨 PLEASE PROVIDE DETAILED INFORMATION AND DO NOT SKIP ANY INSTRUCTIONS AND INFORMATION MENTIONED BELOW AS THEY ARE ALL REQUIRED AND ESSENTIAL TO HELP US UNDERSTAND THE FEATURE.
1111
...
12-
IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "IDEAS" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/windows-toolkit/WindowsCommunityToolkit/discussions/categories/ideas] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE FEATURE 🚨 -->
12+
IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "IDEAS" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/ideas] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE FEATURE 🚨 -->
1313

1414
## Describe the problem this feature would solve
1515
<!-- Please describe or link to any existing issues or discussions.
16-
A clear and concise description of what the problem is, starting with the user story.
16+
A clear and concise description of what the problem is, starting with the user story.
1717
Provide examples of the restrictions in the current environment that hinders the work your users or you want to perform. What are the ways this new feature will help transform and deliver those results?
18-
For example, I am currently using the InfiniteCanvas control which lacks the ribbon control feature. I am looking to improve user experience therefore i would like to use that in my project to provide ease of accessibility and a user-friendly interface. This new feature will provide quick access to the toolbar, enhance space utilization, etc [...] -->
18+
For example, I am currently using the InfiniteCanvas control which lacks the TabbedCommandBar control feature. I am looking to improve user experience therefore i would like to use that in my project to provide ease of accessibility and a user-friendly interface. This new feature will provide quick access to the toolbar, enhance space utilization, etc [...] -->
1919

2020

2121
## Describe the solution

.github/ISSUE_TEMPLATE/question.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Hi!
1212
1313
We try and keep our GitHub issue list for bugs and features.
1414
15-
Ideally, it'd be great to post your question on Stack Overflow using the 'windows-community-toolkit' tag here: https://stackoverflow.com/questions/tagged/windows-community-toolkit OR you may ask the question on "Questions & Help" category of the Discussions platform [https://github.com/windows-toolkit/WindowsCommunityToolkit/discussions/categories/questions-help]
15+
Ideally, it'd be great to post your question on Stack Overflow using the 'windows-community-toolkit' tag here: https://stackoverflow.com/questions/tagged/windows-community-toolkit OR you may ask the question on "Questions & Help" category of the Discussions platform [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/questions-help]
1616
1717
🚨 PLEASE PROVIDE DETAILED INFORMATION THAT INCLUDE EXAMPLES, SCREENSHOTS, AND RELEVANT ISSUES IF POSSIBLE 🚨
1818

.github/ISSUE_TEMPLATE/win32_controls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
name: Win32 Controls
33
about: I have an issue with a Toolkit WPF or WinForms control
44
title: "[Win32]"
5-
labels:
5+
labels:
66
assignees: ''
77

88
---
99

1010
<!--
1111
Hi!
1212
13-
We have a separate toolkit repo for our Win32 controls that work in WPF or WinForms, please file an issue instead at https://github.com/windows-toolkit/Microsoft.Toolkit.Win32/issues/new
13+
We have a separate toolkit repo for our Win32 controls that work in WPF or WinForms, please file an issue instead at https://github.com/CommunityToolkit/Microsoft.Toolkit.Win32/issues/new
1414
1515
Otherwise, this issue will automatically be moved to that repo.
1616

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to evaluate and test the PR. By fulfilling all the required information you will be able to reduce the volume of questions and most likely help merge the PR faster 🚨 -->
22

3-
<!-- 📝 It is preferred if you keep the "☑️ Allow edits by maintainers" checked in the Pull Request Template as it increases collaboration with the Toolkit maintainers by permitting commits to your PR branch (only) created from your fork. This can let us quickly make fixes for minor typos or forgotten StyleCop issues during review without needing to wait on you doing extra work. Let us help you help us! 🎉 -->
3+
<!-- 👉 It is imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other -->
4+
5+
<!-- 📝 Please always keep the "☑️ Allow edits by maintainers" button checked in the Pull Request Template as it increases collaboration with the Toolkit maintainers by permitting commits to your PR branch (only) created from your fork. This can let us quickly make fixes for minor typos or forgotten StyleCop issues during review without needing to wait on you doing extra work. Let us help you help us! 🎉 -->
46

57

68
## Fixes #
7-
<!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. -->
9+
<!-- Add the relevant issue number after the "#" mentioned above (for ex: "## Fixes #1234") which will automatically close the issue once the PR is merged. -->
810

911
<!-- Add a brief overview here of the feature/bug & fix. -->
1012

1113
## PR Type
1214
What kind of change does this PR introduce?
13-
<!-- Please uncomment one or more that apply to this PR. -->
15+
<!-- Please uncomment one or more options below that apply to this PR. -->
1416

1517
<!-- - Bugfix -->
1618
<!-- - Feature -->
@@ -37,13 +39,13 @@ Please check if your PR fulfills the following requirements:
3739
- [ ] Tested code with current [supported SDKs](../readme.md#supported)
3840
- [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link -->
3941
- [ ] Sample in sample app has been added / updated (for bug fixes / features)
40-
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
41-
- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
42+
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
43+
- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
4244
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
4345
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
4446
- [ ] Contains **NO** breaking changes
4547

46-
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
48+
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
4749
Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. -->
4850

4951

.runsettings

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<RunSettings>
32
<MSTest>
4-
<MaxCpuCount>0</MaxCpuCount>
3+
<MaxCpuCount>0</MaxCpuCount>
54
<Parallelize>
65
<Workers>0</Workers>
76
<Scope>ClassLevel</Scope>

contributing.md renamed to Contributing.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ In the next few steps, you will be able to see a glimpse of ways you can contrib
77
:rotating_light: **It is highly recommended to visit [Windows Community Toolkit Wiki](https://aka.ms/wct/wiki) where you can find complete and detail-oriented content of this page** :rotating_light:
88

99
## <a name="question"></a> Questions :grey_question:
10-
Due to the high volume of incoming issues please keep our GitHub issues for bug reports and feature requests. For general questions, there is a higher chance of getting your question answered on [StackOverflow](https://stackoverflow.com/questions/tagged/windows-community-toolkit) where questions should be tagged with the tag windows-community-toolkit.
10+
Due to the high volume of incoming issues please keep our GitHub issues for bug reports and feature requests. For general questions, there is a higher chance of getting your question answered on [StackOverflow](https://stackoverflow.com/questions/tagged/windows-community-toolkit) where questions should be tagged with the tag windows-community-toolkit.
1111

1212
For missing documentation related question, please file an issue at [Microsoft Docs](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/issues/new).
1313

1414
## <a name="bug"></a> Fix a Bug :bug:
15-
If you find any bug, you can help the community by [submitting an issue](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=bug+%3Abug%3A&template=bug_report.md&title=). Once the issue is filed, feel free to start working on the PR and submit a PR.
15+
If you find any bug, you can help the community by [submitting an issue](https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=bug+%3Abug%3A&template=bug_report.md&title=). Once the issue is filed, feel free to start working on the PR and submit a PR.
1616

17-
## <a name="issue"></a>Good First Issue :ok_hand:
18-
If this is your first time contributing to the Windows Community Toolkit and do not have advanced level programming experience, we have got you covered :boom: WCT has a list of [good first issue](https://github.com/windows-toolkit/WindowsCommunityToolkit/labels/good%20first%20issue%20%3Aok_hand%3A) that can be a great entryway to find and fix any issues that best fit your expertise or technical background.
17+
## <a name="issue"></a>Good First Issue :ok_hand:
18+
If this is your first time contributing to the Windows Community Toolkit and do not have advanced level programming experience, we have got you covered :boom: WCT has a list of [good first issue](https://github.com/CommunityToolkit/WindowsCommunityToolkit/labels/good%20first%20issue%20%3Aok_hand%3A) that can be a great entryway to find and fix any issues that best fit your expertise or technical background.
1919

20-
## <a name="help"></a>Help Wanted :raising_hand:
21-
WCT has a list of issues that are labeled as [help wanted](https://github.com/windows-toolkit/WindowsCommunityToolkit/labels/help%20wanted%20%3Araising_hand%3A). The level of complexity in the list can vary but if you have an advanced level of programming experience, feel free to jump in to solve these issues.
20+
## <a name="help"></a>Help Wanted :raising_hand:
21+
WCT has a list of issues that are labeled as [help wanted](https://github.com/CommunityToolkit/WindowsCommunityToolkit/labels/help%20wanted%20%3Araising_hand%3A). The level of complexity in the list can vary but if you have an advanced level of programming experience, feel free to jump in to solve these issues.
2222

2323
## <a name="feature"></a>Add New Feature :mailbox_with_mail:
24-
* To contribute a new feature, fill out the [Feature Request Template](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=feature+request+%3Amailbox_with_mail%3A&template=feature_request.md&title=%5BFeature%5D) and provide detailed information to express the proposal.
24+
* To contribute a new feature, fill out the [Feature Request Template](https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=feature+request+%3Amailbox_with_mail%3A&template=feature_request.md&title=%5BFeature%5D) and provide detailed information to express the proposal.
2525
* Once the Feature Request is submitted, it will be open for discussion.
26-
* If it gets approved by the team, proceed to submit a PR of the proposed Feature.
26+
* If it gets approved by the team, proceed to submit a PR of the proposed Feature.
2727
* If the PR contains an error-free code and the reviewer signs off, the PR will be merged.
2828

2929
## <a name="docs"></a> Add or Improve Documentation :page_with_curl:

0 commit comments

Comments
 (0)