port to .NET 8

lucasg · Apr 1, 2024 · a39e283 · a39e283
1 parent 84f8912
commit a39e283
Show file tree

Hide file tree

Showing 115 changed files with 103 additions and 12,768 deletions.
diff --git a/ClrPhlib/ClrPhlib.vcxproj b/ClrPhlib/ClrPhlib.vcxproj
@@ -32,53 +32,55 @@
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>ClrPhlib</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <WindowsTargetPlatformMinVersion>7.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v143</PlatformToolset>
+    <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v143</PlatformToolset>
+    <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Appx|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v143</PlatformToolset>
+    <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v143</PlatformToolset>
+    <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v143</PlatformToolset>
+    <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Appx|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
+    <PlatformToolset>v143</PlatformToolset>
+    <CLRSupport>NetCore</CLRSupport>
     <CharacterSet>Unicode</CharacterSet>
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
@@ -233,11 +235,6 @@
       <CLRImageType>Default</CLRImageType>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\ApiSet.h" />
     <ClInclude Include="include\ClrPhlib.h" />

diff --git a/ClrPhlib/src/managed/PeExport.cpp b/ClrPhlib/src/managed/PeExport.cpp
@@ -47,8 +47,8 @@ PeExport::PeExport(
 {
 	this->Ordinal = Ordinal;
 	this->ExportByOrdinal = ExportByOrdinal;
-	this->Name = String::Copy(other->Name);
-	this->ForwardedName = String::Copy(other->ForwardedName);
+	this->Name = gcnew String(other->Name);
+	this->ForwardedName = gcnew String(other->ForwardedName);
 	this->VirtualAddress = other->VirtualAddress;
 }
 

diff --git a/ClrPhlib/src/managed/PeImport.cpp b/ClrPhlib/src/managed/PeImport.cpp
@@ -33,8 +33,8 @@ PeImport::PeImport(
 	this->Hint = other->Hint;
 	this->Ordinal = other->Ordinal;
 	this->DelayImport = other->DelayImport;
-	this->Name = String::Copy(other->Name);
-	this->ModuleName = String::Copy(other->ModuleName);
+	this->Name = gcnew String(other->Name);
+	this->ModuleName = gcnew String(other->ModuleName);
 	this->ImportByOrdinal = other->ImportByOrdinal;
 }
 
@@ -89,7 +89,7 @@ PeImportDll::PeImportDll(
 	memcpy(ImportDll, other->ImportDll, sizeof(PH_MAPPED_IMAGE_IMPORT_DLL));
 
 	Flags = other->Flags;
-	Name = String::Copy(other->Name);
+	Name = gcnew String(other->Name);
 	NumberOfEntries = other->NumberOfEntries;
 
 	for (size_t IndexImport = 0; IndexImport < (size_t)NumberOfEntries; IndexImport++)

diff --git a/Dependencies.sln b/Dependencies.sln
@@ -1,9 +1,8 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34723.18
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependenciesGui", "DependenciesGui\DependenciesGui.csproj", "{9232B9B6-F2BA-44A3-B8A6-A352777F632C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependenciesGui", "DependenciesGui\DependenciesGui.csproj", "{9232B9B6-F2BA-44A3-B8A6-A352777F632C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4A459493-14FC-4C87-9254-60E0959535DA} = {4A459493-14FC-4C87-9254-60E0959535DA}
 	EndProjectSection
@@ -15,7 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClrPhlib", "ClrPhlib\ClrPhl
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED} = {FC532FFF-EBB1-4601-B903-C09EFB79ECED}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependencies", "Dependencies\Dependencies.csproj", "{5565A612-B250-4FE0-98DD-07C56916C194}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dependencies", "Dependencies\Dependencies.csproj", "{5565A612-B250-4FE0-98DD-07C56916C194}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4A459493-14FC-4C87-9254-60E0959535DA} = {4A459493-14FC-4C87-9254-60E0959535DA}
 	EndProjectSection
@@ -24,11 +23,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "third_party", "third_party"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "phlib", "third_party\phlib\phlib.vcxproj", "{477D0215-F252-41A1-874B-F27E3EA1ED17}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dragablz.net45", "third_party\Dragablz\Dragablz\Dragablz.net45.csproj", "{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demumble", "third_party\demumble\demumble.vcxproj", "{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependenciesLib", "DependenciesLib\DependenciesLib.csproj", "{4A459493-14FC-4C87-9254-60E0959535DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependenciesLib", "DependenciesLib\DependenciesLib.csproj", "{4A459493-14FC-4C87-9254-60E0959535DA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8} = {FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}
 	EndProjectSection
@@ -37,138 +34,86 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-demangle", "third_part
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D142CC15-3DBD-4295-BDD9-472FE53A00A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "demangler-test", "test\demangler-test\demangler-test.csproj", "{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "demangler-test", "test\demangler-test\demangler-test.csproj", "{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "binarycache-test", "test\binarycache-test\binarycache-test.csproj", "{FF973409-2F2A-46F7-B01D-C6405EA40422}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "binarycache-test", "test\binarycache-test\binarycache-test.csproj", "{FF973409-2F2A-46F7-B01D-C6405EA40422}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Debug|ARM.ActiveCfg = Debug|x86
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Debug|x64.ActiveCfg = Debug|x64
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Debug|x64.Build.0 = Debug|x64
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Debug|x86.ActiveCfg = Debug|x86
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Debug|x86.Build.0 = Debug|x86
-		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Release|ARM.ActiveCfg = Release|x86
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Release|x64.ActiveCfg = Release|x64
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Release|x64.Build.0 = Release|x64
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Release|x86.ActiveCfg = Release|x86
 		{9232B9B6-F2BA-44A3-B8A6-A352777F632C}.Release|x86.Build.0 = Release|x86
-		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Debug|ARM.ActiveCfg = Debug|Win32
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Debug|x64.ActiveCfg = Debug|x64
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Debug|x64.Build.0 = Debug|x64
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Debug|x86.ActiveCfg = Debug|Win32
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Debug|x86.Build.0 = Debug|Win32
-		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Release|Any CPU.ActiveCfg = Release|Win32
-		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Release|ARM.ActiveCfg = Release|Win32
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Release|x64.ActiveCfg = Release|x64
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Release|x64.Build.0 = Release|x64
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Release|x86.ActiveCfg = Release|Win32
 		{FC5FFCAF-982F-4A95-8FA6-2A95B1F7CDC8}.Release|x86.Build.0 = Release|Win32
-		{5565A612-B250-4FE0-98DD-07C56916C194}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5565A612-B250-4FE0-98DD-07C56916C194}.Debug|ARM.ActiveCfg = Debug|x86
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Debug|x64.ActiveCfg = Debug|x64
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Debug|x64.Build.0 = Debug|x64
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Debug|x86.ActiveCfg = Debug|x86
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Debug|x86.Build.0 = Debug|x86
-		{5565A612-B250-4FE0-98DD-07C56916C194}.Release|Any CPU.ActiveCfg = Release|x86
-		{5565A612-B250-4FE0-98DD-07C56916C194}.Release|ARM.ActiveCfg = Release|x86
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Release|x64.ActiveCfg = Release|x64
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Release|x64.Build.0 = Release|x64
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Release|x86.ActiveCfg = Release|x86
 		{5565A612-B250-4FE0-98DD-07C56916C194}.Release|x86.Build.0 = Release|x86
-		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Debug|ARM.ActiveCfg = Debug|Win32
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Debug|x64.ActiveCfg = Debug|x64
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Debug|x64.Build.0 = Debug|x64
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Debug|x86.ActiveCfg = Debug|Win32
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Debug|x86.Build.0 = Debug|Win32
-		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Release|Any CPU.ActiveCfg = Release|Win32
-		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Release|ARM.ActiveCfg = Release|Win32
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Release|x64.ActiveCfg = Release|x64
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Release|x64.Build.0 = Release|x64
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Release|x86.ActiveCfg = Release|Win32
 		{477D0215-F252-41A1-874B-F27E3EA1ED17}.Release|x86.Build.0 = Release|Win32
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Debug|ARM.ActiveCfg = Debug|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Debug|x64.ActiveCfg = Debug|x64
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Debug|x64.Build.0 = Debug|x64
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Debug|x86.ActiveCfg = Debug|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Debug|x86.Build.0 = Debug|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Release|Any CPU.ActiveCfg = Release|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Release|ARM.ActiveCfg = Release|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Release|x64.ActiveCfg = Release|x64
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Release|x64.Build.0 = Release|x64
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Release|x86.ActiveCfg = Release|x86
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE}.Release|x86.Build.0 = Release|x86
-		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Debug|ARM.ActiveCfg = Debug|Win32
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Debug|x64.ActiveCfg = Debug|x64
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Debug|x64.Build.0 = Debug|x64
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Debug|x86.ActiveCfg = Debug|Win32
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Debug|x86.Build.0 = Debug|Win32
-		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Release|Any CPU.ActiveCfg = Release|Win32
-		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Release|ARM.ActiveCfg = Release|Win32
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Release|x64.ActiveCfg = Release|x64
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Release|x64.Build.0 = Release|x64
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Release|x86.ActiveCfg = Release|Win32
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1}.Release|x86.Build.0 = Release|Win32
-		{4A459493-14FC-4C87-9254-60E0959535DA}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4A459493-14FC-4C87-9254-60E0959535DA}.Debug|ARM.ActiveCfg = Debug|x86
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Debug|x64.ActiveCfg = Debug|x64
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Debug|x64.Build.0 = Debug|x64
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Debug|x86.ActiveCfg = Debug|x86
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Debug|x86.Build.0 = Debug|x86
-		{4A459493-14FC-4C87-9254-60E0959535DA}.Release|Any CPU.ActiveCfg = Release|x86
-		{4A459493-14FC-4C87-9254-60E0959535DA}.Release|ARM.ActiveCfg = Release|x86
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Release|x64.ActiveCfg = Release|x64
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Release|x64.Build.0 = Release|x64
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Release|x86.ActiveCfg = Release|x86
 		{4A459493-14FC-4C87-9254-60E0959535DA}.Release|x86.Build.0 = Release|x86
-		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Debug|ARM.ActiveCfg = Debug|Win32
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Debug|x64.ActiveCfg = Debug|x64
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Debug|x64.Build.0 = Debug|x64
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Debug|x86.ActiveCfg = Debug|Win32
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Debug|x86.Build.0 = Debug|Win32
-		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Release|Any CPU.ActiveCfg = Release|Win32
-		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Release|ARM.ActiveCfg = Release|Win32
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Release|x64.ActiveCfg = Release|x64
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Release|x64.Build.0 = Release|x64
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Release|x86.ActiveCfg = Release|Win32
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED}.Release|x86.Build.0 = Release|Win32
-		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Debug|ARM.ActiveCfg = Debug|x86
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Debug|x64.ActiveCfg = Debug|x64
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Debug|x64.Build.0 = Debug|x64
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Debug|x86.ActiveCfg = Debug|x86
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Debug|x86.Build.0 = Debug|x86
-		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Release|Any CPU.ActiveCfg = Release|x86
-		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Release|ARM.ActiveCfg = Release|x86
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Release|x64.ActiveCfg = Release|x64
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Release|x64.Build.0 = Release|x64
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Release|x86.ActiveCfg = Release|x86
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A}.Release|x86.Build.0 = Release|x86
-		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Debug|ARM.ActiveCfg = Debug|x86
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Debug|x64.ActiveCfg = Debug|x64
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Debug|x64.Build.0 = Debug|x64
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Debug|x86.ActiveCfg = Debug|x86
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Debug|x86.Build.0 = Debug|x86
-		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Release|Any CPU.ActiveCfg = Release|x86
-		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Release|ARM.ActiveCfg = Release|x86
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Release|x64.ActiveCfg = Release|x64
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Release|x64.Build.0 = Release|x64
 		{FF973409-2F2A-46F7-B01D-C6405EA40422}.Release|x86.ActiveCfg = Release|x86
@@ -179,7 +124,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{477D0215-F252-41A1-874B-F27E3EA1ED17} = {A2A2925A-0582-4436-9A12-8567E979A621}
-		{7B11011C-7FD7-4AB0-A1AD-04E940B026DE} = {A2A2925A-0582-4436-9A12-8567E979A621}
 		{BE4A9759-A412-44CB-887D-FEFBEF1ABBF1} = {A2A2925A-0582-4436-9A12-8567E979A621}
 		{FC532FFF-EBB1-4601-B903-C09EFB79ECED} = {A2A2925A-0582-4436-9A12-8567E979A621}
 		{24F9E0C0-CA6E-4565-A9E2-88602DD9F18A} = {D142CC15-3DBD-4295-BDD9-472FE53A00A7}