CommunityToolkit · azchohfi · Jun 23, 2020 · Jun 26, 2020 · Jun 26, 2020 · Jun 29, 2020
diff --git a/.gitignore b/.gitignore
@@ -229,6 +229,10 @@ msbuild.binlog
 # Generated file from .ttinclude
 **/Generated/TypeInfo.g.cs
 
+# Files generated by the VS build
+**/Generated Files/**
+
 # TAEF Log output
 WexLogFileOutput
 *.wtl
+*.wtl.trace
diff --git a/...pfCore.SampleApp.PackagingProject.wapproj → ...pfCore.SampleApp.PackagingProject.wapproj b/...pfCore.SampleApp.PackagingProject.wapproj → ...pfCore.SampleApp.PackagingProject.wapproj
@@ -54,7 +54,7 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj</EntryPointProjectUniqueName>
+    <EntryPointProjectUniqueName>..\CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -71,7 +71,7 @@
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj">
+    <ProjectReference Include="..\CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.csproj">
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>

diff --git a/...tTest/Assets/LockScreenLogo.scale-200.png → ...oject/Images/LockScreenLogo.scale-200.png b/...tTest/Assets/LockScreenLogo.scale-200.png → ...oject/Images/LockScreenLogo.scale-200.png
diff --git a/...putTest/Assets/SplashScreen.scale-200.png → ...Project/Images/SplashScreen.scale-200.png b/...putTest/Assets/SplashScreen.scale-200.png → ...Project/Images/SplashScreen.scale-200.png
diff --git a/...st/Assets/Square150x150Logo.scale-200.png → ...ct/Images/Square150x150Logo.scale-200.png b/...st/Assets/Square150x150Logo.scale-200.png → ...ct/Images/Square150x150Logo.scale-200.png
diff --git a/...Test/Assets/Square44x44Logo.scale-200.png → ...ject/Images/Square44x44Logo.scale-200.png b/...Test/Assets/Square44x44Logo.scale-200.png → ...ject/Images/Square44x44Logo.scale-200.png
diff --git a/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png b/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png
diff --git a/GazeInputTest/Assets/StoreLogo.png → ...App.PackagingProject/Images/StoreLogo.png b/GazeInputTest/Assets/StoreLogo.png → ...App.PackagingProject/Images/StoreLogo.png
diff --git a/...Test/Assets/Wide310x150Logo.scale-200.png → ...ject/Images/Wide310x150Logo.scale-200.png b/...Test/Assets/Wide310x150Logo.scale-200.png → ...ject/Images/Wide310x150Logo.scale-200.png
diff --git a/...App.PackagingProject/Package.appxmanifest → ...App.PackagingProject/Package.appxmanifest b/...App.PackagingProject/Package.appxmanifest → ...App.PackagingProject/Package.appxmanifest
@@ -12,7 +12,7 @@
     Version="1.0.0.0" />
 
   <Properties>
-    <DisplayName>Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject</DisplayName>
+    <DisplayName>CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject</DisplayName>
     <PublisherDisplayName>aleader</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>
@@ -31,8 +31,8 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject"
-        Description="Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject"
+        DisplayName="CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject"
+        Description="CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
         Square44x44Logo="Images\Square44x44Logo.png">
@@ -45,7 +45,7 @@
         <!--Register COM CLSID LocalServer32 registry key-->
         <com:Extension Category="windows.comServer">
           <com:ComServer>
-            <com:ExeServer Executable="Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
+            <com:ExeServer Executable="CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
               <com:Class Id="80cc4528-e348-11ea-87d0-0242ac130003" DisplayName="Toast activator"/>
             </com:ExeServer>
           </com:ComServer>

diff --git a/....Toolkit.Win32.WpfCore.SampleApp/App.xaml → ...yToolkit.Win32.WpfCore.SampleApp/App.xaml b/....Toolkit.Win32.WpfCore.SampleApp/App.xaml → ...yToolkit.Win32.WpfCore.SampleApp/App.xaml
@@ -1,8 +1,7 @@
-<Application x:Class="Microsoft.Toolkit.Win32.WpfCore.SampleApp.App"
+<Application x:Class="CommunityToolkit.Win32.WpfCore.SampleApp.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Microsoft.Toolkit.Win32.WpfCore.SampleApp">
+             xmlns:local="clr-namespace:CommunityToolkit.Win32.WpfCore.SampleApp">
     <Application.Resources>
-
     </Application.Resources>
 </Application>
diff --git a/...olkit.Win32.WpfCore.SampleApp/App.xaml.cs → ...olkit.Win32.WpfCore.SampleApp/App.xaml.cs b/...olkit.Win32.WpfCore.SampleApp/App.xaml.cs → ...olkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows;
-using Microsoft.Toolkit.Uwp.Notifications;
+using CommunityToolkit.WinUI.Notifications;
 
-namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
+namespace CommunityToolkit.Win32.WpfCore.SampleApp
 {
     /// <summary>
     /// Interaction logic for App.xaml

diff --git a/...t.Win32.WpfCore.SampleApp/AssemblyInfo.cs → ...t.Win32.WpfCore.SampleApp/AssemblyInfo.cs b/...t.Win32.WpfCore.SampleApp/AssemblyInfo.cs → ...t.Win32.WpfCore.SampleApp/AssemblyInfo.cs
diff --git a/...ft.Toolkit.Win32.WpfCore.SampleApp.csproj → ...ityToolkit.Win32.WpfCore.SampleApp.csproj b/...ft.Toolkit.Win32.WpfCore.SampleApp.csproj → ...ityToolkit.Win32.WpfCore.SampleApp.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.Notifications\Microsoft.Toolkit.Uwp.Notifications.csproj" />
+    <ProjectReference Include="..\CommunityToolkit.WinUI.Notifications\CommunityToolkit.WinUI.Notifications.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...t.Win32.WpfCore.SampleApp/MainWindow.xaml → ...t.Win32.WpfCore.SampleApp/MainWindow.xaml b/...t.Win32.WpfCore.SampleApp/MainWindow.xaml → ...t.Win32.WpfCore.SampleApp/MainWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="Microsoft.Toolkit.Win32.WpfCore.SampleApp.MainWindow"
+<Window x:Class="CommunityToolkit.Win32.WpfCore.SampleApp.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Microsoft.Toolkit.Win32.WpfCore.SampleApp"
+        xmlns:local="clr-namespace:CommunityToolkit.Win32.WpfCore.SampleApp"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>

diff --git a/...in32.WpfCore.SampleApp/MainWindow.xaml.cs → ...in32.WpfCore.SampleApp/MainWindow.xaml.cs b/...in32.WpfCore.SampleApp/MainWindow.xaml.cs → ...in32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -10,11 +10,11 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media.Imaging;
-using Microsoft.Toolkit.Uwp.Notifications;
+using CommunityToolkit.WinUI.Notifications;
 using Windows.Services.Maps;
 using Windows.UI.Notifications;
 
-namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
+namespace CommunityToolkit.Win32.WpfCore.SampleApp
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

diff --git a/...Win32.WpfCore.SampleApp/MyToastActions.cs → ...Win32.WpfCore.SampleApp/MyToastActions.cs b/...Win32.WpfCore.SampleApp/MyToastActions.cs → ...Win32.WpfCore.SampleApp/MyToastActions.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
+namespace CommunityToolkit.Win32.WpfCore.SampleApp
 {
     public enum MyToastActions
     {

diff --git a/...t.Win32.WpfCore.SampleApp/ToolkitIcon.ico → ...t.Win32.WpfCore.SampleApp/ToolkitIcon.ico b/...t.Win32.WpfCore.SampleApp/ToolkitIcon.ico → ...t.Win32.WpfCore.SampleApp/ToolkitIcon.ico
diff --git a/Microsoft.Toolkit.Win32/ReadMe.md → CommunityToolkit.Win32/ReadMe.md b/Microsoft.Toolkit.Win32/ReadMe.md → CommunityToolkit.Win32/ReadMe.md
diff --git a/...ty/BluetoothLEHelper/BluetoothLEHelper.cs → ...ty/BluetoothLEHelper/BluetoothLEHelper.cs b/...ty/BluetoothLEHelper/BluetoothLEHelper.cs → ...ty/BluetoothLEHelper/BluetoothLEHelper.cs
@@ -8,12 +8,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.UI.Dispatching;
 using Windows.Devices.Bluetooth;
 using Windows.Devices.Bluetooth.Advertisement;
 using Windows.Devices.Enumeration;
-using Windows.System;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Context for the entire app. This is where all app wide variables are stored

diff --git a/...ectivity/BluetoothLEHelper/GattConvert.cs → ...ectivity/BluetoothLEHelper/GattConvert.cs b/...ectivity/BluetoothLEHelper/GattConvert.cs → ...ectivity/BluetoothLEHelper/GattConvert.cs
@@ -7,7 +7,7 @@
 using Windows.Security.Cryptography;
 using Windows.Storage.Streams;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Extension methods for Gatt Convert.

diff --git a/...ivity/BluetoothLEHelper/GattNativeUuid.cs → ...ivity/BluetoothLEHelper/GattNativeUuid.cs b/...ivity/BluetoothLEHelper/GattNativeUuid.cs → ...ivity/BluetoothLEHelper/GattNativeUuid.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// This enum assists in finding a string representation of a BT SIG assigned value for UUIDS

diff --git a/...etoothLEHelper/GattProtocolErrorParser.cs → ...etoothLEHelper/GattProtocolErrorParser.cs b/...etoothLEHelper/GattProtocolErrorParser.cs → ...etoothLEHelper/GattProtocolErrorParser.cs
@@ -4,7 +4,7 @@
 
 using Windows.Devices.Bluetooth.GenericAttributeProfile;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Helper function when working with <see cref="GattProtocolError" />

diff --git a/...ity/BluetoothLEHelper/GattUuidsService.cs → ...ity/BluetoothLEHelper/GattUuidsService.cs b/...ity/BluetoothLEHelper/GattUuidsService.cs → ...ity/BluetoothLEHelper/GattUuidsService.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Helper class used when working with UUIDs

diff --git a/...thLEHelper/ObservableBluetoothLEDevice.cs → ...thLEHelper/ObservableBluetoothLEDevice.cs b/...thLEHelper/ObservableBluetoothLEDevice.cs → ...thLEHelper/ObservableBluetoothLEDevice.cs
@@ -11,19 +11,19 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Devices.Bluetooth;
 using Windows.Devices.Bluetooth.GenericAttributeProfile;
 using Windows.Devices.Enumeration;
-using Windows.System;
-using Windows.UI.Xaml.Media.Imaging;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Wrapper around <see cref="BluetoothLEDevice" /> to make it bindable.
     /// </summary>
-    /// <seealso cref="System.ComponentModel.INotifyPropertyChanged" />
-    /// <seealso cref="System.IEquatable{ObservableBluetoothLEDevice}" />
+    /// <seealso cref="global::System.ComponentModel.INotifyPropertyChanged" />
+    /// <seealso cref="global::System.IEquatable{ObservableBluetoothLEDevice}" />
     public class ObservableBluetoothLEDevice : INotifyPropertyChanged, IEquatable<ObservableBluetoothLEDevice>
     {
         /// <summary>

diff --git a/...LEHelper/ObservableGattCharacteristics.cs → ...LEHelper/ObservableGattCharacteristics.cs b/...LEHelper/ObservableGattCharacteristics.cs → ...LEHelper/ObservableGattCharacteristics.cs
@@ -7,13 +7,13 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using Microsoft.UI.Dispatching;
 using Windows.Devices.Bluetooth;
 using Windows.Devices.Bluetooth.GenericAttributeProfile;
 using Windows.Security.Cryptography;
 using Windows.Storage.Streams;
-using Windows.System;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Wrapper around <see cref="GattCharacteristic"/>  to make it easier to use

diff --git a/...thLEHelper/ObservableGattDeviceService.cs → ...thLEHelper/ObservableGattDeviceService.cs b/...thLEHelper/ObservableGattDeviceService.cs → ...thLEHelper/ObservableGattDeviceService.cs
@@ -11,7 +11,7 @@
 using Windows.Devices.Bluetooth;
 using Windows.Devices.Bluetooth.GenericAttributeProfile;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Wrapper around <see cref="GattDeviceService" /> to make it easier to use

diff --git a/...Microsoft.Toolkit.Uwp.Connectivity.csproj → ...ommunityToolkit.WinUI.Connectivity.csproj b/...Microsoft.Toolkit.Uwp.Connectivity.csproj → ...ommunityToolkit.WinUI.Connectivity.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
+    <ProjectReference Include="..\CommunityToolkit.WinUI\CommunityToolkit.WinUI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ectivity/Network/ConnectionInformation.cs → ...ectivity/Network/ConnectionInformation.cs b/...ectivity/Network/ConnectionInformation.cs → ...ectivity/Network/ConnectionInformation.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Windows.Networking.Connectivity;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// This class exposes information about the network connectivity.

diff --git a/...wp.Connectivity/Network/ConnectionType.cs → ...UI.Connectivity/Network/ConnectionType.cs b/...wp.Connectivity/Network/ConnectionType.cs → ...UI.Connectivity/Network/ConnectionType.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// Enumeration denoting connection type.

diff --git a/...Uwp.Connectivity/Network/NetworkHelper.cs → ...nUI.Connectivity/Network/NetworkHelper.cs b/...Uwp.Connectivity/Network/NetworkHelper.cs → ...nUI.Connectivity/Network/NetworkHelper.cs
@@ -5,7 +5,7 @@
 using System;
 using Windows.Networking.Connectivity;
 
-namespace Microsoft.Toolkit.Uwp.Connectivity
+namespace CommunityToolkit.WinUI.Connectivity
 {
     /// <summary>
     /// This class exposes functionality of NetworkInformation through a singleton.

diff --git a/...loperTools/AlignmentGrid/AlignmentGrid.cs → ...loperTools/AlignmentGrid/AlignmentGrid.cs b/...loperTools/AlignmentGrid/AlignmentGrid.cs → ...loperTools/AlignmentGrid/AlignmentGrid.cs
@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Shapes;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Shapes;
 
-namespace Microsoft.Toolkit.Uwp.DeveloperTools
+namespace CommunityToolkit.WinUI.DeveloperTools
 {
     /// <summary>
     /// AlignmentGrid is used to display a grid to help aligning controls

diff --git a/...crosoft.Toolkit.Uwp.DeveloperTools.csproj → ...munityToolkit.WinUI.DeveloperTools.csproj b/...crosoft.Toolkit.Uwp.DeveloperTools.csproj → ...munityToolkit.WinUI.DeveloperTools.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/...veloperTools/FocusTracker/FocusTracker.cs → ...veloperTools/FocusTracker/FocusTracker.cs b/...veloperTools/FocusTracker/FocusTracker.cs → ...veloperTools/FocusTracker/FocusTracker.cs
@@ -7,16 +7,16 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Windows.System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Automation;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Shapes;
-
-namespace Microsoft.Toolkit.Uwp.DeveloperTools
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Shapes;
+
+namespace CommunityToolkit.WinUI.DeveloperTools
 {
     /// <summary>
     /// FocusTracker can be used to display information about the current focused XAML element.
@@ -83,7 +83,7 @@ protected override void OnApplyTemplate()
         private void Start()
         {
             // Get currently focused control once when we start
-            if (Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot") && XamlRoot != null)
+            if (XamlRoot != null)
             {
                 FocusOnControl(FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement);
             }

diff --git a/...loperTools/FocusTracker/FocusTracker.xaml → ...loperTools/FocusTracker/FocusTracker.xaml b/...loperTools/FocusTracker/FocusTracker.xaml → ...loperTools/FocusTracker/FocusTracker.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:developerTools="using:Microsoft.Toolkit.Uwp.DeveloperTools">
+                    xmlns:developerTools="using:CommunityToolkit.WinUI.DeveloperTools">
 
     <Style TargetType="developerTools:FocusTracker">
         <Setter Property="IsTabStop" Value="False"></Setter>

diff --git a/...it.Uwp.DeveloperTools/Themes/Generic.xaml → ....WinUI.DeveloperTools/Themes/Generic.xaml b/...it.Uwp.DeveloperTools/Themes/Generic.xaml → ....WinUI.DeveloperTools/Themes/Generic.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.xaml" />
+        <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/CommunityToolkit.WinUI.DeveloperTools/VisualStudioToolsManifest.xml b/CommunityToolkit.WinUI.DeveloperTools/VisualStudioToolsManifest.xml
@@ -0,0 +1,10 @@
+<FileList>
+  <File Reference="CommunityToolkit.WinUI.DeveloperTools.dll">
+    <ToolboxItems UIFramework="UAP"
+        VSCategory="Windows Community Toolkit"
+        BlendCategory="Windows Community Toolkit">
+      <Item Type="CommunityToolkit.WinUI.DeveloperTools.AlignmentGrid" />
+      <Item Type="CommunityToolkit.WinUI.DeveloperTools.FocusTracker" />
+    </ToolboxItems>
+  </File>
+</FileList>
diff --git a/...Interaction/ComboBoxItemGazeTargetItem.cs → ...Interaction/ComboBoxItemGazeTargetItem.cs b/...Interaction/ComboBoxItemGazeTargetItem.cs → ...Interaction/ComboBoxItemGazeTargetItem.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Automation.Peers;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.UI.Xaml.Controls;
 
-namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
+namespace CommunityToolkit.WinUI.Input.GazeInteraction
 {
     internal class ComboBoxItemGazeTargetItem : GazeTargetItem
     {

diff --git a/....Toolkit.Uwp.Input.GazeInteraction.csproj → ...oolkit.WinUI.Input.GazeInteraction.csproj b/....Toolkit.Uwp.Input.GazeInteraction.csproj → ...oolkit.WinUI.Input.GazeInteraction.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.17134</TargetFrameworks>
-    <RootNamespace>Microsoft.Toolkit.Uwp.Input</RootNamespace>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
+    <RootNamespace>CommunityToolkit.WinUI.Input</RootNamespace>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <PropertyGroup>