diff --git a/.gitignore b/.gitignore index e1269ff7fd7..9ef2fdcd8fc 100644 --- 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 \ No newline at end of file diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj similarity index 92% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj index b72dca46f0c..f60280d4c17 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj +++ b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj @@ -54,7 +54,7 @@ 10.0.17763.0 en-US false - ..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj + ..\CommunityToolkit.Win32.WpfCore.SampleApp\CommunityToolkit.Win32.WpfCore.SampleApp.csproj @@ -71,7 +71,7 @@ - + True diff --git a/GazeInputTest/Assets/LockScreenLogo.scale-200.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/LockScreenLogo.scale-200.png similarity index 100% rename from GazeInputTest/Assets/LockScreenLogo.scale-200.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/LockScreenLogo.scale-200.png diff --git a/GazeInputTest/Assets/SplashScreen.scale-200.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/SplashScreen.scale-200.png similarity index 100% rename from GazeInputTest/Assets/SplashScreen.scale-200.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/SplashScreen.scale-200.png diff --git a/GazeInputTest/Assets/Square150x150Logo.scale-200.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square150x150Logo.scale-200.png similarity index 100% rename from GazeInputTest/Assets/Square150x150Logo.scale-200.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square150x150Logo.scale-200.png diff --git a/GazeInputTest/Assets/Square44x44Logo.scale-200.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.scale-200.png similarity index 100% rename from GazeInputTest/Assets/Square44x44Logo.scale-200.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.scale-200.png diff --git a/GazeInputTest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from GazeInputTest/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/GazeInputTest/Assets/StoreLogo.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/StoreLogo.png similarity index 100% rename from GazeInputTest/Assets/StoreLogo.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/StoreLogo.png diff --git a/GazeInputTest/Assets/Wide310x150Logo.scale-200.png b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Wide310x150Logo.scale-200.png similarity index 100% rename from GazeInputTest/Assets/Wide310x150Logo.scale-200.png rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Wide310x150Logo.scale-200.png diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest similarity index 83% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest rename to CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest index fcf847b0e91..1aa4b0911f2 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest +++ b/CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest @@ -12,7 +12,7 @@ Version="1.0.0.0" /> - Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject + CommunityToolkit.Win32.WpfCore.SampleApp.PackagingProject aleader Images\StoreLogo.png @@ -31,8 +31,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -45,7 +45,7 @@ - + diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml similarity index 58% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml rename to CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml index 430717fd507..f437ee58b4a 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml @@ -1,8 +1,7 @@ - + xmlns:local="clr-namespace:CommunityToolkit.Win32.WpfCore.SampleApp"> - \ No newline at end of file diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml.cs similarity index 98% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs rename to CommunityToolkit.Win32.WpfCore.SampleApp/App.xaml.cs index 10876e99090..2c2f1fdd395 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs +++ b/CommunityToolkit.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 { /// /// Interaction logic for App.xaml diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs similarity index 100% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs rename to CommunityToolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/CommunityToolkit.Win32.WpfCore.SampleApp/CommunityToolkit.Win32.WpfCore.SampleApp.csproj similarity index 77% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj rename to CommunityToolkit.Win32.WpfCore.SampleApp/CommunityToolkit.Win32.WpfCore.SampleApp.csproj index 4a6de004eaf..59caaed02c5 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/CommunityToolkit.Win32.WpfCore.SampleApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml similarity index 93% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml rename to CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml index 62369e876d7..3c307623922 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml +++ b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs similarity index 98% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs rename to CommunityToolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs index 98102dc930a..eb35bd11e13 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs +++ b/CommunityToolkit.Win32.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 { /// /// Interaction logic for MainWindow.xaml diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs b/CommunityToolkit.Win32.WpfCore.SampleApp/MyToastActions.cs similarity index 92% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs rename to CommunityToolkit.Win32.WpfCore.SampleApp/MyToastActions.cs index d9ded034dd7..2b57e81e7f7 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs +++ b/CommunityToolkit.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/Microsoft.Toolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico b/CommunityToolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico similarity index 100% rename from Microsoft.Toolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico rename to CommunityToolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico diff --git a/Microsoft.Toolkit.Win32/ReadMe.md b/CommunityToolkit.Win32/ReadMe.md similarity index 100% rename from Microsoft.Toolkit.Win32/ReadMe.md rename to CommunityToolkit.Win32/ReadMe.md diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs index c4d953f95d8..e5e49d725bc 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs +++ b/CommunityToolkit.WinUI.Connectivity/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 { /// /// Context for the entire app. This is where all app wide variables are stored diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattConvert.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattConvert.cs similarity index 98% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattConvert.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattConvert.cs index 658c4b22209..0d1c8eac2c3 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattConvert.cs +++ b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattConvert.cs @@ -7,7 +7,7 @@ using Windows.Security.Cryptography; using Windows.Storage.Streams; -namespace Microsoft.Toolkit.Uwp.Connectivity +namespace CommunityToolkit.WinUI.Connectivity { /// /// Extension methods for Gatt Convert. diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattNativeUuid.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattNativeUuid.cs index c651696d7bc..1ea0164a8d3 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs +++ b/CommunityToolkit.WinUI.Connectivity/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 { /// /// This enum assists in finding a string representation of a BT SIG assigned value for UUIDS diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattProtocolErrorParser.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattProtocolErrorParser.cs similarity index 98% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattProtocolErrorParser.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattProtocolErrorParser.cs index aa76899f352..3995e6d6cec 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattProtocolErrorParser.cs +++ b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattProtocolErrorParser.cs @@ -4,7 +4,7 @@ using Windows.Devices.Bluetooth.GenericAttributeProfile; -namespace Microsoft.Toolkit.Uwp.Connectivity +namespace CommunityToolkit.WinUI.Connectivity { /// /// Helper function when working with diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattUuidsService.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattUuidsService.cs similarity index 96% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattUuidsService.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattUuidsService.cs index d6978b8f448..8169945e048 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattUuidsService.cs +++ b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/GattUuidsService.cs @@ -4,7 +4,7 @@ using System; -namespace Microsoft.Toolkit.Uwp.Connectivity +namespace CommunityToolkit.WinUI.Connectivity { /// /// Helper class used when working with UUIDs diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs similarity index 98% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs index c2c3f1ba2d7..e036c8f81c4 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs +++ b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/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 { /// /// Wrapper around to make it bindable. /// - /// - /// + /// + /// public class ObservableBluetoothLEDevice : INotifyPropertyChanged, IEquatable { /// diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs index 16b3c929ad9..be2aa0aa346 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs +++ b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/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 { /// /// Wrapper around to make it easier to use diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs rename to CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs index 7ddd6543090..ed1a1700381 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs +++ b/CommunityToolkit.WinUI.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs @@ -11,7 +11,7 @@ using Windows.Devices.Bluetooth; using Windows.Devices.Bluetooth.GenericAttributeProfile; -namespace Microsoft.Toolkit.Uwp.Connectivity +namespace CommunityToolkit.WinUI.Connectivity { /// /// Wrapper around to make it easier to use diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/CommunityToolkit.WinUI.Connectivity/CommunityToolkit.WinUI.Connectivity.csproj similarity index 70% rename from Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj rename to CommunityToolkit.WinUI.Connectivity/CommunityToolkit.WinUI.Connectivity.csproj index 4cd3b1c28d4..7597a6eb675 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj +++ b/CommunityToolkit.WinUI.Connectivity/CommunityToolkit.WinUI.Connectivity.csproj @@ -1,7 +1,7 @@ - + - uap10.0.17763 + net5.0-windows10.0.18362.0 @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Network/ConnectionInformation.cs b/CommunityToolkit.WinUI.Connectivity/Network/ConnectionInformation.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.Connectivity/Network/ConnectionInformation.cs rename to CommunityToolkit.WinUI.Connectivity/Network/ConnectionInformation.cs index 2e89c465442..c0840e45ca3 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Network/ConnectionInformation.cs +++ b/CommunityToolkit.WinUI.Connectivity/Network/ConnectionInformation.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Windows.Networking.Connectivity; -namespace Microsoft.Toolkit.Uwp.Connectivity +namespace CommunityToolkit.WinUI.Connectivity { /// /// This class exposes information about the network connectivity. diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Network/ConnectionType.cs b/CommunityToolkit.WinUI.Connectivity/Network/ConnectionType.cs similarity index 94% rename from Microsoft.Toolkit.Uwp.Connectivity/Network/ConnectionType.cs rename to CommunityToolkit.WinUI.Connectivity/Network/ConnectionType.cs index 39a39aadde2..7be15f59f89 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Network/ConnectionType.cs +++ b/CommunityToolkit.WinUI.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 { /// /// Enumeration denoting connection type. diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Network/NetworkHelper.cs b/CommunityToolkit.WinUI.Connectivity/Network/NetworkHelper.cs similarity index 98% rename from Microsoft.Toolkit.Uwp.Connectivity/Network/NetworkHelper.cs rename to CommunityToolkit.WinUI.Connectivity/Network/NetworkHelper.cs index 42f4ca1c0e8..2d092786e6a 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Network/NetworkHelper.cs +++ b/CommunityToolkit.WinUI.Connectivity/Network/NetworkHelper.cs @@ -5,7 +5,7 @@ using System; using Windows.Networking.Connectivity; -namespace Microsoft.Toolkit.Uwp.Connectivity +namespace CommunityToolkit.WinUI.Connectivity { /// /// This class exposes functionality of NetworkInformation through a singleton. diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs b/CommunityToolkit.WinUI.DeveloperTools/AlignmentGrid/AlignmentGrid.cs similarity index 96% rename from Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs rename to CommunityToolkit.WinUI.DeveloperTools/AlignmentGrid/AlignmentGrid.cs index 2bd15eec6d4..3149dfc4d93 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/AlignmentGrid/AlignmentGrid.cs +++ b/CommunityToolkit.WinUI.DeveloperTools/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 { /// /// AlignmentGrid is used to display a grid to help aligning controls diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/CommunityToolkit.WinUI.DeveloperTools/CommunityToolkit.WinUI.DeveloperTools.csproj similarity index 89% rename from Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj rename to CommunityToolkit.WinUI.DeveloperTools/CommunityToolkit.WinUI.DeveloperTools.csproj index c5d5838785f..215aa80e50c 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj +++ b/CommunityToolkit.WinUI.DeveloperTools/CommunityToolkit.WinUI.DeveloperTools.csproj @@ -1,7 +1,7 @@ - + - uap10.0.17763 + net5.0-windows10.0.18362.0 diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs b/CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.cs similarity index 92% rename from Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs rename to CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.cs index 29f36a3e197..0c53fc69752 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs +++ b/CommunityToolkit.WinUI.DeveloperTools/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 { /// /// 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/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.xaml b/CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.xaml similarity index 97% rename from Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.xaml rename to CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.xaml index 5eaa0f345b8..85c53b9cf1d 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.xaml +++ b/CommunityToolkit.WinUI.DeveloperTools/FocusTracker/FocusTracker.xaml @@ -1,6 +1,6 @@ + xmlns:developerTools="using:CommunityToolkit.WinUI.DeveloperTools"> - - - - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +