Skip to content

Commit 6413fa3

Browse files
committed
Merge branch 'main' into dev/fix-samplejson-links
2 parents 569e6cd + 63cbb4a commit 6413fa3

File tree

1,626 files changed

+8562
-6415
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,626 files changed

+8562
-6415
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ 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?
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/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>

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<Authors>Microsoft.Toolkit</Authors>
55
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
66
<NoPackageAnalysis>true</NoPackageAnalysis>
7-
<PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</PackageIconUrl>
7+
<PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png</PackageIconUrl>
88
<PackageIcon>images\nuget.png</PackageIcon>
99
<PackageProjectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</PackageProjectUrl>
10-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1111
<PackageReleaseNotes>https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
1212
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
1313
<DefaultLanguage>en-US</DefaultLanguage>
@@ -109,4 +109,4 @@
109109

110110
<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>
111111

112-
</Project>
112+
</Project>

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414
</When>
1515
</Choose>
16-
16+
1717
<!--Exclude Notifications project from this since it sets different min versions than what we want for notifications-->
1818
<Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true' and $(MSBuildProjectName) != 'Microsoft.Toolkit.Uwp.Notifications'"/>
1919

GazeInputTest/App.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Application
1+
<Application
22
x:Class="GazeInputTest.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:local="using:GazeInputTest"
66
RequestedTheme="Light">
77

8-
</Application>
8+
</Application>

GazeInputTest/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
9797
deferral.Complete();
9898
}
9999
}
100-
}
100+
}

0 commit comments

Comments
 (0)