From e471c4539b023a286953cc83e2c56e1a452a30ac Mon Sep 17 00:00:00 2001 From: Matt Lacey Date: Tue, 5 Apr 2022 19:11:00 +0100 Subject: [PATCH] Add unit tests (#61) * Add unit tests For #48 * Update Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com> * Standardize casing of directory names * shorten "Labs.WinUI.CanvasLayout.Tests" to "CanvasLayout.Tests" * Shorten experiment test project name * removed duplicated default Windows app assets * Remove non-essential assets from test projects * Share Asset files in the test host projects * test projects to use common/shared asset files * standardize XAML formatting * Do not set passive flag if not running xstyler passively * remove experiment specific sample heads from "All" solution and remove folder as will only eve have a single item in it. * remove unneeded experiment head project from WASM solution * update test related package dependencies Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- ...it.Labs.Core.SourceGenerators.Tests.csproj | 4 +- Common/Labs.SampleRefs.props | 4 +- Labs/CanvasLayout/CanvasLayout.sln | 130 ++++-- .../CanvasLayout.Sample.csproj | 2 +- .../SampleOne/SamplePage.xaml | 0 .../SampleOne/SamplePage.xaml.cs | 0 .../SampleThree/SamplePage3.xaml | 0 .../SampleThree/SamplePage3.xaml.cs | 0 .../SampleTwo/SamplePage2.xaml | 0 .../SampleTwo/SamplePage2.xaml.cs | 0 .../SampleTwo/SamplePageOptions.xaml | 0 .../SampleTwo/SamplePageOptions.xaml.cs | 0 .../CanvasLayout.Uwp/CanvasLayout.Uwp.csproj | 2 +- .../CanvasLayout.Uwp/Package.appxmanifest | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Default.rd.xml | 0 .../CanvasLayout.Wasm.csproj | 2 +- .../CanvasLayout.Wasm/Program.cs | 0 .../Properties/launchSettings.json | 0 .../CanvasLayout.Wasm/WasmCSS/Fonts.css | 0 .../WasmScripts/AppManifest.js | 0 .../CanvasLayout.Wasm/wwwroot/web.config | 0 .../CanvasLayout.WinAppSdk.csproj | 2 +- .../Package.appxmanifest | 0 .../Properties/launchSettings.json | 0 .../CanvasLayout.WinAppSdk/app.manifest | 0 .../CanvasLayout/{src => Src}/CanvasLayout.cs | 0 ...nityToolkit.Labs.WinUI.CanvasLayout.csproj | 0 .../CanvasLayout.Tests.projitems | 14 + .../CanvasLayout.Tests.shproj | 13 + .../ExampleCanvasLayoutTestClass.cs | 17 + .../CanvasLayout.UnitTests.Uwp.csproj | 179 ++++++++ .../Package.appxmanifest | 45 ++ .../Properties/AssemblyInfo.cs | 18 + .../Properties/Default.rd.xml | 29 ++ .../UnitTestApp.xaml | 4 + .../UnitTestApp.xaml.cs | 100 ++++ .../CanvasLayout.UnitTests.WinAppSdk/App.xaml | 14 + .../App.xaml.cs | 60 +++ .../CanvasLayout.UnitTests.WinAppSdk.csproj | 57 +++ .../MainWindow.xaml | 14 + .../MainWindow.xaml.cs | 31 ++ .../Package.appxmanifest | 47 ++ .../Properties/launchSettings.json | 10 + .../app.manifest | 15 + ...CommunityToolkit.Labs.UnitTests.Uwp.csproj | 179 ++++++++ .../Package.appxmanifest | 46 ++ .../Properties/AssemblyInfo.cs | 18 + .../Properties/Default.rd.xml | 29 ++ .../UnitTestApp.xaml | 4 + .../UnitTestApp.xaml.cs | 100 ++++ .../App.xaml | 14 + .../App.xaml.cs | 60 +++ ...ityToolkit.Labs.UnitTests.WinAppSdk.csproj | 60 +++ .../MainWindow.xaml | 14 + .../MainWindow.xaml.cs | 31 ++ .../Package.appxmanifest | 48 ++ .../Properties/launchSettings.json | 10 + .../app.manifest | 15 + Toolkit.Labs.All.sln | 427 ++++++++---------- Toolkit.Labs.Wasm.sln | 32 +- 62 files changed, 1598 insertions(+), 304 deletions(-) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/CanvasLayout.Sample.csproj (95%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleOne/SamplePage.xaml (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleThree/SamplePage3.xaml (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj (94%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Uwp/Package.appxmanifest (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Uwp/Properties/AssemblyInfo.cs (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Uwp/Properties/Default.rd.xml (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj (87%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Wasm/Program.cs (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Wasm/Properties/launchSettings.json (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Wasm/WasmCSS/Fonts.css (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Wasm/WasmScripts/AppManifest.js (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.Wasm/wwwroot/web.config (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj (93%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.WinAppSdk/Package.appxmanifest (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.WinAppSdk/Properties/launchSettings.json (100%) rename Labs/CanvasLayout/{samples => Samples}/CanvasLayout.WinAppSdk/app.manifest (100%) rename Labs/CanvasLayout/{src => Src}/CanvasLayout.cs (100%) rename Labs/CanvasLayout/{src => Src}/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj (100%) create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Package.appxmanifest create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/AssemblyInfo.cs create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/Default.rd.xml create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml.cs create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml.cs create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Package.appxmanifest create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Properties/launchSettings.json create mode 100644 Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/app.manifest create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.Uwp/Package.appxmanifest create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/AssemblyInfo.cs create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/Default.rd.xml create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml.cs create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml.cs create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Package.appxmanifest create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Properties/launchSettings.json create mode 100644 Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/app.manifest diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23f53f59..369de577 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,7 @@ jobs: # Build All Packages - TODO: Detect experiments - name: pack CanvasLayout - working-directory: ./Labs/CanvasLayout/src + working-directory: ./Labs/CanvasLayout/Src run: msbuild -t:pack /p:Configuration=Release /p:DebugType=Portable # Push Packages to our DevOps Artifacts Feed diff --git a/Common/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests.csproj b/Common/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests.csproj index a28d7077..4b590744 100644 --- a/Common/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests.csproj +++ b/Common/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/Common/Labs.SampleRefs.props b/Common/Labs.SampleRefs.props index 5a6fcad8..737dfbe7 100644 --- a/Common/Labs.SampleRefs.props +++ b/Common/Labs.SampleRefs.props @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/Labs/CanvasLayout/CanvasLayout.sln b/Labs/CanvasLayout/CanvasLayout.sln index b59e3957..23a6daa4 100644 --- a/Labs/CanvasLayout/CanvasLayout.sln +++ b/Labs/CanvasLayout/CanvasLayout.sln @@ -5,21 +5,34 @@ VisualStudioVersion = 17.0.31919.166 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.WinUI.CanvasLayout", "src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj", "{1C029CC0-BB45-45FF-AD34-086EC4840DB0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CanvasLayout.Uwp", "samples\CanvasLayout.Uwp\CanvasLayout.Uwp.csproj", "{3BAAC2DA-7124-460E-A9A9-13138843CD57}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CanvasLayout.Uwp", "Samples\CanvasLayout.Uwp\CanvasLayout.Uwp.csproj", "{3BAAC2DA-7124-460E-A9A9-13138843CD57}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Wasm", "samples\CanvasLayout.Wasm\CanvasLayout.Wasm.csproj", "{6DC6B31C-D03C-4E53-A1A5-CAF51227440B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Wasm", "Samples\CanvasLayout.Wasm\CanvasLayout.Wasm.csproj", "{6DC6B31C-D03C-4E53-A1A5-CAF51227440B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Sample", "samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj", "{E648080E-263D-4920-9B3D-2F6BF541586C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core", "..\..\Common\CommunityToolkit.Labs.Core\CommunityToolkit.Labs.Core.csproj", "{21128E83-CA73-49E2-B8DA-552B9CE81A25}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Sample", "Samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj", "{E648080E-263D-4920-9B3D-2F6BF541586C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{E6AFDCD6-F59A-4EC4-BCA7-1E47A5A15751}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.WinAppSdk", "samples\CanvasLayout.WinAppSdk\CanvasLayout.WinAppSdk.csproj", "{70DF1194-D158-473E-B350-F630231FB328}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.WinAppSdk", "Samples\CanvasLayout.WinAppSdk\CanvasLayout.WinAppSdk.csproj", "{70DF1194-D158-473E-B350-F630231FB328}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{69AFC3EC-DC11-4031-8624-0E9F942D19C3}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CanvasLayout.Tests", "Tests\CanvasLayout.Tests\CanvasLayout.Tests.shproj", "{2C7A065B-9349-4071-AF95-E88F320A09A9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.UnitTests.WinAppSdk", "Tests\CanvasLayout.UnitTests.WinAppSdk\CanvasLayout.UnitTests.WinAppSdk.csproj", "{DD3E4652-114A-4614-8904-1DBCE62589CC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CanvasLayout.UnitTests.Uwp", "Tests\CanvasLayout.UnitTests.Uwp\CanvasLayout.UnitTests.Uwp.csproj", "{F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Labs Dependencies", "Labs Dependencies", "{EC5804D7-C94B-4CF8-8344-132F2A58F88E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core", "..\..\Common\CommunityToolkit.Labs.Core\CommunityToolkit.Labs.Core.csproj", "{1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + Tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{2c7a065b-9349-4071-af95-e88f320a09a9}*SharedItemsImports = 13 ..\..\Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{3baac2da-7124-460e-a9a9-13138843cd57}*SharedItemsImports = 4 + Tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{dd3e4652-114a-4614-8904-1dbce62589cc}*SharedItemsImports = 5 + Tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{f17ee40d-cee8-402f-aa43-45a7f87acbf3}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -124,26 +137,6 @@ Global {E648080E-263D-4920-9B3D-2F6BF541586C}.Release|x64.Build.0 = Release|Any CPU {E648080E-263D-4920-9B3D-2F6BF541586C}.Release|x86.ActiveCfg = Release|Any CPU {E648080E-263D-4920-9B3D-2F6BF541586C}.Release|x86.Build.0 = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|ARM.ActiveCfg = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|ARM.Build.0 = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|ARM64.Build.0 = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|x64.ActiveCfg = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|x64.Build.0 = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|x86.ActiveCfg = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Debug|x86.Build.0 = Debug|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|Any CPU.Build.0 = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|ARM.ActiveCfg = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|ARM.Build.0 = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|ARM64.ActiveCfg = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|ARM64.Build.0 = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|x64.ActiveCfg = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|x64.Build.0 = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|x86.ActiveCfg = Release|Any CPU - {21128E83-CA73-49E2-B8DA-552B9CE81A25}.Release|x86.Build.0 = Release|Any CPU {70DF1194-D158-473E-B350-F630231FB328}.Debug|Any CPU.ActiveCfg = Debug|x64 {70DF1194-D158-473E-B350-F630231FB328}.Debug|Any CPU.Build.0 = Debug|x64 {70DF1194-D158-473E-B350-F630231FB328}.Debug|Any CPU.Deploy.0 = Debug|x64 @@ -174,6 +167,86 @@ Global {70DF1194-D158-473E-B350-F630231FB328}.Release|x86.ActiveCfg = Release|x86 {70DF1194-D158-473E-B350-F630231FB328}.Release|x86.Build.0 = Release|x86 {70DF1194-D158-473E-B350-F630231FB328}.Release|x86.Deploy.0 = Release|x86 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|Any CPU.ActiveCfg = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|Any CPU.Build.0 = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|Any CPU.Deploy.0 = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|ARM.ActiveCfg = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|ARM.Build.0 = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|ARM.Deploy.0 = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|ARM64.ActiveCfg = Debug|arm64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|ARM64.Build.0 = Debug|arm64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|ARM64.Deploy.0 = Debug|arm64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|x64.ActiveCfg = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|x64.Build.0 = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|x64.Deploy.0 = Debug|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|x86.ActiveCfg = Debug|x86 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|x86.Build.0 = Debug|x86 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Debug|x86.Deploy.0 = Debug|x86 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|Any CPU.ActiveCfg = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|Any CPU.Build.0 = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|Any CPU.Deploy.0 = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|ARM.ActiveCfg = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|ARM.Build.0 = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|ARM.Deploy.0 = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|ARM64.ActiveCfg = Release|arm64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|ARM64.Build.0 = Release|arm64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|ARM64.Deploy.0 = Release|arm64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|x64.ActiveCfg = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|x64.Build.0 = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|x64.Deploy.0 = Release|x64 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|x86.ActiveCfg = Release|x86 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|x86.Build.0 = Release|x86 + {DD3E4652-114A-4614-8904-1DBCE62589CC}.Release|x86.Deploy.0 = Release|x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|Any CPU.ActiveCfg = Debug|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|Any CPU.Build.0 = Debug|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|Any CPU.Deploy.0 = Debug|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|ARM.ActiveCfg = Debug|ARM + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|ARM.Build.0 = Debug|ARM + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|ARM.Deploy.0 = Debug|ARM + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|ARM64.Build.0 = Debug|ARM64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|x64.ActiveCfg = Debug|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|x64.Build.0 = Debug|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|x64.Deploy.0 = Debug|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|x86.ActiveCfg = Debug|x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|x86.Build.0 = Debug|x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Debug|x86.Deploy.0 = Debug|x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|Any CPU.ActiveCfg = Release|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|Any CPU.Build.0 = Release|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|Any CPU.Deploy.0 = Release|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|ARM.ActiveCfg = Release|ARM + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|ARM.Build.0 = Release|ARM + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|ARM.Deploy.0 = Release|ARM + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|ARM64.ActiveCfg = Release|ARM64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|ARM64.Build.0 = Release|ARM64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|ARM64.Deploy.0 = Release|ARM64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|x64.ActiveCfg = Release|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|x64.Build.0 = Release|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|x64.Deploy.0 = Release|x64 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|x86.ActiveCfg = Release|x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|x86.Build.0 = Release|x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}.Release|x86.Deploy.0 = Release|x86 + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|ARM.Build.0 = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|ARM64.Build.0 = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|x64.ActiveCfg = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|x64.Build.0 = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|x86.ActiveCfg = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Debug|x86.Build.0 = Debug|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|Any CPU.Build.0 = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|ARM.ActiveCfg = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|ARM.Build.0 = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|ARM64.ActiveCfg = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|ARM64.Build.0 = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|x64.ActiveCfg = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|x64.Build.0 = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|x86.ActiveCfg = Release|Any CPU + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -181,8 +254,11 @@ Global GlobalSection(NestedProjects) = preSolution {3BAAC2DA-7124-460E-A9A9-13138843CD57} = {E6AFDCD6-F59A-4EC4-BCA7-1E47A5A15751} {6DC6B31C-D03C-4E53-A1A5-CAF51227440B} = {E6AFDCD6-F59A-4EC4-BCA7-1E47A5A15751} - {21128E83-CA73-49E2-B8DA-552B9CE81A25} = {E6AFDCD6-F59A-4EC4-BCA7-1E47A5A15751} {70DF1194-D158-473E-B350-F630231FB328} = {E6AFDCD6-F59A-4EC4-BCA7-1E47A5A15751} + {2C7A065B-9349-4071-AF95-E88F320A09A9} = {69AFC3EC-DC11-4031-8624-0E9F942D19C3} + {DD3E4652-114A-4614-8904-1DBCE62589CC} = {69AFC3EC-DC11-4031-8624-0E9F942D19C3} + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3} = {69AFC3EC-DC11-4031-8624-0E9F942D19C3} + {1CF5C62C-BA30-49F9-81DF-94EA8338AA6E} = {EC5804D7-C94B-4CF8-8344-132F2A58F88E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D11723C-7575-40DF-9BC9-300A09554B5D} diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj similarity index 95% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj index 0ad67931..c3d7f090 100644 --- a/Labs/CanvasLayout/samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj +++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj @@ -38,7 +38,7 @@ - + WinUITarget=$(WinUITarget) diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs rename to Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj similarity index 94% rename from Labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj rename to Labs/CanvasLayout/Samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj index d5356899..139fc798 100644 --- a/Labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj +++ b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj @@ -20,7 +20,7 @@ - + {FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5} CommunityToolkit.Labs.WinUI.CanvasLayout diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Uwp/Package.appxmanifest b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Package.appxmanifest similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Uwp/Package.appxmanifest rename to Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Package.appxmanifest diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs rename to Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/Default.rd.xml b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/Default.rd.xml similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/Default.rd.xml rename to Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/Default.rd.xml diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj similarity index 87% rename from Labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj rename to Labs/CanvasLayout/Samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj index ee543188..5635dce6 100644 --- a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj +++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/Program.cs b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Program.cs similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Wasm/Program.cs rename to Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Program.cs diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/Properties/launchSettings.json b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Properties/launchSettings.json similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Wasm/Properties/launchSettings.json rename to Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Properties/launchSettings.json diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/WasmCSS/Fonts.css b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmCSS/Fonts.css similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Wasm/WasmCSS/Fonts.css rename to Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmCSS/Fonts.css diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/WasmScripts/AppManifest.js b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmScripts/AppManifest.js similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Wasm/WasmScripts/AppManifest.js rename to Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmScripts/AppManifest.js diff --git a/Labs/CanvasLayout/samples/CanvasLayout.Wasm/wwwroot/web.config b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/wwwroot/web.config similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.Wasm/wwwroot/web.config rename to Labs/CanvasLayout/Samples/CanvasLayout.Wasm/wwwroot/web.config diff --git a/Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj similarity index 93% rename from Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj rename to Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj index e6187d99..5d4ab0d0 100644 --- a/Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj +++ b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj @@ -9,7 +9,7 @@ - + diff --git a/Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/Package.appxmanifest b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Package.appxmanifest similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/Package.appxmanifest rename to Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Package.appxmanifest diff --git a/Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/Properties/launchSettings.json b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Properties/launchSettings.json similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/Properties/launchSettings.json rename to Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Properties/launchSettings.json diff --git a/Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/app.manifest b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/app.manifest similarity index 100% rename from Labs/CanvasLayout/samples/CanvasLayout.WinAppSdk/app.manifest rename to Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/app.manifest diff --git a/Labs/CanvasLayout/src/CanvasLayout.cs b/Labs/CanvasLayout/Src/CanvasLayout.cs similarity index 100% rename from Labs/CanvasLayout/src/CanvasLayout.cs rename to Labs/CanvasLayout/Src/CanvasLayout.cs diff --git a/Labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/Labs/CanvasLayout/Src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj similarity index 100% rename from Labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj rename to Labs/CanvasLayout/Src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems new file mode 100644 index 00000000..8b440da3 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems @@ -0,0 +1,14 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 2c7a065b-9349-4071-af95-e88f320a09a9 + + + CanvasLayout.Tests + + + + + \ No newline at end of file diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj new file mode 100644 index 00000000..b47b00d7 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj @@ -0,0 +1,13 @@ + + + + 2c7a065b-9349-4071-af95-e88f320a09a9 + 14.0 + + + + + + + + diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs new file mode 100644 index 00000000..135ada1e --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace CanvasLayout.Tests +{ + [TestClass] + public class ExampleCanvasLayoutTestClass + { + [TestMethod] + public void Just_an_example_test() + { + Assert.AreEqual(1, 1); + } + } +} diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj new file mode 100644 index 00000000..a1e5edee --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj @@ -0,0 +1,179 @@ + + + + + Debug + x86 + {F17EE40D-CEE8-402F-AA43-45A7F87ACBF3} + AppContainerExe + Properties + CanvasLayout.UnitTests.Uwp + CanvasLayout.UnitTests.Uwp + en-US + UAP + 10.0.19041.0 + 10.0.17763.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(VisualStudioVersion) + false + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + PackageReference + + + + + + + + UnitTestApp.xaml + + + + + MSBuild:Compile + Designer + + + + + Designer + + + + + Assets\LockScreenLogo.scale-200.png + + + Assets\Square150x150Logo.scale-200.png + + + Assets\Square44x44Logo.scale-200.png + + + Assets\Square44x44Logo.targetsize-24_altform-unplated.png + + + Assets\StoreLogo.png + + + + + + 6.2.13 + + + 2.2.8 + + + 2.2.8 + + + + + 14.0 + + + + \ No newline at end of file diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Package.appxmanifest b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Package.appxmanifest new file mode 100644 index 00000000..b26e674b --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Package.appxmanifest @@ -0,0 +1,45 @@ + + + + + + + + + CanvasLayout.UnitTests.Uwp + matt + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/AssemblyInfo.cs b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..e0e860ca --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("CanvasLayout.UnitTests.Uwp")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("CanvasLayout.UnitTests.Uwp")] +[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyMetadata("TargetPlatform","UAP")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/Default.rd.xml b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/Default.rd.xml new file mode 100644 index 00000000..996a8392 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/Default.rd.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml new file mode 100644 index 00000000..4b4f5878 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml @@ -0,0 +1,4 @@ + diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs new file mode 100644 index 00000000..ee8411c0 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace CanvasLayout.UnitTests.Uwp +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + sealed partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + this.Suspending += OnSuspending; + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(LaunchActivatedEventArgs e) + { + +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + this.DebugSettings.EnableFrameRateCounter = true; + } +#endif + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (Window.Current.Content is Frame rootFrame) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + rootFrame.NavigationFailed += OnNavigationFailed; + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + { + //TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + // Ensure the current window is active + Window.Current.Activate(); + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments); + } + + /// + /// Invoked when Navigation to a certain page fails + /// + /// The Frame which failed navigation + /// Details about the navigation failure + void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception("Failed to load Page " + e.SourcePageType.FullName); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral(); + //TODO: Save application state and stop any background activity + deferral.Complete(); + } + } +} diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml new file mode 100644 index 00000000..a2cb6fc5 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml.cs b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml.cs new file mode 100644 index 00000000..3f8fbe72 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml.cs @@ -0,0 +1,60 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Microsoft.UI.Xaml.Shapes; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace CanvasLayout.UnitTests.WinAppSdk +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) + { + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + m_window = new MainWindow(); + + // Ensure the current window is active + m_window.Activate(); + + //UITestMethodAttribute.DispatcherQueue = m_window.DispatcherQueue; + + // Replace back with e.Arguments when https://github.com/microsoft/microsoft-ui-xaml/issues/3368 is fixed + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(Environment.CommandLine); + } + + private Window? m_window; + } +} diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj new file mode 100644 index 00000000..ab2e4110 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj @@ -0,0 +1,57 @@ + + + WinExe + net6.0-windows10.0.19041.0 + 10.0.17763.0 + CanvasLayout.UnitTests.WinAppSdk + app.manifest + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + win10-$(Platform).pubxml + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.2.8 + + + 2.2.8 + + + 17.1.0 + build + + + + + + + + + diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml new file mode 100644 index 00000000..a673307d --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml.cs b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml.cs new file mode 100644 index 00000000..1fc2bdbe --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml.cs @@ -0,0 +1,31 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace CanvasLayout.UnitTests.WinAppSdk +{ + /// + /// An empty window that can be used on its own or navigated to within a Frame. + /// + public sealed partial class MainWindow : Window + { + public MainWindow() + { + this.InitializeComponent(); + } + } +} diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Package.appxmanifest b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Package.appxmanifest new file mode 100644 index 00000000..f5f064a2 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Package.appxmanifest @@ -0,0 +1,47 @@ + + + + + + + + CanvasLayout.UnitTests.WinAppSdk + matt + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Properties/launchSettings.json b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Properties/launchSettings.json new file mode 100644 index 00000000..555cf792 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "CanvasLayout.UnitTests.WinAppSdk (Package)": { + "commandName": "MsixPackage" + }, + "CanvasLayout.UnitTests.WinAppSdk (Unpackaged)": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/app.manifest b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/app.manifest new file mode 100644 index 00000000..fa98dab0 --- /dev/null +++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj new file mode 100644 index 00000000..ecdab3f2 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj @@ -0,0 +1,179 @@ + + + + + Debug + x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34} + AppContainerExe + Properties + CommunityToolkit.Labs.UnitTests.Uwp + CommunityToolkit.Labs.UnitTests.Uwp + en-US + UAP + 10.0.19041.0 + 10.0.17763.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(VisualStudioVersion) + false + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + PackageReference + + + + + + + + UnitTestApp.xaml + + + + + MSBuild:Compile + Designer + + + + + Designer + + + + + Assets\LockScreenLogo.scale-200.png + + + Assets\SplashScreen.scale-200.png + + + Assets\Square150x150Logo.scale-200.png + + + Assets\Square44x44Logo.scale-200.png + + + Assets\Square44x44Logo.targetsize-24_altform-unplated.png + + + Assets\StoreLogo.png + + + Assets\Wide310x150Logo.scale-200.png + + + + + + 6.2.13 + + + 2.2.8 + + + 2.2.8 + + + + + + 14.0 + + + \ No newline at end of file diff --git a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Package.appxmanifest b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Package.appxmanifest new file mode 100644 index 00000000..6f4c2b97 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Package.appxmanifest @@ -0,0 +1,46 @@ + + + + + + + + + CommunityToolkit.Labs.UnitTests.Uwp + matt + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/AssemblyInfo.cs b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..0fe99c0b --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("CommunityToolkit.Labs.UnitTests.Uwp")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("CommunityToolkit.Labs.UnitTests.Uwp")] +[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyMetadata("TargetPlatform","UAP")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/Default.rd.xml b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/Default.rd.xml new file mode 100644 index 00000000..996a8392 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/Default.rd.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml new file mode 100644 index 00000000..2a319951 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml @@ -0,0 +1,4 @@ + diff --git a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs new file mode 100644 index 00000000..1dd2c8c9 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace CommunityToolkit.Labs.UnitTests.Uwp +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + sealed partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + this.Suspending += OnSuspending; + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(LaunchActivatedEventArgs e) + { + +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + this.DebugSettings.EnableFrameRateCounter = true; + } +#endif + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (Window.Current.Content is Frame rootFrame) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + rootFrame.NavigationFailed += OnNavigationFailed; + + if (e.PreviousExecutionState == ApplicationExecutionState.Terminated) + { + //TODO: Load state from previously suspended application + } + + // Place the frame in the current Window + Window.Current.Content = rootFrame; + } + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + // Ensure the current window is active + Window.Current.Activate(); + + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments); + } + + /// + /// Invoked when Navigation to a certain page fails + /// + /// The Frame which failed navigation + /// Details about the navigation failure + void OnNavigationFailed(object sender, NavigationFailedEventArgs e) + { + throw new Exception("Failed to load Page " + e.SourcePageType.FullName); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + var deferral = e.SuspendingOperation.GetDeferral(); + //TODO: Save application state and stop any background activity + deferral.Complete(); + } + } +} diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml new file mode 100644 index 00000000..8e96e6c0 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml.cs b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml.cs new file mode 100644 index 00000000..a6fc7525 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml.cs @@ -0,0 +1,60 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Microsoft.UI.Xaml.Shapes; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace CommunityToolkit.Labs.UnitTests.WinAppSdk +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) + { + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI(); + + m_window = new MainWindow(); + + // Ensure the current window is active + m_window.Activate(); + + //UITestMethodAttribute.DispatcherQueue = m_window.DispatcherQueue; + + // Replace back with e.Arguments when https://github.com/microsoft/microsoft-ui-xaml/issues/3368 is fixed + Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(Environment.CommandLine); + } + + private Window? m_window; + } +} diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj new file mode 100644 index 00000000..2743738e --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj @@ -0,0 +1,60 @@ + + + WinExe + net6.0-windows10.0.19041.0 + 10.0.17763.0 + CommunityToolkit.Labs.UnitTests.WinAppSdk + app.manifest + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + win10-$(Platform).pubxml + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.2.8 + + + 2.2.8 + + + 17.1.0 + build + + + + + + + + + + diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml new file mode 100644 index 00000000..9fd533a3 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml.cs b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml.cs new file mode 100644 index 00000000..05d21e3f --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml.cs @@ -0,0 +1,31 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace CommunityToolkit.Labs.UnitTests.WinAppSdk +{ + /// + /// An empty window that can be used on its own or navigated to within a Frame. + /// + public sealed partial class MainWindow : Window + { + public MainWindow() + { + this.InitializeComponent(); + } + } +} diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Package.appxmanifest b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Package.appxmanifest new file mode 100644 index 00000000..50a10ea8 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Package.appxmanifest @@ -0,0 +1,48 @@ + + + + + + + + CommunityToolkit.Labs.UnitTests.WinAppSdk + matt + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Properties/launchSettings.json b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Properties/launchSettings.json new file mode 100644 index 00000000..5a607e2a --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "CommunityToolkit.Labs.UnitTests.WinAppSdk (Package)": { + "commandName": "MsixPackage" + }, + "CommunityToolkit.Labs.UnitTests.WinAppSdk (Unpackaged)": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/app.manifest b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/app.manifest new file mode 100644 index 00000000..4c6a7884 --- /dev/null +++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/Toolkit.Labs.All.sln b/Toolkit.Labs.All.sln index 20eb7fca..b5992b2a 100644 --- a/Toolkit.Labs.All.sln +++ b/Toolkit.Labs.All.sln @@ -15,18 +15,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9898 EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommunityToolkit.Labs.Shared", "Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.shproj", "{9503C27C-55A8-4B66-AA7B-14EFDB940B13}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CanvasLayout", "CanvasLayout", "{86E3CC4D-1359-4249-9C5B-C193BF65633D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.WinUI.CanvasLayout", "Labs\CanvasLayout\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj", "{FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CanvasLayout.Uwp", "Labs\CanvasLayout\samples\CanvasLayout.Uwp\CanvasLayout.Uwp.csproj", "{3BAAC2DA-7124-460E-A9A9-13138843CD57}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.WinUI.CanvasLayout", "Labs\CanvasLayout\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj", "{FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Sample", "Labs\CanvasLayout\samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj", "{A14189C0-39A8-4FBE-BF86-A78A94654C48}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Sample", "Labs\CanvasLayout\Samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj", "{A14189C0-39A8-4FBE-BF86-A78A94654C48}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{EDD2FCF0-74FE-4AB9-B40A-7B2A4E89D59C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Wasm", "Labs\CanvasLayout\samples\CanvasLayout.Wasm\CanvasLayout.Wasm.csproj", "{E8E5AAAA-B15B-4B35-8673-118F6417B6F2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{09003B35-7A35-4BD1-9A26-5CFD02AB88DD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core.SourceGenerators", "Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj", "{5CB6662F-590F-4250-A19D-E27FEE9C2876}" @@ -37,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.WinAppSdk", "Platforms\CommunityToolkit.Labs.WinAppSdk\CommunityToolkit.Labs.WinAppSdk.csproj", "{53E592FC-E73C-474B-89C3-0570854CB160}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.WinAppSdk", "Labs\CanvasLayout\samples\CanvasLayout.WinAppSdk\CanvasLayout.WinAppSdk.csproj", "{25341845-BFEE-47E0-A6A9-16CADDF829C3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xPlatforms", "xPlatforms", "{E824D592-EBCB-41C6-A176-D001C5A124CB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Labs.Droid", "Platforms\CommunityToolkit.Labs.Droid\CommunityToolkit.Labs.Droid.csproj", "{8EA015ED-5142-4393-BCA8-08ED2DFF19A9}" @@ -57,6 +49,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Labs.Uwp", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Wasm", "Platforms\CommunityToolkit.Labs.Wasm\CommunityToolkit.Labs.Wasm.csproj", "{20926634-C200-43A6-AE59-86F9C3878992}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Labs.UnitTests.Uwp", "Tests\CommunityToolkit.Labs.UnitTests.Uwp\CommunityToolkit.Labs.UnitTests.Uwp.csproj", "{FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.UnitTests.WinAppSdk", "Tests\CommunityToolkit.Labs.UnitTests.WinAppSdk\CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj", "{53892F07-FE54-4E36-81D8-105427D097E5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experiments", "Experiments", "{DD69BA61-C86D-4138-AE6F-76E2C8445C9A}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CanvasLayout.Tests", "Labs\CanvasLayout\Tests\CanvasLayout.Tests\CanvasLayout.Tests.shproj", "{2C7A065B-9349-4071-AF95-E88F320A09A9}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{583C9ADC-96A6-446D-9573-7C33B0640915}" ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props @@ -74,12 +76,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{583C9ADC EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + Labs\CanvasLayout\Tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{2c7a065b-9349-4071-af95-e88f320a09a9}*SharedItemsImports = 13 Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{34617141-25c4-4fec-8a15-5b46934f1a99}*SharedItemsImports = 4 - Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{3baac2da-7124-460e-a9a9-13138843cd57}*SharedItemsImports = 4 + Labs\CanvasLayout\Tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{53892f07-fe54-4e36-81d8-105427d097e5}*SharedItemsImports = 5 Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{8ea015ed-5142-4393-bca8-08ed2dff19a9}*SharedItemsImports = 4 Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{93bfd459-2e21-41c7-9e54-868f5b014dbc}*SharedItemsImports = 4 Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{9503c27c-55a8-4b66-aa7b-14efdb940b13}*SharedItemsImports = 13 Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems*{b3d6df0b-13db-493e-9d1a-56343efedea7}*SharedItemsImports = 4 + Labs\CanvasLayout\Tests\CanvasLayout.Tests\CanvasLayout.Tests.projitems*{fd78002e-c4e6-4bf8-9ec3-c06250dfef34}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -112,89 +116,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|Any CPU.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|ARM.ActiveCfg = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|ARM.Build.0 = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|ARM.Deploy.0 = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|ARM64.Build.0 = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|ARM64.Deploy.0 = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|iPhone.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|iPhone.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|iPhone.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|x64.Build.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|x86.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|Any CPU.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|Any CPU.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|Any CPU.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|ARM.ActiveCfg = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|ARM.Build.0 = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|ARM.Deploy.0 = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|ARM64.ActiveCfg = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|ARM64.Build.0 = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|ARM64.Deploy.0 = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|iPhone.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|iPhone.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|iPhone.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|iPhoneSimulator.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|iPhoneSimulator.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|x64.ActiveCfg = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|x64.Build.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|x64.Deploy.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|x86.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|x86.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.AppStore|x86.Deploy.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|Any CPU.ActiveCfg = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|Any CPU.Build.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|Any CPU.Deploy.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|ARM.ActiveCfg = Debug|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|ARM.Build.0 = Debug|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|ARM.Deploy.0 = Debug|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|ARM64.Build.0 = Debug|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|iPhone.ActiveCfg = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|iPhone.Build.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|iPhone.Deploy.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|iPhoneSimulator.Build.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|x64.ActiveCfg = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|x64.Build.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|x64.Deploy.0 = Debug|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|x86.ActiveCfg = Debug|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|x86.Build.0 = Debug|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Debug|x86.Deploy.0 = Debug|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|Any CPU.ActiveCfg = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|Any CPU.Build.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|ARM.ActiveCfg = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|ARM.Build.0 = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|ARM.Deploy.0 = Release|ARM - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|ARM64.ActiveCfg = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|ARM64.Build.0 = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|ARM64.Deploy.0 = Release|ARM64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|iPhone.ActiveCfg = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|iPhone.Build.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|iPhone.Deploy.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|iPhoneSimulator.ActiveCfg = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|iPhoneSimulator.Build.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|iPhoneSimulator.Deploy.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|x64.ActiveCfg = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|x64.Build.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|x64.Deploy.0 = Release|x64 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|x86.ActiveCfg = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|x86.Build.0 = Release|x86 - {3BAAC2DA-7124-460E-A9A9-13138843CD57}.Release|x86.Deploy.0 = Release|x86 {FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU @@ -307,62 +228,6 @@ Global {A14189C0-39A8-4FBE-BF86-A78A94654C48}.Release|x64.Build.0 = Release|Any CPU {A14189C0-39A8-4FBE-BF86-A78A94654C48}.Release|x86.ActiveCfg = Release|Any CPU {A14189C0-39A8-4FBE-BF86-A78A94654C48}.Release|x86.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|ARM64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|ARM64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|Any CPU.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|ARM.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|ARM.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|ARM64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|ARM64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|iPhone.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|x64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|x64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|x86.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.AppStore|x86.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM64.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|iPhone.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x64.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x86.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|Any CPU.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|iPhone.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|iPhone.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x86.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x86.Build.0 = Release|Any CPU {5CB6662F-590F-4250-A19D-E27FEE9C2876}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {5CB6662F-590F-4250-A19D-E27FEE9C2876}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {5CB6662F-590F-4250-A19D-E27FEE9C2876}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU @@ -615,90 +480,6 @@ Global {53E592FC-E73C-474B-89C3-0570854CB160}.Release|x86.ActiveCfg = Release|x86 {53E592FC-E73C-474B-89C3-0570854CB160}.Release|x86.Build.0 = Release|x86 {53E592FC-E73C-474B-89C3-0570854CB160}.Release|x86.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|Any CPU.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|ARM.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|ARM.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|ARM.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|ARM64.ActiveCfg = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|ARM64.Build.0 = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|ARM64.Deploy.0 = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|iPhone.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|iPhone.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|iPhone.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|x64.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|x64.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|x64.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|x86.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|x86.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Ad-Hoc|x86.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|Any CPU.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|Any CPU.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|Any CPU.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|ARM.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|ARM.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|ARM.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|ARM64.ActiveCfg = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|ARM64.Build.0 = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|ARM64.Deploy.0 = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|iPhone.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|iPhone.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|iPhone.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|iPhoneSimulator.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|iPhoneSimulator.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|x64.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|x64.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|x64.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|x86.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|x86.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.AppStore|x86.Deploy.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|Any CPU.ActiveCfg = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|Any CPU.Build.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|Any CPU.Deploy.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|ARM.ActiveCfg = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|ARM.Build.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|ARM.Deploy.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|ARM64.ActiveCfg = Debug|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|ARM64.Build.0 = Debug|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|ARM64.Deploy.0 = Debug|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|iPhone.ActiveCfg = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|iPhone.Build.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|iPhone.Deploy.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|iPhoneSimulator.Build.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|x64.ActiveCfg = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|x64.Build.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|x64.Deploy.0 = Debug|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|x86.ActiveCfg = Debug|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|x86.Build.0 = Debug|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Debug|x86.Deploy.0 = Debug|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|Any CPU.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|Any CPU.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|Any CPU.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|ARM.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|ARM.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|ARM.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|ARM64.ActiveCfg = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|ARM64.Build.0 = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|ARM64.Deploy.0 = Release|arm64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|iPhone.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|iPhone.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|iPhone.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|iPhoneSimulator.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|iPhoneSimulator.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|iPhoneSimulator.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|x64.ActiveCfg = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|x64.Build.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|x64.Deploy.0 = Release|x64 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|x86.ActiveCfg = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|x86.Build.0 = Release|x86 - {25341845-BFEE-47E0-A6A9-16CADDF829C3}.Release|x86.Deploy.0 = Release|x86 {8EA015ED-5142-4393-BCA8-08ED2DFF19A9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {8EA015ED-5142-4393-BCA8-08ED2DFF19A9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {8EA015ED-5142-4393-BCA8-08ED2DFF19A9}.Ad-Hoc|Any CPU.Deploy.0 = Debug|Any CPU @@ -1177,22 +958,186 @@ Global {20926634-C200-43A6-AE59-86F9C3878992}.Release|x64.Build.0 = Release|Any CPU {20926634-C200-43A6-AE59-86F9C3878992}.Release|x86.ActiveCfg = Release|Any CPU {20926634-C200-43A6-AE59-86F9C3878992}.Release|x86.Build.0 = Release|Any CPU + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|Any CPU.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|Any CPU.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|ARM.ActiveCfg = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|ARM.Build.0 = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|ARM.Deploy.0 = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|ARM64.ActiveCfg = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|ARM64.Build.0 = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|ARM64.Deploy.0 = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|iPhone.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|iPhone.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|iPhone.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|x64.ActiveCfg = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|x64.Build.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|x64.Deploy.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|x86.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|x86.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Ad-Hoc|x86.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|Any CPU.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|Any CPU.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|Any CPU.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|ARM.ActiveCfg = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|ARM.Build.0 = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|ARM.Deploy.0 = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|ARM64.ActiveCfg = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|ARM64.Build.0 = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|ARM64.Deploy.0 = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|iPhone.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|iPhone.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|iPhone.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|iPhoneSimulator.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|iPhoneSimulator.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|iPhoneSimulator.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|x64.ActiveCfg = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|x64.Build.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|x64.Deploy.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|x86.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|x86.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.AppStore|x86.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|Any CPU.ActiveCfg = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|Any CPU.Build.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|Any CPU.Deploy.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|ARM.ActiveCfg = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|ARM.Build.0 = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|ARM.Deploy.0 = Debug|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|ARM64.Build.0 = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|iPhone.ActiveCfg = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|iPhone.Build.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|iPhone.Deploy.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|iPhoneSimulator.Build.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|x64.ActiveCfg = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|x64.Build.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|x64.Deploy.0 = Debug|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|x86.ActiveCfg = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|x86.Build.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Debug|x86.Deploy.0 = Debug|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|Any CPU.ActiveCfg = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|Any CPU.Build.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|Any CPU.Deploy.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|ARM.ActiveCfg = Release|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|ARM.Build.0 = Release|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|ARM.Deploy.0 = Release|ARM + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|ARM64.ActiveCfg = Release|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|ARM64.Build.0 = Release|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|ARM64.Deploy.0 = Release|ARM64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|iPhone.ActiveCfg = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|iPhone.Build.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|iPhone.Deploy.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|iPhoneSimulator.ActiveCfg = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|iPhoneSimulator.Build.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|iPhoneSimulator.Deploy.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|x64.ActiveCfg = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|x64.Build.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|x64.Deploy.0 = Release|x64 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|x86.ActiveCfg = Release|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|x86.Build.0 = Release|x86 + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}.Release|x86.Deploy.0 = Release|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|Any CPU.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|Any CPU.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|ARM.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|ARM.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|ARM.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|ARM64.ActiveCfg = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|ARM64.Build.0 = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|ARM64.Deploy.0 = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|iPhone.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|iPhone.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|iPhone.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|x64.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|x64.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|x64.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|x86.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|x86.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Ad-Hoc|x86.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|Any CPU.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|Any CPU.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|Any CPU.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|ARM.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|ARM.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|ARM.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|ARM64.ActiveCfg = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|ARM64.Build.0 = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|ARM64.Deploy.0 = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|iPhone.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|iPhone.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|iPhone.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|iPhoneSimulator.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|iPhoneSimulator.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|x64.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|x64.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|x64.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|x86.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|x86.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.AppStore|x86.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|Any CPU.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|Any CPU.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|ARM.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|ARM.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|ARM.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|ARM64.ActiveCfg = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|ARM64.Build.0 = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|ARM64.Deploy.0 = Debug|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|iPhone.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|iPhone.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|iPhone.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|iPhoneSimulator.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|x64.ActiveCfg = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|x64.Build.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|x64.Deploy.0 = Debug|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|x86.ActiveCfg = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|x86.Build.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Debug|x86.Deploy.0 = Debug|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|Any CPU.ActiveCfg = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|Any CPU.Build.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|Any CPU.Deploy.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|ARM.ActiveCfg = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|ARM.Build.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|ARM.Deploy.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|ARM64.ActiveCfg = Release|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|ARM64.Build.0 = Release|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|ARM64.Deploy.0 = Release|arm64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|iPhone.ActiveCfg = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|iPhone.Build.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|iPhone.Deploy.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|iPhoneSimulator.ActiveCfg = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|iPhoneSimulator.Build.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|iPhoneSimulator.Deploy.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|x64.ActiveCfg = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|x64.Build.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|x64.Deploy.0 = Release|x64 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|x86.ActiveCfg = Release|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|x86.Build.0 = Release|x86 + {53892F07-FE54-4E36-81D8-105427D097E5}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {9503C27C-55A8-4B66-AA7B-14EFDB940B13} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD} - {86E3CC4D-1359-4249-9C5B-C193BF65633D} = {9898A5F2-6B58-4770-9757-302E93848428} - {3BAAC2DA-7124-460E-A9A9-13138843CD57} = {86E3CC4D-1359-4249-9C5B-C193BF65633D} {FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5} = {EDD2FCF0-74FE-4AB9-B40A-7B2A4E89D59C} - {A14189C0-39A8-4FBE-BF86-A78A94654C48} = {86E3CC4D-1359-4249-9C5B-C193BF65633D} - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2} = {86E3CC4D-1359-4249-9C5B-C193BF65633D} + {A14189C0-39A8-4FBE-BF86-A78A94654C48} = {9898A5F2-6B58-4770-9757-302E93848428} {5CB6662F-590F-4250-A19D-E27FEE9C2876} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD} {1683BA1A-5D66-4488-B7CA-6DF3FDE2701D} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD} {5BD4E79C-3744-4E89-A6F2-17FBAB7E3F68} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD} {53E592FC-E73C-474B-89C3-0570854CB160} = {E824D592-EBCB-41C6-A176-D001C5A124CB} - {25341845-BFEE-47E0-A6A9-16CADDF829C3} = {86E3CC4D-1359-4249-9C5B-C193BF65633D} {8EA015ED-5142-4393-BCA8-08ED2DFF19A9} = {E824D592-EBCB-41C6-A176-D001C5A124CB} {93BFD459-2E21-41C7-9E54-868F5B014DBC} = {E824D592-EBCB-41C6-A176-D001C5A124CB} {34617141-25C4-4FEC-8A15-5B46934F1A99} = {E824D592-EBCB-41C6-A176-D001C5A124CB} @@ -1201,6 +1146,10 @@ Global {BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12} = {E824D592-EBCB-41C6-A176-D001C5A124CB} {B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7} = {E824D592-EBCB-41C6-A176-D001C5A124CB} {20926634-C200-43A6-AE59-86F9C3878992} = {E824D592-EBCB-41C6-A176-D001C5A124CB} + {FD78002E-C4E6-4BF8-9EC3-C06250DFEF34} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A} + {53892F07-FE54-4E36-81D8-105427D097E5} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A} + {DD69BA61-C86D-4138-AE6F-76E2C8445C9A} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A} + {2C7A065B-9349-4071-AF95-E88F320A09A9} = {DD69BA61-C86D-4138-AE6F-76E2C8445C9A} {583C9ADC-96A6-446D-9573-7C33B0640915} = {24A1D6DC-FF32-4D9D-9FC2-8EB3E356A2C0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/Toolkit.Labs.Wasm.sln b/Toolkit.Labs.Wasm.sln index aed7afd3..506647c5 100644 --- a/Toolkit.Labs.Wasm.sln +++ b/Toolkit.Labs.Wasm.sln @@ -16,16 +16,12 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CommunityToolkit.Labs.Share EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Wasm", "Platforms\CommunityToolkit.Labs.Wasm\CommunityToolkit.Labs.Wasm.csproj", "{3EBB8552-CE39-4EDC-9ACB-7B4871582FBB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CanvasLayout", "CanvasLayout", "{86E3CC4D-1359-4249-9C5B-C193BF65633D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.WinUI.CanvasLayout", "Labs\CanvasLayout\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj", "{FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.WinUI.CanvasLayout", "Labs\CanvasLayout\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj", "{FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Sample", "Labs\CanvasLayout\samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj", "{A14189C0-39A8-4FBE-BF86-A78A94654C48}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Sample", "Labs\CanvasLayout\Samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj", "{A14189C0-39A8-4FBE-BF86-A78A94654C48}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{EDD2FCF0-74FE-4AB9-B40A-7B2A4E89D59C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CanvasLayout.Wasm", "Labs\CanvasLayout\samples\CanvasLayout.Wasm\CanvasLayout.Wasm.csproj", "{E8E5AAAA-B15B-4B35-8673-118F6417B6F2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{09003B35-7A35-4BD1-9A26-5CFD02AB88DD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core", "Common\CommunityToolkit.Labs.Core\CommunityToolkit.Labs.Core.csproj", "{210476D6-42CC-4D01-B027-478145BEA8FE}" @@ -107,26 +103,6 @@ Global {A14189C0-39A8-4FBE-BF86-A78A94654C48}.Release|x64.Build.0 = Release|Any CPU {A14189C0-39A8-4FBE-BF86-A78A94654C48}.Release|x86.ActiveCfg = Release|Any CPU {A14189C0-39A8-4FBE-BF86-A78A94654C48}.Release|x86.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|ARM64.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x64.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Debug|x86.Build.0 = Debug|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|Any CPU.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|ARM64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x64.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x64.Build.0 = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x86.ActiveCfg = Release|Any CPU - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2}.Release|x86.Build.0 = Release|Any CPU {210476D6-42CC-4D01-B027-478145BEA8FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {210476D6-42CC-4D01-B027-478145BEA8FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {210476D6-42CC-4D01-B027-478145BEA8FE}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -153,10 +129,8 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {9503C27C-55A8-4B66-AA7B-14EFDB940B13} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD} - {86E3CC4D-1359-4249-9C5B-C193BF65633D} = {9898A5F2-6B58-4770-9757-302E93848428} {FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5} = {EDD2FCF0-74FE-4AB9-B40A-7B2A4E89D59C} - {A14189C0-39A8-4FBE-BF86-A78A94654C48} = {86E3CC4D-1359-4249-9C5B-C193BF65633D} - {E8E5AAAA-B15B-4B35-8673-118F6417B6F2} = {86E3CC4D-1359-4249-9C5B-C193BF65633D} + {A14189C0-39A8-4FBE-BF86-A78A94654C48} = {9898A5F2-6B58-4770-9757-302E93848428} {210476D6-42CC-4D01-B027-478145BEA8FE} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution