Updated to WinUI3.

.gitignore

@@ -290,5 +290,6 @@ __pycache__/
 *.odx.cs
 *.xsd.cs
 /build/tools
+/build/nupkg
 
 BuildResults.xml

ColorCode.Core/ColorCode.Core.csproj

@@ -19,5 +19,5 @@
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-
+  
 </Project>

ColorCode.UWP/Common/ExtensionMethods.cs

@@ -1,9 +1,15 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 
 using System;
+#if WINUI
+using Microsoft.UI.Xaml.Media;
+
+namespace ColorCode.WinUI.Common
+#else
 using Windows.UI.Xaml.Media;
 
 namespace ColorCode.UWP.Common
+#endif
 {
     public static class ExtensionMethods
     {

ColorCode.UWP/RichTextBlockFormatter.cs

@@ -2,13 +2,21 @@
 
 using System.Collections.Generic;
 using ColorCode.Parsing;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Documents;
 using ColorCode.Styling;
 using Windows.UI.Text;
-using ColorCode.UWP.Common;
 using ColorCode.Common;
+#if WINUI
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
+using ColorCode.WinUI.Common;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Text;
+#else
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Documents;
+using ColorCode.UWP.Common;
 using Windows.UI.Xaml;
+#endif
 
 namespace ColorCode
 {

ColorCode.WinUI/ColorCode.WinUI.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
+    <SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
+    <RootNamespace>ColorCode</RootNamespace>
+    <AssemblyName>ColorCode.WinUI</AssemblyName>
+    <Title>ColorCode.WinUI</Title>
+    <Description>Contains the RichTextBlockFormatter, for rendering the Colorized Code to a RichTextBlock.</Description>
+    <PackageTags>ColorCode Syntax Highlighting SyntaxHighlighting Formatting UWP RichTextBlock Document InlineCollection</PackageTags>
+    <DefineConstants>$(DefineConstants);WINUI</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\ColorCode.UWP\Common\ExtensionMethods.cs" Link="Common\ExtensionMethods.cs" />
+    <Compile Include="..\ColorCode.UWP\RichTextBlockFormatter.cs" Link="RichTextBlockFormatter.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ColorCode.Core\ColorCode.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Common\" />
+  </ItemGroup>
+
+</Project>

ColorCode.sln

@@ -7,13 +7,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.HTML", "ColorCode
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5B9F207C-2EAB-4F77-95C7-206D65C87137}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.UWP", "ColorCode.UWP\ColorCode.UWP.csproj", "{A482CFCC-D474-4C43-A812-1B0B4E6E484F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.Core", "ColorCode.Core\ColorCode.Core.csproj", "{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.BasicTests", "Tests\ColorCode.BasicTests\ColorCode.BasicTests.csproj", "{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorCode.UWPTests", "Tests\ColorCode.UWPTests\ColorCode.UWPTests.csproj", "{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.WinUITests", "Tests\ColorCode.WinUITests\ColorCode.WinUITests.csproj", "{F1ED6BD6-2690-4BF3-835C-C3927C33424F}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "ColorCode.WinUITests (Package)", "Tests\ColorCode.WinUITests (Package)\ColorCode.WinUITests (Package).wapproj", "{DD20D31A-915E-43A2-B819-3A7AE39CA25C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.WinUI", "ColorCode.WinUI\ColorCode.WinUI.csproj", "{5B043ED5-3662-4CE5-9004-637E1739C363}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A4B1B99B-FC3A-4C76-8B46-B96723829FD2}"
 	ProjectSection(SolutionItems) = preProject
@@ -25,14 +27,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.json = version.json
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.UWP", "ColorCode.UWP\ColorCode.UWP.csproj", "{9A628641-BF6E-439F-AF60-BF9E471D45AF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorCode.UWPTests", "Tests\ColorCode.UWPTests\ColorCode.UWPTests.csproj", "{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
@@ -41,6 +49,8 @@ Global
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|ARM.Build.0 = Debug|Any CPU
+		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -49,30 +59,18 @@ Global
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|ARM.ActiveCfg = Release|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|ARM.Build.0 = Release|Any CPU
+		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|ARM64.Build.0 = Release|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|x64.ActiveCfg = Release|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|x64.Build.0 = Release|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|x86.ActiveCfg = Release|Any CPU
 		{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}.Release|x86.Build.0 = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|x64.Build.0 = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Debug|x86.Build.0 = Debug|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|ARM.Build.0 = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|x64.ActiveCfg = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|x64.Build.0 = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|x86.ActiveCfg = Release|Any CPU
-		{A482CFCC-D474-4C43-A812-1B0B4E6E484F}.Release|x86.Build.0 = Release|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -81,6 +79,8 @@ Global
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|ARM.ActiveCfg = Release|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|ARM.Build.0 = Release|Any CPU
+		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|ARM64.Build.0 = Release|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|x64.ActiveCfg = Release|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|x64.Build.0 = Release|Any CPU
 		{F6DE802C-9BD7-4BFA-9553-BCBF51E0556B}.Release|x86.ActiveCfg = Release|Any CPU
@@ -89,21 +89,100 @@ Global
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|ARM.ActiveCfg = Release|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|ARM.Build.0 = Release|Any CPU
+		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|ARM64.Build.0 = Release|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|x64.ActiveCfg = Release|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|x64.Build.0 = Release|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|x86.ActiveCfg = Release|Any CPU
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10}.Release|x86.Build.0 = Release|Any CPU
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|ARM.ActiveCfg = Debug|x86
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|ARM64.Build.0 = Debug|arm64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|x64.ActiveCfg = Debug|x64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|x64.Build.0 = Debug|x64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|x86.ActiveCfg = Debug|x86
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Debug|x86.Build.0 = Debug|x86
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|Any CPU.ActiveCfg = Release|x64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|ARM.ActiveCfg = Release|x86
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|ARM64.ActiveCfg = Release|x86
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|x64.ActiveCfg = Release|x64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|x64.Build.0 = Release|x64
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|x86.ActiveCfg = Release|x86
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F}.Release|x86.Build.0 = Release|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|ARM.ActiveCfg = Debug|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|x64.ActiveCfg = Debug|x64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|x64.Build.0 = Debug|x64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|x64.Deploy.0 = Debug|x64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|x86.ActiveCfg = Debug|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|x86.Build.0 = Debug|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Debug|x86.Deploy.0 = Debug|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|Any CPU.ActiveCfg = Release|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|ARM.ActiveCfg = Release|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|ARM64.ActiveCfg = Release|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|x64.ActiveCfg = Release|x64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|x64.Build.0 = Release|x64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|x64.Deploy.0 = Release|x64
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|x86.ActiveCfg = Release|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|x86.Build.0 = Release|x86
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C}.Release|x86.Deploy.0 = Release|x86
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|ARM.Build.0 = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|ARM64.Build.0 = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|x64.Build.0 = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B043ED5-3662-4CE5-9004-637E1739C363}.Release|x86.Build.0 = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|ARM.Build.0 = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|ARM64.Build.0 = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|x64.Build.0 = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A628641-BF6E-439F-AF60-BF9E471D45AF}.Release|x86.Build.0 = Release|Any CPU
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|ARM.Build.0 = Debug|ARM
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|ARM.Deploy.0 = Debug|ARM
+		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|ARM64.ActiveCfg = Debug|x86
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|x64.ActiveCfg = Debug|x64
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|x64.Build.0 = Debug|x64
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Debug|x64.Deploy.0 = Debug|x64
@@ -114,6 +193,7 @@ Global
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|ARM.ActiveCfg = Release|ARM
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|ARM.Build.0 = Release|ARM
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|ARM.Deploy.0 = Release|ARM
+		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|ARM64.ActiveCfg = Release|x86
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|x64.ActiveCfg = Release|x64
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|x64.Build.0 = Release|x64
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3}.Release|x64.Deploy.0 = Release|x64
@@ -126,6 +206,8 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{A3E27CD2-6D33-44D3-962F-E56C4CD25F10} = {5B9F207C-2EAB-4F77-95C7-206D65C87137}
+		{F1ED6BD6-2690-4BF3-835C-C3927C33424F} = {5B9F207C-2EAB-4F77-95C7-206D65C87137}
+		{DD20D31A-915E-43A2-B819-3A7AE39CA25C} = {5B9F207C-2EAB-4F77-95C7-206D65C87137}
 		{A3D5A8A5-1D1F-412D-A829-C3DC1C7D4DF3} = {5B9F207C-2EAB-4F77-95C7-206D65C87137}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution