merge from master

Author: vgromfeld

.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
@@ -327,4 +330,4 @@ dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializ
 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.
 dotnet_diagnostic.SA1000.severity = none # Hide warnings when using the new() expression from C# 9.
 dotnet_diagnostic.SA1313.severity = none # Hide warnings for record parameters.
-dotnet_diagnostic.SA1101.severity = none # Hide warnings when accessing properties without "this".
+dotnet_diagnostic.SA1101.severity = none # Hide warnings when accessing properties without "this".

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,9 @@ assignees: ''
 
 ---
 
-<!-- 🚨 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 🚨 -->
+<!-- 🚨 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
+...
+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  🚨 -->
 
 ## Describe the bug
 A clear and concise description of what the bug is.
@@ -36,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)
@@ -62,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

@@ -7,13 +7,15 @@ assignees: ''
 
 ---
 
-<!-- 🚨 Please provide detailed information and Do Not skip any instructions as they are all required and essential to help us understand the feature 🚨 -->
+<!-- 🚨 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.
+...
+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 🚨 -->
 
 ## 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 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 [...] -->
+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 [...] -->
 
 
 ## Describe the solution

.github/ISSUE_TEMPLATE/question.md

@@ -12,8 +12,9 @@ Hi!
 
 We try and keep our GitHub issue list for bugs and features.
 
-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
-🚨 Please provide detailed information that includes examples, screenshots, and relevant issues if possible 🚨
+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]
+
+🚨 PLEASE PROVIDE DETAILED INFORMATION THAT INCLUDE EXAMPLES, SCREENSHOTS, AND RELEVANT ISSUES IF POSSIBLE 🚨
 
 If this is more about a scenario that you think is missing documentation, please file an issue instead at https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/issues/new
 

.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>

Directory.Build.props

@@ -4,9 +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>
-    <PackageLicenseUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md</PackageLicenseUrl>
+    <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>
@@ -95,15 +96,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <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\"/>
   </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>
 
-</Project>
+</Project>

Directory.Build.targets

@@ -1,19 +1,21 @@
 <Project>
 
   <PropertyGroup>
-    <UseUWP Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">true</UseUWP>
+    <UseUWP Condition="$(TargetFramework.Contains(`uap10.0`)) or '$(TargetFramework)' == 'net461'">true</UseUWP>
   </PropertyGroup>
 
   <Choose>
-    <When Condition="!$(TargetFramework.Contains(`uap10.0`)) and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true'">
+    <!--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>
 
-  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true'"/>
+  <!--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'"/>
 
   <Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
     <ItemGroup>

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>