Merge branch 'main' into feature/build-heads-with-selective-targetframework

2022-04-07 14:18:38 -05:00 · 2022-04-07 14:18:38 -05:00 · 7a98d3c8a4
--- 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                       
@ -68,3 +68,24 @@ jobs:
      - name: Push packages
        if: ${{github.ref == 'refs/heads/main'}}
        run: dotnet nuget push "**/*.nupkg" --api-key dummy --source LabsFeed --skip-duplicate
+
+  # Test/temp job to build a single experiment to ensure our changes work for both our main types of solutions at the moment
+  experiment:
+    runs-on: windows-latest
+
+    steps:
+      - name: Install .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.201'
+
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.3
+        
+      - name: MSBuild
+        working-directory: ./Labs/CanvasLayout
+        run: msbuild.exe CanvasLayout.sln /restore -p:Configuration=Release
--- a/ApplyXamlStyling.ps1
+++ b/ApplyXamlStyling.ps1
@ -60,7 +60,7 @@ if (-not $Passive)

    if ($files.count -gt 0)
    {
-        dotnet tool run xstyler -p -c .\settings.xamlstyler -f $files
+        dotnet tool run xstyler -c .\settings.xamlstyler -f $files
    }
    else
    {
--- 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 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
  </ItemGroup>

  <ItemGroup>
--- a/Common/Labs.SampleRefs.props
+++ b/Common/Labs.SampleRefs.props
@ -4,7 +4,7 @@

  <ItemGroup>
    
-    <ProjectReference Include="$(RepositoryDirectory)Labs\CanvasLayout\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj"/>
-    <ProjectReference Include="$(RepositoryDirectory)Labs\CanvasLayout\samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj"/>
+    <ProjectReference Include="$(RepositoryDirectory)Labs\CanvasLayout\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj" />
+    <ProjectReference Include="$(RepositoryDirectory)Labs\CanvasLayout\Samples\CanvasLayout.Sample\CanvasLayout.Sample.csproj"/>
  </ItemGroup>
 </Project>
--- a/Labs/CanvasLayout/CanvasLayout.sln
+++ b/Labs/CanvasLayout/CanvasLayout.sln
@ -5,21 +5,36 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core.SourceGenerators", "..\..\Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj", "{42FC292E-5028-4BA9-839C-0450A34BDEC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Core.SourceGenerators.XamlNamedPropertyRelay", "..\..\Common\CommunityToolkit.Labs.Core.SourceGenerators.XamlNamedPropertyRelay\CommunityToolkit.Labs.Core.SourceGenerators.XamlNamedPropertyRelay.csproj", "{B3090946-9399-43C6-AF7C-2E21F5C93935}"
+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
 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 +139,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 +169,106 @@ 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
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|ARM.Build.0 = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|x64.Build.0 = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Debug|x86.Build.0 = Debug|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|ARM.Build.0 = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|ARM64.Build.0 = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|x64.ActiveCfg = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|x64.Build.0 = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|x86.ActiveCfg = Release|Any CPU
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6}.Release|x86.Build.0 = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|x64.Build.0 = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Debug|x86.Build.0 = Debug|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|ARM.Build.0 = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|ARM64.Build.0 = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|x64.ActiveCfg = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|x64.Build.0 = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3090946-9399-43C6-AF7C-2E21F5C93935}.Release|x86.Build.0 = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -181,8 +276,12 @@ 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}
+		{42FC292E-5028-4BA9-839C-0450A34BDEC6} = {EC5804D7-C94B-4CF8-8344-132F2A58F88E}
+		{B3090946-9399-43C6-AF7C-2E21F5C93935} = {EC5804D7-C94B-4CF8-8344-132F2A58F88E}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6D11723C-7575-40DF-9BC9-300A09554B5D}
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/CanvasLayout.Sample.csproj
@ -38,7 +38,7 @@
  </ItemGroup>
  <ItemGroup>
    
-    <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj">
+    <ProjectReference Include="..\..\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj">
      <AdditionalProperties>WinUITarget=$(WinUITarget)</AdditionalProperties>
    </ProjectReference>
  </ItemGroup>
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleOne/SamplePage.xaml.cs
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleThree/SamplePage3.xaml.cs
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePage2.xaml.cs
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Sample/SampleTwo/SamplePageOptions.xaml.cs
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj
@ -20,7 +20,7 @@
    </AppxManifest>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj">
+    <ProjectReference Include="..\..\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj">
      <Project>{FE19FFF0-6AB6-4FC7-BFDF-B6499153DCD5}</Project>
      <Name>CommunityToolkit.Labs.WinUI.CanvasLayout</Name>
    </ProjectReference>
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Directory.Build.rsp
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Directory.Build.rsp
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Package.appxmanifest
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Package.appxmanifest
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/Default.rd.xml
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Uwp/Properties/Default.rd.xml
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/CanvasLayout.Wasm.csproj
@ -8,7 +8,7 @@
  </ItemGroup>
  
  <ItemGroup>
-    <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj" />
+    <ProjectReference Include="..\..\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj" />
    <ProjectReference Include="..\CanvasLayout.Sample\CanvasLayout.Sample.csproj" />
  </ItemGroup>
 </Project>
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Program.cs
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Program.cs
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Properties/launchSettings.json
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/Properties/launchSettings.json
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmCSS/Fonts.css
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmCSS/Fonts.css
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmScripts/AppManifest.js
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/WasmScripts/AppManifest.js
--- a/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/wwwroot/web.config
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.Wasm/wwwroot/web.config
--- a/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/CanvasLayout.WinAppSdk.csproj
@ -9,7 +9,7 @@

  <ItemGroup>
    <ProjectReference Include="..\CanvasLayout.Sample\CanvasLayout.Sample.csproj" />
-    <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj" />
+    <ProjectReference Include="..\..\Src\CommunityToolkit.Labs.WinUI.CanvasLayout.csproj" />
  </ItemGroup>

  <ItemGroup>
--- a/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Package.appxmanifest
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Package.appxmanifest
--- a/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Properties/launchSettings.json
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/Properties/launchSettings.json
--- a/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/app.manifest
+++ b/Labs/CanvasLayout/Samples/CanvasLayout.WinAppSdk/app.manifest
--- a/Labs/CanvasLayout/Src/CanvasLayout.cs
+++ b/Labs/CanvasLayout/Src/CanvasLayout.cs
--- a/Labs/CanvasLayout/Src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
+++ b/Labs/CanvasLayout/Src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
--- a/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.projitems
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>2c7a065b-9349-4071-af95-e88f320a09a9</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>CanvasLayout.Tests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleCanvasLayoutTestClass.cs" />
+  </ItemGroup>
+</Project>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.Tests/CanvasLayout.Tests.shproj
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2c7a065b-9349-4071-af95-e88f320a09a9</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="CanvasLayout.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.Tests/ExampleCanvasLayoutTestClass.cs
+++ 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);
+        }
+    }
+}
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/CanvasLayout.UnitTests.Uwp.csproj
@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{F17EE40D-CEE8-402F-AA43-45A7F87ACBF3}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CanvasLayout.UnitTests.Uwp</RootNamespace>
+    <AssemblyName>CanvasLayout.UnitTests.Uwp</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <ItemGroup>
+    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTestApp.xaml.cs">
+      <DependentUpon>UnitTestApp.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="UnitTestApp.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\LockScreenLogo.scale-200.png">
+      <Link>Assets\LockScreenLogo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square150x150Logo.scale-200.png">
+      <Link>Assets\Square150x150Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.scale-200.png">
+      <Link>Assets\Square44x44Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <Link>Assets\Square44x44Logo.targetsize-24_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\StoreLogo.png">
+      <Link>Assets\StoreLogo.png</Link>
+    </Content>
+    <Content Include="Properties\Default.rd.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.13</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.2.8</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.2.8</Version>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="..\CanvasLayout.Tests\CanvasLayout.Tests.projitems" Label="Shared" />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Package.appxmanifest
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Package.appxmanifest
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="564177e0-5e6c-43f5-9608-fe7fc6c7f4e8"
+            Publisher="CN=matt"
+            Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="564177e0-5e6c-43f5-9608-fe7fc6c7f4e8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>CanvasLayout.UnitTests.Uwp</DisplayName>
+    <PublisherDisplayName>matt</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="vstest.executionengine.universal.App"
+        Executable="$targetnametoken$.exe"
+        EntryPoint="CanvasLayout.UnitTests.Uwp.App">
+      <uap:VisualElements
+        DisplayName="CanvasLayout.UnitTests.Uwp"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
+        Description="CanvasLayout.UnitTests.Uwp"
+        BackgroundColor="transparent">
+        <uap:DefaultTile/>
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClientServer" />
+    <Capability Name="privateNetworkClientServer" />
+  </Capabilities>
+</Package>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/AssemblyInfo.cs
+++ 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)]
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/Default.rd.xml
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/Properties/Default.rd.xml
@ -0,0 +1,29 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml
@ -0,0 +1,4 @@
+<Application x:Class="CanvasLayout.UnitTests.Uwp.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:CanvasLayout.UnitTests.Uwp" />
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.Uwp/UnitTestApp.xaml.cs
+++ 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
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    sealed partial class App : Application
+    {
+        /// <summary>
+        /// 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().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        /// <summary>
+        /// 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.
+        /// </summary>
+        /// <param name="e">Details about the launch request and process.</param>
+        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);
+        }
+
+        /// <summary>
+        /// Invoked when Navigation to a certain page fails
+        /// </summary>
+        /// <param name="sender">The Frame which failed navigation</param>
+        /// <param name="e">Details about the navigation failure</param>
+        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        /// <summary>
+        /// 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.
+        /// </summary>
+        /// <param name="sender">The source of the suspend request.</param>
+        /// <param name="e">Details about the suspend request.</param>
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+            //TODO: Save application state and stop any background activity
+            deferral.Complete();
+        }
+    }
+}
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml
@ -0,0 +1,14 @@
+<Application x:Class="CanvasLayout.UnitTests.WinAppSdk.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:CanvasLayout.UnitTests.WinAppSdk">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!--  Other merged dictionaries here  -->
+            </ResourceDictionary.MergedDictionaries>
+            <!--  Other app resources here  -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/App.xaml.cs
+++ 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
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    public partial class App : Application
+    {
+        /// <summary>
+        /// 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().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+        }
+
+        /// <summary>
+        /// 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.
+        /// </summary>
+        /// <param name="args">Details about the launch request and process.</param>
+        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;
+    }
+}
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/CanvasLayout.UnitTests.WinAppSdk.csproj
@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>CanvasLayout.UnitTests.WinAppSdk</RootNamespace>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;arm64</Platforms>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <UseWinUI>true</UseWinUI>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\LockScreenLogo.scale-200.png" Link="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square150x150Logo.scale-200.png" Link="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.scale-200.png" Link="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" Link="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="..\..\..\..\Common\CommunityToolkit.Labs.Shared\Assets\StoreLogo.png" Link="Assets\StoreLogo.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+
+  <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+       Tools extension to be activated for this project even if the Windows App SDK Nuget
+       package has not yet been restored -->
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectCapability Include="TestContainer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.2.8</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.2.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.TestPlatform.TestHost">
+      <Version>17.1.0</Version>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Assets\" />
+  </ItemGroup>
+  
+  <Import Project="..\CanvasLayout.Tests\CanvasLayout.Tests.projitems" Label="Shared" />
+</Project>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml
@ -0,0 +1,14 @@
+<Window x:Class="CanvasLayout.UnitTests.WinAppSdk.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="using:CanvasLayout.UnitTests.WinAppSdk"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d">
+
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+        <TextBlock Text="Tests are running" />
+    </StackPanel>
+</Window>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/MainWindow.xaml.cs
+++ 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
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Package.appxmanifest
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Package.appxmanifest
@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="9e2085e4-3f58-4e39-8b44-da73cfd4d595"
+    Publisher="CN=matt"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>CanvasLayout.UnitTests.WinAppSdk</DisplayName>
+    <PublisherDisplayName>matt</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="CanvasLayout.UnitTests.WinAppSdk"
+        Description="CanvasLayout.UnitTests.WinAppSdk"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile/>
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/Properties/launchSettings.json
+++ 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"
+    }
+  }
+}
--- a/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/app.manifest
+++ b/Labs/CanvasLayout/Tests/CanvasLayout.UnitTests.WinAppSdk/app.manifest
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="CanvasLayout.UnitTests.WinAppSdk.app"/>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- The combination of below two tags have the following effect:
+           1) Per-Monitor for >= Windows 10 Anniversary Update
+           2) System < Windows 10 Anniversary Update
+      -->
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
--- a/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
+++ b/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
@ -105,7 +105,7 @@
  </ItemGroup>
  <ItemGroup>
    <BundleResource Include="Resources\Fonts\uno-fluentui-assets.ttf">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </BundleResource>
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
--- a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj
+++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/CommunityToolkit.Labs.UnitTests.Uwp.csproj
@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CommunityToolkit.Labs.UnitTests.Uwp</RootNamespace>
+    <AssemblyName>CommunityToolkit.Labs.UnitTests.Uwp</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <ItemGroup>
+    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTestApp.xaml.cs">
+      <DependentUpon>UnitTestApp.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="UnitTestApp.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\LockScreenLogo.scale-200.png">
+      <Link>Assets\LockScreenLogo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\SplashScreen.scale-200.png">
+      <Link>Assets\SplashScreen.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square150x150Logo.scale-200.png">
+      <Link>Assets\Square150x150Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.scale-200.png">
+      <Link>Assets\Square44x44Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <Link>Assets\Square44x44Logo.targetsize-24_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\StoreLogo.png">
+      <Link>Assets\StoreLogo.png</Link>
+    </Content>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Wide310x150Logo.scale-200.png">
+      <Link>Assets\Wide310x150Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="Properties\Default.rd.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.13</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.2.8</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.2.8</Version>
+    </PackageReference>
+  </ItemGroup>
+  <!-- Visual Studio likes to delete the following line - but it's needed to find the tests -->
+  <Import Project="..\..\Labs\**\*.Tests.projitems" Label="Shared" />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+</Project>
--- a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Package.appxmanifest
+++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Package.appxmanifest
@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="7af355f7-0c20-4a39-9b71-8cf779ccfa82"
+            Publisher="CN=matt"
+            Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="7af355f7-0c20-4a39-9b71-8cf779ccfa82" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>CommunityToolkit.Labs.UnitTests.Uwp</DisplayName>
+    <PublisherDisplayName>matt</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="vstest.executionengine.universal.App"
+        Executable="$targetnametoken$.exe"
+        EntryPoint="CommunityToolkit.Labs.UnitTests.Uwp.App">
+      <uap:VisualElements
+        DisplayName="CommunityToolkit.Labs.UnitTests.Uwp"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
+        Description="CommunityToolkit.Labs.UnitTests.Uwp"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClientServer" />
+    <Capability Name="privateNetworkClientServer" />
+  </Capabilities>
+</Package>
--- a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/AssemblyInfo.cs
+++ 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)]
--- a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/Default.rd.xml
+++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/Properties/Default.rd.xml
@ -0,0 +1,29 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>
--- a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml
+++ b/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml
@ -0,0 +1,4 @@
+<Application x:Class="CommunityToolkit.Labs.UnitTests.Uwp.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:CommunityToolkit.Labs.UnitTests.Uwp" />
--- a/Tests/CommunityToolkit.Labs.UnitTests.Uwp/UnitTestApp.xaml.cs
+++ 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
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    sealed partial class App : Application
+    {
+        /// <summary>
+        /// 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().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        /// <summary>
+        /// 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.
+        /// </summary>
+        /// <param name="e">Details about the launch request and process.</param>
+        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);
+        }
+
+        /// <summary>
+        /// Invoked when Navigation to a certain page fails
+        /// </summary>
+        /// <param name="sender">The Frame which failed navigation</param>
+        /// <param name="e">Details about the navigation failure</param>
+        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        /// <summary>
+        /// 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.
+        /// </summary>
+        /// <param name="sender">The source of the suspend request.</param>
+        /// <param name="e">Details about the suspend request.</param>
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+            //TODO: Save application state and stop any background activity
+            deferral.Complete();
+        }
+    }
+}
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml
+++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml
@ -0,0 +1,14 @@
+<Application x:Class="CommunityToolkit.Labs.UnitTests.WinAppSdk.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:CommunityToolkit.Labs.UnitTests.WinAppSdk">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!--  Other merged dictionaries here  -->
+            </ResourceDictionary.MergedDictionaries>
+            <!--  Other app resources here  -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/App.xaml.cs
+++ 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
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    public partial class App : Application
+    {
+        /// <summary>
+        /// 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().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+        }
+
+        /// <summary>
+        /// 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.
+        /// </summary>
+        /// <param name="args">Details about the launch request and process.</param>
+        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;
+    }
+}
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj
+++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/CommunityToolkit.Labs.UnitTests.WinAppSdk.csproj
@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>CommunityToolkit.Labs.UnitTests.WinAppSdk</RootNamespace>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;arm64</Platforms>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <UseWinUI>true</UseWinUI>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\LockScreenLogo.scale-200.png" Link="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\SplashScreen.scale-200.png" Link="Assets\SplashScreen.scale-200.png" />
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square150x150Logo.scale-200.png" Link="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.scale-200.png" Link="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" Link="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\StoreLogo.png" Link="Assets\StoreLogo.png" />
+    <Content Include="..\..\Common\CommunityToolkit.Labs.Shared\Assets\Wide310x150Logo.scale-200.png" Link="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+
+  <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+       Tools extension to be activated for this project even if the Windows App SDK Nuget
+       package has not yet been restored -->
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectCapability Include="TestContainer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.2.8</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.2.8</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.TestPlatform.TestHost">
+      <Version>17.1.0</Version>
+      <ExcludeAssets>build</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Assets\" />
+  </ItemGroup>
+
+  <!-- Visual Studio likes to delete the following line - but it's needed to find the tests -->
+  <Import Project="..\..\Labs\**\*.Tests.projitems" Label="Shared" />
+</Project>
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml
+++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml
@ -0,0 +1,14 @@
+<Window x:Class="CommunityToolkit.Labs.UnitTests.WinAppSdk.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="using:CommunityToolkit.Labs.UnitTests.WinAppSdk"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d">
+
+    <StackPanel HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+        <TextBlock Text="Tests are running" />
+    </StackPanel>
+</Window>
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/MainWindow.xaml.cs
+++ 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
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Package.appxmanifest
+++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Package.appxmanifest
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="3ed6f167-5e49-430a-b27c-92f94bddbb01"
+    Publisher="CN=matt"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>CommunityToolkit.Labs.UnitTests.WinAppSdk</DisplayName>
+    <PublisherDisplayName>matt</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="CommunityToolkit.Labs.UnitTests.WinAppSdk"
+        Description="CommunityToolkit.Labs.UnitTests.WinAppSdk"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/Properties/launchSettings.json
+++ 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"
+    }
+  }
+}
--- a/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/app.manifest
+++ b/Tests/CommunityToolkit.Labs.UnitTests.WinAppSdk/app.manifest
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="CommunityToolkit.Labs.UnitTests.WinAppSdk.app"/>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- The combination of below two tags have the following effect:
+           1) Per-Monitor for >= Windows 10 Anniversary Update
+           2) System < Windows 10 Anniversary Update
+      -->
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
--- 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