Skip to content

Commit a620d99

Browse files
authored
Merge branch 'CommunityToolkit:main' into rangeselector-continuous
2 parents 5b305d9 + 5171b99 commit a620d99

File tree

310 files changed

+12511
-2466
lines changed

Some content is hidden

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

310 files changed

+12511
-2466
lines changed

.editorconfig

Lines changed: 59 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +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

99
# Encoding
1010
charset = utf-8
1111

1212
# Indentation and spacing
13+
tab_width = 4
1314
indent_size = 4
1415
indent_style = space
15-
tab_width = 4
1616

1717
# New line preferences
18-
end_of_line = crlf
18+
end_of_line = unset
1919
insert_final_newline = false
2020

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+
2147
#### .NET Coding Conventions ####
2248

2349
# this. and Me. preferences
@@ -138,8 +164,8 @@ csharp_space_between_square_brackets = false
138164
csharp_preserve_single_line_blocks = true
139165
csharp_preserve_single_line_statements = true
140166

141-
142167
# Naming Symbols
168+
143169
# constant_fields - Define constant fields
144170
dotnet_naming_symbols.constant_fields.applicable_kinds = field
145171
dotnet_naming_symbols.constant_fields.required_modifiers = const
@@ -171,6 +197,7 @@ dotnet_naming_symbols.non_interface_types.applicable_kinds
171197
dotnet_naming_symbols.interface_types.applicable_kinds = interface
172198

173199
# Naming Styles
200+
174201
# camel_case - Define the camelCase style
175202
dotnet_naming_style.camel_case.capitalization = camel_case
176203
# pascal_case - Define the Pascal_case style
@@ -239,15 +266,8 @@ dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style
239266
dotnet_naming_style.prefix_private_field_with_underscore.capitalization = camel_case
240267
dotnet_naming_style.prefix_private_field_with_underscore.required_prefix = _
241268

242-
# Code files
269+
# .NET Code Analysis
243270

244-
# SA1009: Closing parenthesis should be spaced correctly
245-
# Needed for null forgiving operator after functions, "foo()!"
246-
dotnet_diagnostic.SA1009.severity = none
247-
248-
[*.{cs,vb}]
249-
250-
# Migrate back from old Toolkit.ruleset
251271
dotnet_diagnostic.CA1001.severity = warning
252272
dotnet_diagnostic.CA1009.severity = warning
253273
dotnet_diagnostic.CA1016.severity = warning
@@ -310,24 +330,43 @@ dotnet_diagnostic.CA2238.severity = warning
310330
dotnet_diagnostic.CA2240.severity = warning
311331
dotnet_diagnostic.CA2241.severity = warning
312332
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+
313342
dotnet_diagnostic.SA1011.severity = none
314343
dotnet_diagnostic.SA1101.severity = none
344+
345+
# Hide warnings when accessing properties without "this".
346+
dotnet_diagnostic.SA1101.severity = none
315347
dotnet_diagnostic.SA1118.severity = none
316348
dotnet_diagnostic.SA1200.severity = none
317349
dotnet_diagnostic.SA1201.severity = none
318350
dotnet_diagnostic.SA1202.severity = none
319351
dotnet_diagnostic.SA1309.severity = none
320352
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+
321363
dotnet_diagnostic.SA1600.severity = none
322364
dotnet_diagnostic.SA1602.severity = none
323365
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+
324370
dotnet_diagnostic.SA1633.severity = none
325371
dotnet_diagnostic.SA1634.severity = none
326372
dotnet_diagnostic.SA1652.severity = none
327-
328-
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.
329-
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.
330-
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.
331-
dotnet_diagnostic.SA1000.severity = none # Hide warnings when using the new() expression from C# 9.
332-
dotnet_diagnostic.SA1313.severity = none # Hide warnings for record parameters.
333-
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: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,26 @@ about: Create a report to help us fix something that isn't working as expected
44
title: ''
55
labels: "bug :bug:"
66
assignees: ''
7-
87
---
98

109
<!-- 🚨 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
1110
...
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 🚨 -->
11+
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 ENGAGE WITH THE COMMUNITY TO GAIN FURTHER CLARITY REGARDING THE ISSUE 🚨 -->
1312

1413
## Describe the bug
14+
1515
A clear and concise description of what the bug is.
1616

1717
- [ ] Is this bug a regression in the toolkit? If so, what toolkit version did you last see it work:
1818

1919
## Steps to Reproduce
2020

21-
- [ ] Can this be reproduced in the Sample App? (Either in a sample as-is or with new XAML pasted in the editor.) If so, please provide custom XAML or steps to reproduce. If not, let us know why it can't be reproduced (e.g. more complex setup, environment, dependencies, etc...) <!-- Being able to reproduce the problem in the sample app, really stream-lines the whole process in being able to discover, resolve, and validate bug fixes. -->
21+
- [ ] Can this be reproduced in the Sample App? (Either in a sample as-is or with new XAML pasted in the editor.) If so, please provide custom XAML or steps to reproduce. If not, let us know why it can't be reproduced (e.g. more complex setup, environment, dependencies, etc...)
22+
23+
<!-- Being able to reproduce the problem in the sample app, really stream-lines the whole process in being able to discover, resolve, and validate bug fixes. -->
2224

2325
Steps to reproduce the behavior:
26+
2427
1. Given the following environment (Sample App w/ XAML, Project with Isolated setup, etc...)
2528
2. Go to '...'
2629
3. Click on '....'
@@ -30,46 +33,52 @@ Steps to reproduce the behavior:
3033
<!-- Provide as many code-snippets or XAML snippets where appropriate. -->
3134

3235
## Expected behavior
33-
A clear and concise description of what you expected to happen.
36+
37+
<!-- A clear and concise description of what you expected to happen. -->
3438

3539
## Screenshots
36-
If applicable, add screenshots to help explain your problem.
40+
41+
<!-- If applicable, add screenshots to help explain your problem. -->
3742

3843
## Environment
39-
<!-- Check one or more of the following options with "x" -->
40-
```
41-
NuGet Package(s):
44+
45+
<!-- Check one or more of the following options with "x" and replace the {build_number} and {minor_version} with the actual values -->
46+
47+
NuGet Package(s): <!-- Which NuGet Packages have you used -->
4248

4349
Package Version(s):
4450

4551
Windows 10 Build Number:
52+
4653
- [ ] Fall Creators Update (16299)
4754
- [ ] April 2018 Update (17134)
4855
- [ ] October 2018 Update (17763)
4956
- [ ] May 2019 Update (18362)
5057
- [ ] May 2020 Update (19041)
51-
- [ ] Insider Build (build number: )
58+
- [ ] Insider Build ({build_number})
5259

5360
App min and target version:
61+
5462
- [ ] Fall Creators Update (16299)
5563
- [ ] April 2018 Update (17134)
5664
- [ ] October 2018 Update (17763)
5765
- [ ] May 2019 Update (18362)
5866
- [ ] May 2020 Update (19041)
59-
- [ ] Insider Build (xxxxx)
67+
- [ ] Insider Build ({build_number})
6068

6169
Device form factor:
70+
6271
- [ ] Desktop
6372
- [ ] Xbox
6473
- [ ] Surface Hub
6574
- [ ] IoT
6675

67-
Visual Studio
68-
- [ ] 2017 (version: )
69-
- [ ] 2019 (version: )
70-
- [ ] 2019 Preview (version: )
76+
Visual Studio version:
7177

72-
```
78+
- [ ] 2017 (15.{minor_version})
79+
- [ ] 2019 (16.{minor_version})
80+
- [ ] 2022 (17.{minor_version})
7381

7482
## Additional context
75-
Add any other context about the problem here.
83+
84+
<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: I have a documentation suggestion or question
44
title: "[Docs]"
55
labels: documentation
66
assignees: ''
7-
87
---
98

109
<!--

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ about: I have a new idea or improvement for the toolkit
44
title: "[Feature]"
55
labels: "feature request :mailbox_with_mail:"
66
assignees: ''
7-
87
---
98

109
<!-- 🚨 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.
1110
...
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 🚨 -->
11+
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 ENGAGE WITH THE COMMUNITY TO GAIN FURTHER CLARITY REGARDING THE FEATURE 🚨 -->
1312

1413
## Describe the problem this feature would solve
14+
1515
<!-- Please describe or link to any existing issues or discussions.
1616
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?
1818
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

20-
2120
## Describe the solution
22-
<!-- A clear and concise description of what you want to happen. Define how do you think it will help the community and adds value to the toolkit? -->
2321

22+
<!-- A clear and concise description of what you want to happen. Define how do you think it will help the community and adds value to the toolkit? -->
2423

2524
## Describe alternatives you've considered
26-
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
2725

26+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
2827

2928
## Additional context & Screenshots
29+
3030
<!-- Add any other context or screenshots about the feature request here.-->

.github/ISSUE_TEMPLATE/question.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ about: I have a question about how to use something in the toolkit.
44
title: "[Question]"
55
labels: "question :grey_question:"
66
assignees: ''
7-
87
---
98

109
<!--
1110
Hi!
1211
1312
We try and keep our GitHub issue list for bugs and features.
1413
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]
14+
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]
1615
1716
🚨 PLEASE PROVIDE DETAILED INFORMATION THAT INCLUDE EXAMPLES, SCREENSHOTS, AND RELEVANT ISSUES IF POSSIBLE 🚨
1817

.github/ISSUE_TEMPLATE/win32_controls.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ about: I have an issue with a Toolkit WPF or WinForms control
44
title: "[Win32]"
55
labels:
66
assignees: ''
7-
87
---
98

109
<!--
1110
Hi!
1211
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
12+
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
1413
1514
Otherwise, this issue will automatically be moved to that repo.
1615

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
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 imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other -->
3+
<!-- 👉 It is imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other -->
44

55
<!-- 📝 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! 🎉 -->
66

7+
## Fixes
78

8-
## Fixes #
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. -->
9+
<!-- Add the relevant issue number after the word "Fixes" mentioned above (for ex: "## Fixes #1234") which will automatically close the issue once the PR is merged. -->
1010

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

1313
## PR Type
14+
1415
What kind of change does this PR introduce?
16+
1517
<!-- Please uncomment one or more options below that apply to this PR. -->
1618

1719
<!-- - Bugfix -->
@@ -23,30 +25,30 @@ What kind of change does this PR introduce?
2325
<!-- - Sample app changes -->
2426
<!-- - Other... Please describe: -->
2527

26-
2728
## What is the current behavior?
28-
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
2929

30+
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
3031

3132
## What is the new behavior?
32-
<!-- Describe how was this issue resolved or changed? -->
3333

34+
<!-- Describe how was this issue resolved or changed? -->
3435

3536
## PR Checklist
3637

37-
Please check if your PR fulfills the following requirements:
38+
Please check if your PR fulfills the following requirements: <!-- and remove the ones that are not applicable to the current PR -->
3839

39-
- [ ] Tested code with current [supported SDKs](../readme.md#supported)
40-
- [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link -->
40+
- [ ] Tested code with current [supported SDKs](../#supported)
41+
- [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
4142
- [ ] Sample in sample app has been added / updated (for bug fixes / features)
42-
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)
43-
- [ ] 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...
43+
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
44+
- [ ] 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...
4445
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
45-
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
46+
- [ ] Header has been added to all new source files (run _build/UpdateHeaders.bat_)
4647
- [ ] Contains **NO** breaking changes
4748

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

5252
## Other information
53+
54+
<!-- Please add any other information that might be helpful to reviewers. -->

0 commit comments

Comments
 (0)