diff --git a/CommunityToolkit.Labs.Uwp.GazeControls/CommunityToolkit.Labs.Uwp.GazeControls.csproj b/CommunityToolkit.Labs.Uwp.GazeControls/CommunityToolkit.Labs.Uwp.GazeControls.csproj index 6601ac6..dd66ea5 100644 --- a/CommunityToolkit.Labs.Uwp.GazeControls/CommunityToolkit.Labs.Uwp.GazeControls.csproj +++ b/CommunityToolkit.Labs.Uwp.GazeControls/CommunityToolkit.Labs.Uwp.GazeControls.csproj @@ -5,8 +5,17 @@ Windows Community Toolkit Gaze Controls Library A library controls optimized for gaze interaction Windows;Community;Toolkit;WCT;UWP;Gaze;Eye;Tracker;EyeTracker + true + + + Designer + MSBuild:Compile + PreserveNewest + + + PreserveNewest diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..3d05efc --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,24 @@ + + + + $(MSBuildThisFileDirectory) + + + + + + 10.0.19041.0 + 10.0.17763.0 + false + uap10.0.17763 + + + + Embedded + bin\Package + .pdb + true + true + + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..678ca6c --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,20 @@ + + + + + + + + + $(CommonTags);UWP + $(CommonTags);$(PackageTags) + $(CommonTags) + + + + + + + + + \ No newline at end of file diff --git a/GazeControls.sln b/GazeControls.sln index 5d2f6c4..98e673f 100644 --- a/GazeControls.sln +++ b/GazeControls.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.31424.327 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Uwp.GazeControls", "CommunityToolkit.Labs.Uwp.GazeControls\CommunityToolkit.Labs.Uwp.GazeControls.csproj", "{352191F5-8704-45A1-ACB3-CA47C6898A99}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputTest\GazeInputTest.csproj", "{6708804D-52D7-4F38-A20A-816EC74BC59A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,32 +41,34 @@ Global {352191F5-8704-45A1-ACB3-CA47C6898A99}.Release|x64.Build.0 = Release|Any CPU {352191F5-8704-45A1-ACB3-CA47C6898A99}.Release|x86.ActiveCfg = Release|Any CPU {352191F5-8704-45A1-ACB3-CA47C6898A99}.Release|x86.Build.0 = Release|Any CPU - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|Any CPU.ActiveCfg = Debug|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.ActiveCfg = Debug|ARM - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Build.0 = Debug|ARM - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM.Deploy.0 = Debug|ARM - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM64.Build.0 = Debug|ARM64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x64.ActiveCfg = Debug|x64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x64.Build.0 = Debug|x64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x64.Deploy.0 = Debug|x64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.ActiveCfg = Debug|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Build.0 = Debug|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Debug|x86.Deploy.0 = Debug|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|Any CPU.ActiveCfg = Release|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.ActiveCfg = Release|ARM - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Build.0 = Release|ARM - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM.Deploy.0 = Release|ARM - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM64.ActiveCfg = Release|ARM64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM64.Build.0 = Release|ARM64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|ARM64.Deploy.0 = Release|ARM64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|x64.ActiveCfg = Release|x64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|x64.Build.0 = Release|x64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|x64.Deploy.0 = Release|x64 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|x86.ActiveCfg = Release|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|x86.Build.0 = Release|x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6}.Release|x86.Deploy.0 = Release|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|Any CPU.ActiveCfg = Debug|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|Any CPU.Build.0 = Debug|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|Any CPU.Deploy.0 = Debug|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|ARM.ActiveCfg = Debug|ARM + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|ARM.Build.0 = Debug|ARM + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|ARM.Deploy.0 = Debug|ARM + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|ARM64.Build.0 = Debug|ARM64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|x64.ActiveCfg = Debug|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|x64.Build.0 = Debug|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|x64.Deploy.0 = Debug|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|x86.ActiveCfg = Debug|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|x86.Build.0 = Debug|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Debug|x86.Deploy.0 = Debug|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|Any CPU.ActiveCfg = Release|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|ARM.ActiveCfg = Release|ARM + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|ARM.Build.0 = Release|ARM + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|ARM.Deploy.0 = Release|ARM + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|ARM64.ActiveCfg = Release|ARM64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|ARM64.Build.0 = Release|ARM64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|ARM64.Deploy.0 = Release|ARM64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|x64.ActiveCfg = Release|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|x64.Build.0 = Release|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|x64.Deploy.0 = Release|x64 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|x86.ActiveCfg = Release|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|x86.Build.0 = Release|x86 + {6708804D-52D7-4F38-A20A-816EC74BC59A}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index 353f29f..9d80476 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -3,7 +3,7 @@ Debug x86 - {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6} + {6708804D-52D7-4F38-A20A-816EC74BC59A} AppContainerExe Properties GazeInputTest @@ -144,15 +144,14 @@ 6.2.12 + + 7.0.2 + - - {fa4682b6-26be-49a0-be97-96956724ae55} - Microsoft.Toolkit.Uwp.Input.GazeControls - - - {5bf75694-798a-43a0-8150-415de195359c} - Microsoft.Toolkit.Uwp.Input.GazeInteraction + + {352191f5-8704-45a1-acb3-ca47c6898a99} + CommunityToolkit.Labs.Uwp.GazeControls diff --git a/GazeInputTest/MainPage.xaml b/GazeInputTest/MainPage.xaml index de09244..bacb5cb 100644 --- a/GazeInputTest/MainPage.xaml +++ b/GazeInputTest/MainPage.xaml @@ -6,7 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:g="using:Microsoft.Toolkit.Uwp.Input.GazeInteraction" - xmlns:k="using:Microsoft.Toolkit.Uwp.Input.GazeControls" + xmlns:k="using:CommunityToolkit.Labs.Uwp.GazeControls" g:GazeInput.Interaction="Enabled" mc:Ignorable="d"> diff --git a/GazeInputTest/MainPage.xaml.cs b/GazeInputTest/MainPage.xaml.cs index afd7649..911087d 100644 --- a/GazeInputTest/MainPage.xaml.cs +++ b/GazeInputTest/MainPage.xaml.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using Microsoft.Toolkit.Uwp.Input.GazeControls; +using CommunityToolkit.Labs.Uwp.GazeControls; using Microsoft.Toolkit.Uwp.Input.GazeInteraction; using Windows.ApplicationModel.Core; using Windows.Media.SpeechSynthesis; @@ -41,7 +41,7 @@ namespace GazeInputTest private async void OnMainPageLoaded(object sender, RoutedEventArgs e) { - var uri = new Uri($"ms-appx:///Microsoft.Toolkit.Uwp.Input.GazeControls/KeyboardLayouts/MinAAC.xaml"); + var uri = new Uri($"ms-appx:///CommunityToolkit.Labs.Uwp.GazeControls/KeyboardLayouts/MinAAC.xaml"); var layoutFile = await StorageFile.GetFileFromApplicationUriAsync(uri); _layoutsFolder = await layoutFile.GetParentAsync(); await GazeKeyboard.TryLoadLayoutAsync(layoutFile); diff --git a/Windows.Toolkit.Common.props b/Windows.Toolkit.Common.props new file mode 100644 index 0000000..1341be3 --- /dev/null +++ b/Windows.Toolkit.Common.props @@ -0,0 +1,31 @@ + + + + .NET Foundation + Microsoft.Toolkit + Community Toolkit Labs + Windows;Community;Toolkit;WCT + MIT + true + (c) .NET Foundation and Contributors. All rights reserved. + https://github.com/CommunityToolkit/Labs-GazeControls + https://github.com/CommunityToolkit/Labs-GazeControls/releases + Icon.png + https://raw.githubusercontent.com/CommunityToolkit/Labs-GazeControls/main/nuget.png + + + + Strict + Disable + Latest + en-US + true + + + + true + true + true + + + \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 0000000..78420ce --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "msbuild-sdks": + { + "MSBuild.Sdk.Extras":"3.0.23" + } + } \ No newline at end of file diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..80409fe --- /dev/null +++ b/nuget.config @@ -0,0 +1,11 @@ + + + + + + + + + + +