Merge branch 'main' into color-picker-switch-to-winui

Author: michael-hawker

.editorconfig

@@ -6,6 +6,9 @@ root = true
 
 #### Core EditorConfig Options ####
 
+# Encoding
+charset = utf-8
+
 # Indentation and spacing
 indent_size = 4
 indent_style = space
@@ -103,8 +106,8 @@ csharp_new_line_between_query_expression_clauses = true
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = one_less_than_current
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = no_change
 csharp_indent_switch_labels = true
 
 # Space preferences

.github/ISSUE_TEMPLATE/bug_report.md

@@ -38,9 +38,9 @@ If applicable, add screenshots to help explain your problem.
 ## Environment
 <!-- Check one or more of the following options with "x" -->
 ```
-NuGet Package(s): 
+NuGet Package(s):
 
-Package Version(s): 
+Package Version(s):
 
 Windows 10 Build Number:
 - [ ] Fall Creators Update (16299)
@@ -64,9 +64,9 @@ Device form factor:
 - [ ] Surface Hub
 - [ ] IoT
 
-Visual Studio 
+Visual Studio
 - [ ] 2017 (version: )
-- [ ] 2019 (version: ) 
+- [ ] 2019 (version: )
 - [ ] 2019 Preview (version: )
 
 ```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -13,7 +13,7 @@ IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "I
 
 ## Describe the problem this feature would solve
 <!-- Please describe or link to any existing issues or discussions.
-A clear and concise description of what the problem is, starting with the user story. 
+A clear and concise description of what the problem is, starting with the user story.
 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?
 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 [...] -->
 

.github/ISSUE_TEMPLATE/win32_controls.md

@@ -2,7 +2,7 @@
 name: Win32 Controls
 about: I have an issue with a Toolkit WPF or WinForms control
 title: "[Win32]"
-labels: 
+labels:
 assignees: ''
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,18 @@
 <!-- 🚨 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 🚨 -->
 
-<!-- 📝 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! 🎉 -->
+<!-- 👉 It is imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other --> 
+
+<!-- 📝 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! 🎉 -->
 
 
 ## Fixes #
-<!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. -->
+<!-- Add the relevant issue number after the "#" mentioned above (for ex: "## Fixes #1234") which will automatically close the issue once the PR is merged. -->
 
 <!-- Add a brief overview here of the feature/bug & fix. -->
 
 ## PR Type
 What kind of change does this PR introduce?
-<!-- Please uncomment one or more that apply to this PR. -->
+<!-- Please uncomment one or more options below that apply to this PR. -->
 
 <!-- - Bugfix -->
 <!-- - Feature -->
@@ -43,7 +45,7 @@ Please check if your PR fulfills the following requirements:
 - [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
 - [ ] Contains **NO** breaking changes
 
-<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. 
+<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
      Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. -->
 
 

.runsettings

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <MSTest>
 	<MaxCpuCount>0</MaxCpuCount>

contributing.md renamed to Contributing.md

@@ -7,23 +7,23 @@ In the next few steps, you will be able to see a glimpse of ways you can contrib
 :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:
 
 ## <a name="question"></a> Questions :grey_question:
-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. 
+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.
 
 For missing documentation related question, please file an issue at [Microsoft Docs](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/issues/new).
 
 ## <a name="bug"></a> Fix a Bug :bug:
-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. 
+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.
 
-## <a name="issue"></a>Good First Issue :ok_hand: 
+## <a name="issue"></a>Good First Issue :ok_hand:
 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.
 
-## <a name="help"></a>Help Wanted :raising_hand: 
+## <a name="help"></a>Help Wanted :raising_hand:
 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.
 
 ## <a name="feature"></a>Add New Feature :mailbox_with_mail:
-*	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. 
+*	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.
 *	Once the Feature Request is submitted, it will be open for discussion.
-*	If it gets approved by the team, proceed to submit a PR of the proposed Feature. 
+*	If it gets approved by the team, proceed to submit a PR of the proposed Feature.
 *	If the PR contains an error-free code and the reviewer signs off, the PR will be merged.
 
 ## <a name="docs"></a> Add or Improve Documentation :page_with_curl:

Directory.Build.props

@@ -4,10 +4,10 @@
     <Authors>Microsoft.Toolkit</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <NoPackageAnalysis>true</NoPackageAnalysis>
-    <PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</PackageIconUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png</PackageIconUrl>
     <PackageIcon>images\nuget.png</PackageIcon>
     <PackageProjectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>    
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReleaseNotes>https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
     <Copyright>(c) .NET Foundation and Contributors.  All rights reserved.</Copyright>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -31,6 +31,11 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
       </PropertyGroup>
     </When>
+    <Otherwise>
+      <PropertyGroup>
+        <IsPackable>false</IsPackable>
+      </PropertyGroup>
+    </Otherwise>
   </Choose>
 
   <Choose>
@@ -45,33 +50,33 @@
     <When Condition="'$(Configuration)' == 'Debug' and '$(IsDesignProject)' != 'true'">
       <!-- Debug builds have this turned on by default, but it breaks our Xaml Islands Scenarios -->
       <PropertyGroup>
-        <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
         <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+        <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
       </PropertyGroup>
     </When>
   </Choose>
 
   <Choose>
     <When Condition="'$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
       <PropertyGroup>
-        <!-- Optional: Declare that the Repository URL can be published to NuSpec -->
+        <!-- Declare that the Repository URL can be published to NuSpec -->
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
+        <!-- Embed source files that are not tracked by the source control manager to the PDB -->
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <!-- Optional: Include PDB in the built .nupkg -->
+        <!-- Include PDB in the built .nupkg -->
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
       </ItemGroup>
     </When>
   </Choose>
 
   <Choose>
     <When Condition="'$(IsDesignProject)' != 'true'">
       <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
+        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
       </ItemGroup>
     </When>
   </Choose>
@@ -103,10 +108,10 @@
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json">
       <Link>stylecop.json</Link>
     </AdditionalFiles>
-    <None Include="$(MSBuildThisFileDirectory)license.md" Pack="true" PackagePath="\"/>
-    <None Include="$(MSBuildThisFileDirectory)build\nuget.png" Pack="true" PackagePath="images\"/>
+    <None Include="$(MSBuildThisFileDirectory)License.md" Pack="true" PackagePath="\" />
+    <None Include="$(MSBuildThisFileDirectory)build\nuget.png" Pack="true" PackagePath="images\" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>
+  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'" />
 
-</Project>
+</Project>

Directory.Build.targets

@@ -5,21 +5,21 @@
   </PropertyGroup>
 
   <Choose>
-    <!--We'll include signing the Notifications library since we need the DLL signature to match for interop from class libraries to main projects-->
+    <!-- We'll include signing the Notifications library since we need the DLL signature to match for interop from class libraries to main projects -->
     <When Condition="(!$(TargetFramework.Contains(`uap10.0`)) and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true') or $(MSBuildProjectName) == 'Microsoft.Toolkit.Uwp.Notifications'">
       <PropertyGroup>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
       </PropertyGroup>
     </When>
   </Choose>
-   
+
   <!--Exclude Notifications project from this since it sets different min versions than what we want for notifications-->
-  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true' and $(MSBuildProjectName) != 'Microsoft.Toolkit.Uwp.Notifications'"/>
+  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true' and $(MSBuildProjectName) != 'Microsoft.Toolkit.Uwp.Notifications'" />
 
   <Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
     <ItemGroup>
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition=" '$(SourceRevisionId)' != '' ">
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(SourceRevisionId)' != ''">
         <_Parameter1>CommitHash</_Parameter1>
         <_Parameter2>$(SourceRevisionId)</_Parameter2>
       </AssemblyAttribute>

GazeInputTest/App.xaml

@@ -1,8 +1,8 @@
-<Application
+<Application
     x:Class="GazeInputTest.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:GazeInputTest"
     RequestedTheme="Light">
 
-</Application>
+</Application>