Skip to content

Commit a8d1919

Browse files
committed
Merge branch 'main' into winui
2 parents 1088158 + 63cbb4a commit a8d1919

File tree

1,578 files changed

+3716
-3870
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,578 files changed

+3716
-3870
lines changed

.editorconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ root = true
66

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

9+
# Encoding
10+
charset = utf-8
11+
912
# Indentation and spacing
1013
indent_size = 4
1114
indent_style = space
@@ -103,8 +106,8 @@ csharp_new_line_between_query_expression_clauses = true
103106
csharp_indent_block_contents = true
104107
csharp_indent_braces = false
105108
csharp_indent_case_contents = true
106-
csharp_indent_case_contents_when_block = true
107-
csharp_indent_labels = one_less_than_current
109+
csharp_indent_case_contents_when_block = false
110+
csharp_indent_labels = no_change
108111
csharp_indent_switch_labels = true
109112

110113
# Space preferences

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "I
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?
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

.github/ISSUE_TEMPLATE/win32_controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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
---

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Please check if your PR fulfills the following requirements:
4343
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
4444
- [ ] Contains **NO** breaking changes
4545

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

4949

.runsettings

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<RunSettings>
32
<MSTest>
43
<MaxCpuCount>0</MaxCpuCount>

CommunityToolkit.Common/Attributes/NotNullIfNotNullAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

@@ -26,4 +26,4 @@ internal sealed class NotNullIfNotNullAttribute : Attribute
2626
}
2727
}
2828

29-
#endif
29+
#endif

CommunityToolkit.Common/Attributes/NotNullWhenAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

@@ -26,4 +26,4 @@ internal sealed class NotNullWhenAttribute : Attribute
2626
}
2727
}
2828

29-
#endif
29+
#endif

CommunityToolkit.Common/Collections/IReadOnlyObservableGroup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

@@ -24,4 +24,4 @@ public interface IReadOnlyObservableGroup : INotifyPropertyChanged
2424
/// </summary>
2525
int Count { get; }
2626
}
27-
}
27+
}

CommunityToolkit.Common/Collections/ObservableGroup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

@@ -77,4 +77,4 @@ public TKey Key
7777
/// <inheritdoc/>
7878
object IReadOnlyObservableGroup.Key => Key;
7979
}
80-
}
80+
}

0 commit comments

Comments
 (0)