diff --git a/Directory.Build.targets b/Directory.Build.targets
index fe20c19ab..98ac3c342 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -53,13 +53,13 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" Condition=" '$(IsPackage)' != 'true' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" Condition=" '$(IsPackage)' != 'true' ">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
 
     <!-- GitVersionTask is not compiled against .NET Core, so importing the targets will
          result in a failure because it will try to resolve Microsoft.Build.Utilities v4.0 -->
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" Condition=" '$(MSBuildRuntimeType)' != 'Core' AND Exists('$(MSBuildThisFileDirectory)\.git') ">
+    <PackageReference Include="GitVersionTask" Version="4.0.0" Condition=" '$(MSBuildRuntimeType)' != 'Core' AND Exists('$(MSBuildThisFileDirectory)\.git') ">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/GitVersion.yml b/GitVersion.yml
index d672456c7..29ca00e96 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -5,9 +5,10 @@ branches:
     regex: master
     tag: alpha
     prevent-increment-of-merged-branch-version: true
-  dev:
+  develop:
     regex: dev(elop)?(ment)?$
     tag: unstable
+    source-branches: ['master']
   pull-request:
     regex: (pull|pull\-requests|pr)[/-]
     mode: ContinuousDelivery
diff --git a/PortabilityTools.VisualStudio.Imports.targets b/PortabilityTools.VisualStudio.Imports.targets
index ae8219a76..b9955eacf 100644
--- a/PortabilityTools.VisualStudio.Imports.targets
+++ b/PortabilityTools.VisualStudio.Imports.targets
@@ -13,7 +13,6 @@
   -->
   <Target Name="AddToVsixSources" AfterTargets="GetVsixSourceItems">
     <ItemGroup>
-      <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2017.dll" />
       <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.Common.dll" />
       <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.dll" />
       <VSIXSourceItem Include="$(OutputPath)\Autofac.dll" />
diff --git a/PortabilityTools.sln b/PortabilityTools.sln
index 84eaf6b9b..d6a44a70c 100644
--- a/PortabilityTools.sln
+++ b/PortabilityTools.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28210.120
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.168
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C991F5FC-04B5-420C-98A0-80974AA946F7}"
 	ProjectSection(SolutionItems) = preProject
@@ -84,1018 +84,106 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{CB5759DE-9D7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.DGML", "src\lib\Microsoft.Fx.Portability.Reports.DGML\Microsoft.Fx.Portability.Reports.DGML.csproj", "{1B6E53A7-9180-4D79-9556-E5CE59483EA1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2019", "src\ApiPort\ApiPort.VisualStudio.2019\ApiPort.VisualStudio.2019.csproj", "{7A3B2571-82C2-4306-ADCB-8B67DBA395BC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Osx_Debug|Any CPU = Osx_Debug|Any CPU
-		Osx_Debug|ARM = Osx_Debug|ARM
-		Osx_Debug|x64 = Osx_Debug|x64
-		Osx_Debug|x86 = Osx_Debug|x86
-		Osx_Release|Any CPU = Osx_Release|Any CPU
-		Osx_Release|ARM = Osx_Release|ARM
-		Osx_Release|x64 = Osx_Release|x64
-		Osx_Release|x86 = Osx_Release|x86
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-		Ubuntu_Debug|Any CPU = Ubuntu_Debug|Any CPU
-		Ubuntu_Debug|ARM = Ubuntu_Debug|ARM
-		Ubuntu_Debug|x64 = Ubuntu_Debug|x64
-		Ubuntu_Debug|x86 = Ubuntu_Debug|x86
-		Ubuntu_Release|Any CPU = Ubuntu_Release|Any CPU
-		Ubuntu_Release|ARM = Ubuntu_Release|ARM
-		Ubuntu_Release|x64 = Ubuntu_Release|x64
-		Ubuntu_Release|x86 = Ubuntu_Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|x64.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Debug|x86.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|ARM.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|x64.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|x64.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|x86.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Release|x86.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|x64.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Debug|x86.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|ARM.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|x64.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|x64.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|x86.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Release|x86.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|ARM.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|x64.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Debug|x86.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|ARM.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|ARM.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|x64.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|x64.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|x86.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Release|x86.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|ARM.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|x64.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Debug|x86.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|ARM.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|x64.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|x64.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|x86.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Release|x86.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|x64.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Debug|x86.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|ARM.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|x64.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|x86.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Release|x86.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{8D84EC23-9977-4CC8-B649-035FFAE9664C}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|ARM.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|ARM.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|x64.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|x64.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|x86.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Release|x86.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{68C6476E-1F80-412A-A8A7-480F832922D8}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|x64.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Debug|x86.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|ARM.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|x64.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|x64.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|x86.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Release|x86.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{36E8F09A-D3CA-405B-B515-9206F85B432C}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|ARM.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|ARM.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|ARM.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|x64.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Release|x86.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|ARM.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|x64.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Debug|x86.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Release|ARM.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Osx_Release|x86.ActiveCfg = Debug|Any CPU
 		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|ARM.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|ARM.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|x64.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|x64.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|x86.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Release|x86.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Release|ARM.ActiveCfg = Debug|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}.Ubuntu_Release|x86.ActiveCfg = Debug|Any CPU
 		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|x64.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Debug|x86.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|ARM.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|x64.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|x64.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|x86.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Release|x86.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Debug|x86.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|ARM.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|x64.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Release|x86.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{C4301817-D6F9-43A4-9E24-5446C0A2C15C}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|x64.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Debug|x86.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|ARM.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|x64.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|x64.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|x86.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Release|x86.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{D15030D8-CFC5-4F05-8987-784326856E90}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|x64.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Debug|x86.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|ARM.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|x64.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|x64.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|x86.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Release|x86.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{B0468D19-0F98-49A8-BA28-926331C72E26}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|x64.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Debug|x86.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|ARM.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|x64.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|x64.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Release|x86.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|ARM.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|x64.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Debug|x86.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{6917BF09-E416-43F9-B184-4691AF473271}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6917BF09-E416-43F9-B184-4691AF473271}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Release|ARM.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Release|ARM.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Release|x64.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Release|x64.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Release|x86.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Release|x86.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{6917BF09-E416-43F9-B184-4691AF473271}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|ARM.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|x64.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Debug|x86.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|ARM.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|ARM.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|x64.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|x64.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|x86.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Release|x86.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|x64.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|x86.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|ARM.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|x64.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|x64.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|x86.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Release|x86.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|ARM.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|x64.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Debug|x86.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|ARM.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|x64.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Release|x86.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{60798B82-B273-4D39-AA52-021C7228A0AD}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|x64.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Debug|x86.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{EE708186-6345-486D-9810-17D98439DAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE708186-6345-486D-9810-17D98439DAAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Release|ARM.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Release|x64.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Release|x64.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Release|x86.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Release|x86.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{EE708186-6345-486D-9810-17D98439DAAE}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|x64.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Debug|x86.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|ARM.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|x64.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|x64.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Release|x86.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{47008779-1D31-4E0C-B21A-5F4FB84470A0}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|ARM.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|x64.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Release|x86.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|ARM.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x64.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Debug|x86.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Osx_Release|x86.Build.0 = Release|Any CPU
 		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|ARM.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x64.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x64.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x86.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Release|x86.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{1B6E53A7-9180-4D79-9556-E5CE59483EA1}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
+		{7A3B2571-82C2-4306-ADCB-8B67DBA395BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A3B2571-82C2-4306-ADCB-8B67DBA395BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A3B2571-82C2-4306-ADCB-8B67DBA395BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A3B2571-82C2-4306-ADCB-8B67DBA395BC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1127,6 +215,7 @@ Global
 		{C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
 		{CB5759DE-9D7B-4B21-89BC-E81920D611BB} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
 		{1B6E53A7-9180-4D79-9556-E5CE59483EA1} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
+		{7A3B2571-82C2-4306-ADCB-8B67DBA395BC} = {0D1724F6-078E-4576-9680-6B9334D562DC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8E8B2DB2-4847-4909-8631-A995D50F10EF}
diff --git a/README.md b/README.md
index bbde69e76..0bb4a546d 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Download and build for yourself:
   * Example: `dotnet ApiPort.dll analyze -f Foo.dll -r HTML`
 5. For convenience, create an alias command adding the following to your `~/.bash_profile`. Replace `{dotnet-apiport-folder}` with the path where you cloned the repo.
 ```
-alias apiport="dotnet {dotnet-apiport-folder}/bin/Debug/ApiPort/netcoreapp2.0/ApiPort.dll"
+alias apiport="dotnet {dotnet-apiport-folder}/bin/Debug/ApiPort/netcoreapp2.1/ApiPort.dll"
 ```
 This will alow you to use apiport globally from the command line: `apiport analyze -f Foo.dll -r HTML`
 
diff --git a/build.sh b/build.sh
index 492ba41f8..fbb4b2e20 100755
--- a/build.sh
+++ b/build.sh
@@ -8,104 +8,111 @@ export NUGET_HTTP_CACHE_PATH=~/.local/share/NuGet/v3-cache
 
 Configuration=Debug
 
-RootDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+RootDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DotNetSDKPath=$RootDir"/.tools/dotnet/"$DotNetSDKVersion
 DotNetExe=$DotNetSDKPath"/dotnet"
 
 TestResults=$RootDir"/TestResults"
 
-usage() { echo "Usage: build.sh [-c|--configuration <Debug|Release>]"; }
+usage() {
+	echo "Usage: build.sh [-c|--configuration <Debug|Release>] [--downloadCatalog]"
+}
 
-prebuild() {
-    $DotNetExe restore
+downloadCatalog() {
+	local isForce=$1
+	local catalog=$RootDir"/.data/catalog.bin"
+	local data=$(dirname $catalog)
 
-    local catalog=$RootDir"/.data/catalog.bin"
-    local data=$(dirname $catalog)
+	if [[ ! -e $data ]]; then
+		mkdir $data
+	fi
 
-    if [[ ! -e $data ]]; then
-        mkdir $data
-    fi
+	if [[ $isForce == "true" && -e $catalog ]]; then
+		echo "Deleting existing catalog"
+		rm $catalog
+	fi
 
-    if [[ ! -e $catalog ]]; then
-        echo "Downloading catalog.bin..."
-        curl --output $catalog "https://portability.blob.core.windows.net/catalog/catalog.bin"
-    fi
+	if [[ ! -e $catalog ]]; then
+		echo "Downloading catalog.bin..."
+		curl --output $catalog "https://portability.blob.core.windows.net/catalog/catalog.bin"
+	fi
 }
 
 installSDK() {
-    if [[ -e $DotNetExe ]]; then
-        echo $DotNetExe" exists.  Skipping install..."
-        return 0
-    fi
+	if [[ -e $DotNetExe ]]; then
+		echo $DotNetExe" exists.  Skipping install..."
+		return 0
+	fi
 
-    local DotNetToolsPath=$(dirname $DotNetSDKPath)
+	local DotNetToolsPath=$(dirname $DotNetSDKPath)
 
-    if [ ! -d $DotNetToolsPath ]; then
-        mkdir -p $DotNetToolsPath
-    fi
+	if [ ! -d $DotNetToolsPath ]; then
+		mkdir -p $DotNetToolsPath
+	fi
 
-    curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel Current --install-dir $DotNetSDKPath
+	curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel Current --install-dir $DotNetSDKPath
 }
 
 build() {
-    echo "Building ApiPort... Configuration: ["$Configuration"]"
+	echo "Building ApiPort... Configuration: ["$Configuration"]"
 
-    pushd src/ApiPort/ApiPort > /dev/null
-    $DotNetExe build ApiPort.csproj -f netcoreapp2.0 -c $Configuration
-    $DotNetExe build ApiPort.Offline.csproj -f netcoreapp2.0 -c $Configuration
-    popd > /dev/null
+	pushd src/ApiPort/ApiPort >/dev/null
+	$DotNetExe build ApiPort.csproj -f netcoreapp2.1 -c $Configuration
+	$DotNetExe build ApiPort.Offline.csproj -f netcoreapp2.1 -c $Configuration
+	popd >/dev/null
 }
 
 runTest() {
-    ls $1/*.csproj | while read file
-    do
-        if awk -F: '/<TargetFramework>netcoreapp[1-9]\.[0-9]<\/TargetFramework>/ { found = 1 } END { if (found == 1) { exit 0 } else { exit 1 } }' $file; then
-            echo "Testing "$file
-            $DotNetExe test $file -c $Configuration --logger trx
-        else
-            # Can remove this when: https://github.com/dotnet/sdk/issues/335 is resolved
-            echo "Skipping "$file
-            echo "--- Desktop .NET Framework testing is not currently supported on Unix."
-        fi
-    done
-
-    if [ ! -d $TestResults ]; then
-        mkdir $TestResults
-    fi
-
-    find $RootDir/tests/ -type f -name "*.trx" | while read line
-    do
-        mv $line $TestResults/
-    done
+	ls $1/*.csproj | while read file; do
+		if awk -F: '/<TargetFramework>netcoreapp[1-9]\.[0-9]<\/TargetFramework>/ { found = 1 } END { if (found == 1) { exit 0 } else { exit 1 } }' $file; then
+			echo "Testing "$file
+			$DotNetExe test $file -c $Configuration --logger trx
+		else
+			# Can remove this when: https://github.com/dotnet/sdk/issues/335 is resolved
+			echo "Skipping "$file
+			echo "--- Desktop .NET Framework testing is not currently supported on Unix."
+		fi
+	done
+
+	if [ ! -d $TestResults ]; then
+		mkdir $TestResults
+	fi
+
+	find $RootDir/tests/ -type f -name "*.trx" | while read line; do
+		mv $line $TestResults/
+	done
 }
 
-while [[ $# -gt 0 ]]
-do
-    option="$(echo $1 | awk '{print tolower($0)}')"
-    case "$option" in
-        "-?" | "--help" )
-        usage
-        exit 1
-        ;;
-        "-c" | "--configuration")
-        Configuration="$2"
-        shift 2
-        ;;
-        *)
-        echo "Unknown option: "$option
-        usage
-        exit 1
-        ;;
-    esac
+while [[ $# -gt 0 ]]; do
+	option="$(echo $1 | awk '{print tolower($0)}')"
+	case "$option" in
+	"-?" | "--help")
+		usage
+		exit 1
+		;;
+	"-c" | "--configuration")
+		Configuration="$2"
+		shift 2
+		;;
+	"--downloadcatalog")
+		downloadCatalog "true"
+		exit 0
+		;;
+	*)
+		echo "Unknown option: "$option
+		usage
+		exit 1
+		;;
+	esac
 done
 
 # Enable insensitive case-matching
 shopt -s nocasematch
 
 if [[ "$Configuration" != "Debug" && "$Configuration" != "Release" ]]; then
-    echo "ERROR: Supported configuration types are Debug or Release.  Invalid configuration: "$Configuration
-    usage
-    exit 3
+	echo "ERROR: Supported configuration types are Debug or Release.  Invalid configuration: "$Configuration
+	usage
+	exit 3
 fi
 
 shopt -u nocasematch
@@ -113,17 +120,16 @@ shopt -u nocasematch
 installSDK
 
 if [[ ! -e $DotNetExe ]]; then
-    echo "ERROR: It should have been installed from build/dotnet-install.sh"
-    exit 2
+	echo "ERROR: It should have been installed from build/dotnet-install.sh"
+	exit 2
 fi
 
-prebuild
+downloadCatalog
 
 build
 
-find tests/ -type d -name "*\.Tests" | while read file
-do
-    runTest $file
+find tests/ -type d -name "*\.Tests" | while read file; do
+	runTest $file
 done
 
 echo "Finished!"
diff --git a/netci.groovy b/netci.groovy
deleted file mode 100644
index ad47c14bc..000000000
--- a/netci.groovy
+++ /dev/null
@@ -1,54 +0,0 @@
-// Import the utility functionality.
-import jobs.generation.Utilities;
-
-def project = GithubProject
-def branch = GithubBranchName
-def configurationGroups = ['Debug', 'Release']
-def outerloopPlatforms = ['Windows_NT', 'Ubuntu16.04', 'OSX10.12']
-
-// Generate the builds for debug and release, commit and PRJob
-[true, false].each { isPR -> // Defines a closure over true and false, value assigned to isPR
-    configurationGroups.each { configuration ->
-        outerloopPlatforms.each { os ->
-            def name = "${os.toLowerCase()}_${configuration.toLowerCase()}"
-            def newJobName = Utilities.getFullJobName(project, name, isPR)
-            def newJob = job(newJobName)
-
-            if (os == 'Windows_NT') {
-                newJob.with {
-                    steps {
-                        powerShell(".\\build.ps1 -Configuration ${configuration} -Platform AnyCPU -RunTests")
-                    }
-                }
-
-                Utilities.setMachineAffinity(newJob, os, 'latest-dev15-5')
-            } else {
-                newJob.with {
-                    steps {
-                        shell("./build.sh --configuration ${configuration}")
-                    }
-                }
-
-                Utilities.setMachineAffinity(newJob, os, 'latest-or-auto')
-            }
-
-            // This call performs remaining common job setup on the newly created job.
-            // It does the following:
-            //   1. Sets up source control for the project.
-            //   2. Adds standard options for build retention and timeouts
-            //   3. Adds standard parameters for PR and push jobs.
-            Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
-            Utilities.addMSTestResults(newJob, 'TestResults/*.trx')
-
-            // The following two calls add triggers for push and PR jobs
-            // In Github, the PR trigger will appear as "Windows Debug" and "Windows Release" and will be run
-            // by default
-            if (isPR) {
-                Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${configuration}")
-            }
-            else {
-                Utilities.addGithubPushTrigger(newJob)
-            }
-        }
-    }
-}
diff --git a/rules.ruleset b/rules.ruleset
index 22f79357e..fbfa50a95 100644
--- a/rules.ruleset
+++ b/rules.ruleset
@@ -24,6 +24,7 @@
     <Rule Id="CA2007" Action="None" />
     <Rule Id="CA2211" Action="None" />
     <Rule Id="CA2227" Action="None" />
+    <Rule Id="CA2237" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeQuality.CSharp.Analyzers" RuleNamespace="Microsoft.CodeQuality.CSharp.Analyzers">
     <Rule Id="CA1032" Action="None" />
diff --git a/src/ApiPort/ApiPort.VisualStudio.2017/ApiPort.VisualStudio.2017.csproj b/src/ApiPort/ApiPort.VisualStudio.2017/ApiPort.VisualStudio.2017.csproj
index 212937cae..fb9ead347 100644
--- a/src/ApiPort/ApiPort.VisualStudio.2017/ApiPort.VisualStudio.2017.csproj
+++ b/src/ApiPort/ApiPort.VisualStudio.2017/ApiPort.VisualStudio.2017.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net46</TargetFramework>
-    <RootNamespace>ApiPortVS.VS2017</RootNamespace>
+    <RootNamespace>ApiPortVS</RootNamespace>
+    <DefineConstants>$(DefineConstants);VS2017</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.6.2" />
     <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.4.27004">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
diff --git a/src/ApiPort/ApiPort.VisualStudio.2017/ProjectBuilder2017.cs b/src/ApiPort/ApiPort.VisualStudio.2017/ProjectBuilder.cs
similarity index 93%
rename from src/ApiPort/ApiPort.VisualStudio.2017/ProjectBuilder2017.cs
rename to src/ApiPort/ApiPort.VisualStudio.2017/ProjectBuilder.cs
index 0d0e42bd7..5d3f6e810 100644
--- a/src/ApiPort/ApiPort.VisualStudio.2017/ProjectBuilder2017.cs
+++ b/src/ApiPort/ApiPort.VisualStudio.2017/ProjectBuilder.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Composition;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
@@ -18,15 +19,16 @@
 
 using static Microsoft.Fx.Portability.Utils.FormattableStringHelper;
 
-namespace ApiPortVS.VS2017
+namespace ApiPortVS
 {
-    public class ProjectBuilder2017 : DefaultProjectBuilder
+    [Export(typeof(IProjectBuilder))]
+    public class ProjectBuilder : DefaultProjectBuilder
     {
-        public ProjectBuilder2017(
-            IVsSolutionBuildManager2 buildManager,
-            IProjectMapper projectMapper)
-            : base(buildManager, projectMapper)
-        { }
+        [ImportingConstructor]
+        public ProjectBuilder(IBuildServices buildServices, IProjectMapper projectMapper)
+            : base(buildServices.BuildManager, projectMapper)
+        {
+        }
 
         /// <summary>
         /// Tries to fetch output items if it uses Common Project System then
diff --git a/src/ApiPort/ApiPort.VisualStudio.2017/ServiceProvider2017.cs b/src/ApiPort/ApiPort.VisualStudio.2017/ServiceProvider2017.cs
deleted file mode 100644
index 610c13d19..000000000
--- a/src/ApiPort/ApiPort.VisualStudio.2017/ServiceProvider2017.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using ApiPortVS.Contracts;
-using ApiPortVS.VS2017;
-using Autofac;
-using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.ProjectSystem;
-using Microsoft.VisualStudio.Shell;
-using System;
-
-namespace ApiPortVS
-{
-    public static class ServiceProvider2017
-    {
-        public static void AddVS2017(this ContainerBuilder builder, IComponentModel componentModel)
-        {
-            ThreadHelper.ThrowIfNotOnUIThread();
-
-            var projectServiceAccessor = componentModel.GetService<IProjectServiceAccessor>();
-
-            builder.RegisterInstance(projectServiceAccessor.GetProjectService());
-
-            builder.RegisterAdapter<IProjectService, IProjectThreadingService>(service => service.Services.ThreadingPolicy);
-            builder.RegisterType<ProjectBuilder2017>()
-                .As<IProjectBuilder>()
-                .SingleInstance();
-        }
-    }
-}
diff --git a/src/ApiPort/ApiPort.VisualStudio.2019/ApiPort.VisualStudio.2019.csproj b/src/ApiPort/ApiPort.VisualStudio.2019/ApiPort.VisualStudio.2019.csproj
new file mode 100644
index 000000000..3e0568971
--- /dev/null
+++ b/src/ApiPort/ApiPort.VisualStudio.2019/ApiPort.VisualStudio.2019.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net46</TargetFramework>
+    <RootNamespace>ApiPortVS</RootNamespace>
+    <DefineConstants>$(DefineConstants);VS2019</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\ApiPort.VisualStudio.2017\ProjectBuilder.cs" Link="ProjectBuilder.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="16.0.189-g83e7c53a57">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.ProjectSystem" Version="16.0.374-pre">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj" />
+    <ProjectReference Include="..\..\lib\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj" />
+ </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/ApiPort/ApiPort.VisualStudio.Common/BuildServices.cs b/src/ApiPort/ApiPort.VisualStudio.Common/BuildServices.cs
new file mode 100644
index 000000000..d5bc574d5
--- /dev/null
+++ b/src/ApiPort/ApiPort.VisualStudio.Common/BuildServices.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using System.ComponentModel.Composition;
+
+namespace ApiPortVS
+{
+    [Export(typeof(IBuildServices))]
+    public class BuildServices : IBuildServices
+    {
+        public BuildServices()
+        {
+            BuildManager = (IVsSolutionBuildManager2)Package.GetGlobalService(typeof(SVsSolutionBuildManager));
+        }
+
+        public IVsSolutionBuildManager2 BuildManager { get; }
+    }
+}
diff --git a/src/ApiPort/ApiPort.VisualStudio.Common/ComProjectMapper.cs b/src/ApiPort/ApiPort.VisualStudio.Common/ComProjectMapper.cs
index d007329d1..38ece3561 100644
--- a/src/ApiPort/ApiPort.VisualStudio.Common/ComProjectMapper.cs
+++ b/src/ApiPort/ApiPort.VisualStudio.Common/ComProjectMapper.cs
@@ -7,6 +7,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using System;
+using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Threading.Tasks;
 
@@ -17,6 +18,7 @@ namespace ApiPortVS
     /// <summary>
     /// You need to switch to the UI thread before calling any COM interfaces (e.g. IVsHierarchy) using
     /// </summary>
+    [Export(typeof(IProjectMapper))]
     public class COMProjectMapper : IProjectMapper
     {
         /// <summary>
diff --git a/src/ApiPort/ApiPort.VisualStudio.Common/DefaultProjectBuilder.cs b/src/ApiPort/ApiPort.VisualStudio.Common/DefaultProjectBuilder.cs
index 8b5436a22..c41d5a59d 100644
--- a/src/ApiPort/ApiPort.VisualStudio.Common/DefaultProjectBuilder.cs
+++ b/src/ApiPort/ApiPort.VisualStudio.Common/DefaultProjectBuilder.cs
@@ -132,6 +132,12 @@ public virtual async Task<IEnumerable<string>> GetBuildOutputFilesAsync(Project
                 return new[] { finalOutputPath as string };
             }
 
+            // This is used for some projects, such as C++/CLI
+            if (ErrorHandler.Succeeded(keyGroup.get_DeploySourceURL(out var url)))
+            {
+                return new[] { new Uri(url).LocalPath };
+            }
+
             return null;
         }
 
diff --git a/src/ApiPort/ApiPort.VisualStudio.Common/IBuildServices.cs b/src/ApiPort/ApiPort.VisualStudio.Common/IBuildServices.cs
new file mode 100644
index 000000000..e745e63fb
--- /dev/null
+++ b/src/ApiPort/ApiPort.VisualStudio.Common/IBuildServices.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.Shell.Interop;
+
+namespace ApiPortVS
+{
+    public interface IBuildServices
+    {
+        IVsSolutionBuildManager2 BuildManager { get; }
+    }
+}
diff --git a/src/ApiPort/ApiPort.VisualStudio/ApiPort.VisualStudio.csproj b/src/ApiPort/ApiPort.VisualStudio/ApiPort.VisualStudio.csproj
index bb2b51042..69fc9aa98 100644
--- a/src/ApiPort/ApiPort.VisualStudio/ApiPort.VisualStudio.csproj
+++ b/src/ApiPort/ApiPort.VisualStudio/ApiPort.VisualStudio.csproj
@@ -127,10 +127,6 @@
     <None Include="Resources\Images.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj">
-      <Project>{c0629a8d-7107-46cf-83b8-408e1886ab36}</Project>
-      <Name>ApiPort.VisualStudio.2017</Name>
-    </ProjectReference>
     <ProjectReference Include="..\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj">
       <Project>{60798b82-b273-4d39-aa52-021c7228a0ad}</Project>
       <Name>ApiPort.VisualStudio.Common</Name>
diff --git a/src/ApiPort/ApiPort.VisualStudio/ServiceProvider.cs b/src/ApiPort/ApiPort.VisualStudio/ServiceProvider.cs
index 3043843f5..040357e39 100644
--- a/src/ApiPort/ApiPort.VisualStudio/ServiceProvider.cs
+++ b/src/ApiPort/ApiPort.VisualStudio/ServiceProvider.cs
@@ -114,9 +114,6 @@ public static async Task<ServiceProvider> CreateAsync(ApiPortVSPackage servicePr
             builder.RegisterType<ProjectAnalyzer>()
                 .AsSelf()
                 .InstancePerLifetimeScope();
-            builder.RegisterType<COMProjectMapper>()
-                .As<IProjectMapper>()
-                .SingleInstance();
 
             // Register option pane services
             builder.RegisterType<OptionsPageControl>()
@@ -158,19 +155,17 @@ private static async Tasks.Task RegisterVisualStudioComponentsAsync(ContainerBui
 
             builder.RegisterComInstance<SVsWebProxy, IVsWebProxy>();
             builder.RegisterComInstance<SVsWebBrowsingService, IVsWebBrowsingService>();
-            builder.RegisterComInstance<SVsSolutionBuildManager, IVsSolutionBuildManager2>();
             builder.RegisterComInstance<SVsStatusbar, IVsStatusbar>();
 
             builder.RegisterCom<DTE>(await serviceProvider.GetServiceAsync(typeof(DTE)));
 
-            builder.RegisterType<DefaultProjectBuilder>()
-                .As<IProjectBuilder>();
+            var componentModel = await serviceProvider.GetServiceAsync(typeof(SComponentModel)) as IComponentModel;
+
+            builder.RegisterInstance(componentModel.GetService<IProjectBuilder>());
+            builder.RegisterInstance(componentModel.GetService<IProjectMapper>());
 
             var outputWindow = await serviceProvider.GetServiceAsync(typeof(SVsOutputWindow));
             builder.RegisterCom<IVsOutputWindowPane>(BuildPane((IVsOutputWindow)outputWindow));
-
-            var componentModel = await serviceProvider.GetServiceAsync(typeof(SComponentModel));
-            builder.AddVS2017((IComponentModel)componentModel);
         }
 
         public static IVsOutputWindowPane BuildPane(IVsOutputWindow outputWindow)
diff --git a/src/ApiPort/ApiPort.Vsix/ApiPort.Vsix.csproj b/src/ApiPort/ApiPort.Vsix/ApiPort.Vsix.csproj
index 7c2a216a0..e642df7bb 100644
--- a/src/ApiPort/ApiPort.Vsix/ApiPort.Vsix.csproj
+++ b/src/ApiPort/ApiPort.Vsix/ApiPort.Vsix.csproj
@@ -68,6 +68,24 @@
     <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.6.170" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj">
+      <Project>{C0629A8D-7107-46CF-83B8-408E1886AB36}</Project>
+      <Name>ApiPort.VisualStudio.2017</Name>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
+    <ProjectReference Include="..\ApiPort.VisualStudio.2019\ApiPort.VisualStudio.2019.csproj">
+      <Project>{0A48BC2C-3421-4E8F-B7BC-4E584D821AA3}</Project>
+      <Name>ApiPort.VisualStudio.2019</Name>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
+    <ProjectReference Include="..\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj">
+      <Project>{60798B82-B273-4D39-AA52-021C7228A0AD}</Project>
+      <Name>ApiPort.VisualStudio.Common</Name>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
     <ProjectReference Include="..\ApiPort.VisualStudio\ApiPort.VisualStudio.csproj">
       <Project>{d15030d8-cfc5-4f05-8987-784326856e90}</Project>
       <Name>ApiPort.VisualStudio</Name>
diff --git a/src/ApiPort/ApiPort.Vsix/source.extension.vsixmanifest b/src/ApiPort/ApiPort.Vsix/source.extension.vsixmanifest
index bb9e8ea75..75a674619 100644
--- a/src/ApiPort/ApiPort.Vsix/source.extension.vsixmanifest
+++ b/src/ApiPort/ApiPort.Vsix/source.extension.vsixmanifest
@@ -22,6 +22,9 @@
     </Dependencies>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="ApiPort.VisualStudio" Path="|ApiPort.VisualStudio;PkgdefProjectOutputGroup|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ApiPort.VisualStudio.2017" TargetVersion="[15.0,16.0)" Path="|ApiPort.VisualStudio.2017|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ApiPort.VisualStudio.Common" Path="|ApiPort.VisualStudio.Common|" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ApiPort.VisualStudio.2019" TargetVersion="[16.0,17.0)" Path="|ApiPort.VisualStudio.2019|" />
     </Assets>
     <Prerequisites>
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
diff --git a/src/ApiPort/ApiPort/ApiPort.props b/src/ApiPort/ApiPort/ApiPort.props
index 5d2c6162b..310be3f2b 100644
--- a/src/ApiPort/ApiPort/ApiPort.props
+++ b/src/ApiPort/ApiPort/ApiPort.props
@@ -7,8 +7,7 @@
       netcoreapp target must be first to avoid a ResXFileCodeGenerator issue
       (tracked at https://github.com/dotnet/project-system/issues/1519)
     -->
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;ubuntu.14.04-x64;ubuntu.17.04-x64</RuntimeIdentifiers>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <IsPackable>false</IsPackable>
@@ -24,27 +23,16 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
 
-  <!-- FxCop does not understand this target platform and will output an error similar to the following:
-    MSBUILD : error : CA0055 : Could not identify platform for 'bin\Debug\ApiPort\netcoreapp1.0\ApiPort.dll'
-    MSBUILD : error : CA0052 : No targets were selected.
-    -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.6.2" />
-    <PackageReference Include="Autofac.Configuration" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Autofac.Configuration" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="System.CommandLine" Version="0.1.0-e171125-2" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-    <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
-    <PackageReference Include="System.Security.SecureString" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ApiPort/ApiPort/DocIdSearchRepl.cs b/src/ApiPort/ApiPort/DocIdSearchRepl.cs
index 15316459e..74e19bbdd 100644
--- a/src/ApiPort/ApiPort/DocIdSearchRepl.cs
+++ b/src/ApiPort/ApiPort/DocIdSearchRepl.cs
@@ -71,7 +71,7 @@ private async Task ReplLoopAsync()
                 if (query.StartsWith(LocalizedStrings.ReplOptionCount, StringComparison.OrdinalIgnoreCase))
                 {
                     var trimmed = query
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
                         .Replace(LocalizedStrings.ReplOptionCount, string.Empty, StringComparison.OrdinalIgnoreCase)
 #else
                         .Replace(LocalizedStrings.ReplOptionCount, string.Empty)
diff --git a/src/ApiPort/ApiPort/Proxy/WebProxy.cs b/src/ApiPort/ApiPort/Proxy/WebProxy.cs
index 9f8633e03..4db9c530f 100644
--- a/src/ApiPort/ApiPort/Proxy/WebProxy.cs
+++ b/src/ApiPort/ApiPort/Proxy/WebProxy.cs
@@ -81,7 +81,7 @@ private static string WildcardToRegex(string pattern)
         {
             string Replace(string content, string oldValue, string newValue)
             {
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
                 return content.Replace(oldValue, newValue, StringComparison.Ordinal);
 #else
                 return content.Replace(oldValue, newValue);
diff --git a/tests/ApiPort/ApiPort.Tests/ApiPort.Tests.csproj b/tests/ApiPort/ApiPort.Tests/ApiPort.Tests.csproj
index e6099d427..4e0e347ff 100644
--- a/tests/ApiPort/ApiPort.Tests/ApiPort.Tests.csproj
+++ b/tests/ApiPort/ApiPort.Tests/ApiPort.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tests/lib/Microsoft.Fx.Portability.Offline.Tests/Microsoft.Fx.Portability.Offline.Tests.csproj b/tests/lib/Microsoft.Fx.Portability.Offline.Tests/Microsoft.Fx.Portability.Offline.Tests.csproj
index 30ffbea9b..d9480a86e 100644
--- a/tests/lib/Microsoft.Fx.Portability.Offline.Tests/Microsoft.Fx.Portability.Offline.Tests.csproj
+++ b/tests/lib/Microsoft.Fx.Portability.Offline.Tests/Microsoft.Fx.Portability.Offline.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <NonShipping>true</NonShipping>
   </PropertyGroup>
 
diff --git a/tests/lib/Microsoft.Fx.Portability.Tests/Microsoft.Fx.Portability.Tests.csproj b/tests/lib/Microsoft.Fx.Portability.Tests/Microsoft.Fx.Portability.Tests.csproj
index 9f803b274..177264a2e 100644
--- a/tests/lib/Microsoft.Fx.Portability.Tests/Microsoft.Fx.Portability.Tests.csproj
+++ b/tests/lib/Microsoft.Fx.Portability.Tests/Microsoft.Fx.Portability.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <NonShipping>true</NonShipping>
   </PropertyGroup>
 
@@ -10,7 +10,7 @@
     MSBUILD : error : CA0055 : Could not identify platform for 'bin\Debug\ApiPort\netcoreapp2.0\ApiPort.dll'
     MSBUILD : error : CA0052 : No targets were selected.
     -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <DefineConstants>$(DefineConstants);FEATURE_XML_SCHEMA</DefineConstants>
   </PropertyGroup>
diff --git a/tests/lib/Microsoft.Fx.Portability.Tests/TargetMapTests.cs b/tests/lib/Microsoft.Fx.Portability.Tests/TargetMapTests.cs
index e6a1bdf4e..e47627c40 100644
--- a/tests/lib/Microsoft.Fx.Portability.Tests/TargetMapTests.cs
+++ b/tests/lib/Microsoft.Fx.Portability.Tests/TargetMapTests.cs
@@ -334,7 +334,7 @@ public static void XmlNotInSchema()
                 Assert.NotNull(e.InnerException);
                 Assert.Equal(string.Format(CultureInfo.CurrentCulture, e.InnerException.Message), e.Message);
 #else
-                Assert.Equal(String.Format(CultureInfo.CurrentCulture, LocalizedStrings.MalformedMap, string.Empty), e.Message);
+                Assert.Equal(string.Format(CultureInfo.CurrentCulture, LocalizedStrings.MalformedMap, string.Empty), e.Message);
 #endif
                 return;
             }