Samples update for public Windows 10 release

Fix #2 Enabling WPP Recorder in Sensors Samples causes errors
Fix #4 Add back fixed KMDOD sample
Add new BarcodeScanner sample in pos folder
Add new MagneticStripeReader sample in pos folder
Add new SynpaticsTouch sample in input folder
Add new Power Engine Plugin sample in pofx folder
Add new DeviceMft sample in avstream folder
Add new AvsCamera sample in root
Add new SimBatt sample in root
Add other pre-existing samples not yet released for Win10

10 files changed, 57 insertions, 69 deletions

diff --git a/general/echo/kmdf/ReadMe.md b/general/echo/kmdf/ReadMe.md
index d1171f19..3b89850c 100644
--- a/general/echo/kmdf/ReadMe.md
+++ b/general/echo/kmdf/ReadMe.md
@@ -8,9 +8,6 @@ It also shows how to synchronize execution of these events with other asynchrono
 ## Universal Windows Driver Compliant
 This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
-**Note**
-Due to a known bug in the current Windows Driver Kit tools, when building this sample in Debug mode, the exe project may report some ApiValidator warnings. These can be safely ignored.
-
 Related technologies
 --------------------
 
diff --git a/general/echo/kmdf/driver/AutoSync/echo.inx b/general/echo/kmdf/driver/AutoSync/echo.inx
index fa0e4f6e..24d4370d 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.inx
+++ b/general/echo/kmdf/driver/AutoSync/echo.inx
@@ -17,7 +17,7 @@
 Signature="$WINDOWS NT$"
 Class=Sample
 ClassGuid={78A1C341-4539-11d3-B88D-00C04FAD5171}
-Provider=%MSFT%
+Provider=%ProviderString%
 DriverVer=03/20/2003,5.00.3788
 CatalogFile=KmdfSamples.cat
 
@@ -96,7 +96,7 @@ KmdfLibraryVersion = $KMDFVERSION$
 
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
-MSFT = "Microsoft"
+ProviderString = "TODO-Set-Provider"
 StdMfg = "(Standard system devices)"
 DiskId1 = "WDF Sample ECHO Installation Disk #1"
 ECHO.DeviceDesc = "Sample WDF ECHO Driver"
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
index 4dd50d31..0c1b0ac0 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CDC025E9-1761-4E64-A166-BD45DE3FECDC}</ProjectGuid>
+    <ProjectGuid>{C4DF013B-7414-4D27-B108-DC70B6A8DD80}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{1A19D04A-789A-4E5E-B6CB-8267327D49B2}</SampleGuid>
+    <SampleGuid>{3A2C1022-6A0D-49CE-8375-AD5ED987BCF5}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -154,7 +154,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
index e16a90eb..0d3f7346 100644
--- a/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/kmdf/driver/AutoSync/echo.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{5315796E-E2AE-40C4-88D3-37088B83F7D8}</UniqueIdentifier>
+      <UniqueIdentifier>{CAC61770-4C68-4C08-8954-C2EE9F4615B7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{F294BBB0-2191-4523-82C7-31490BDD8A37}</UniqueIdentifier>
+      <UniqueIdentifier>{D8218D2B-4511-4292-A88E-8FADB0F1397E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{00A6B984-C7C3-4E03-9616-073B2F83B7A3}</UniqueIdentifier>
+      <UniqueIdentifier>{E024B75C-350B-4462-936B-54AFDBE3B003}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{0046A610-D3DC-4635-AF3C-395E2E6D2900}</UniqueIdentifier>
+      <UniqueIdentifier>{AEECFCB2-863B-4F2E-8286-C6819113B132}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\echo.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
     <Inf Include=".\echo.inx">
       <Filter>Driver Files</Filter>
     </Inf>
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.inx b/general/echo/kmdf/driver/DriverSync/echo_2.inx
index af09757f..3cb9b163 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.inx
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.inx
@@ -17,7 +17,7 @@
 Signature="$WINDOWS NT$"
 Class=Sample
 ClassGuid={78A1C341-4539-11d3-B88D-00C04FAD5171}
-Provider=%MSFT%
+Provider=%ProviderString%
 DriverVer=03/20/2003,5.00.3788
 CatalogFile=KmdfSamples.cat
 
@@ -97,7 +97,7 @@ KmdfLibraryVersion = $KMDFVERSION$
 
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
-MSFT = "Microsoft"
+ProviderString = "TODO-Set-Provider"
 StdMfg = "(Standard system devices)"
 DiskId1 = "WDF Sample ECHO Installation Disk #1 (DriverSync)"
 ECHO.DeviceDesc = "Sample WDF ECHO Driver (DriverSync)"
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
index 893895a1..ad731fd9 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj
@@ -19,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{349EBD20-0306-46A9-8921-622D7C07D20B}</ProjectGuid>
+    <ProjectGuid>{B405FDF0-4BAD-4E15-86D6-48501103E91F}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{76F69B56-EF56-432F-8691-1C773793EB51}</SampleGuid>
+    <SampleGuid>{5D9EA73C-DEA4-4E2D-A61B-27BD444A4EE7}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -166,7 +166,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
index cc1cf7de..274afb0b 100644
--- a/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
+++ b/general/echo/kmdf/driver/DriverSync/echo_2.vcxproj.Filters
@@ -3,25 +3,22 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{C1DDA8F3-CE1F-4E9F-B893-ABD8D39FA214}</UniqueIdentifier>
+      <UniqueIdentifier>{97EF35D4-90F8-4D46-979C-74DCEB007F84}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{9EBBB66D-9D37-402F-833E-2CCF7E34CCD5}</UniqueIdentifier>
+      <UniqueIdentifier>{7E927353-FF78-45C4-837F-EDD782088E83}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{53508F5F-9B47-4922-91FF-3A0BB6BF6D49}</UniqueIdentifier>
+      <UniqueIdentifier>{B669A8E3-E681-47BD-BF49-1FD5410AAD61}</UniqueIdentifier>
     </Filter>
     <Filter Include="Driver Files">
       <Extensions>inf;inv;inx;mof;mc;</Extensions>
-      <UniqueIdentifier>{59652897-649C-440A-B1AA-1AE8A8038E8E}</UniqueIdentifier>
+      <UniqueIdentifier>{918A2EDA-630F-4822-AF89-DFEBD8BDA328}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <FilesToPackage Include=".\Debug\\echo_2.inf">
-      <Filter>Driver Files</Filter>
-    </FilesToPackage>
     <Inf Include=".\echo_2.inx">
       <Filter>Driver Files</Filter>
     </Inf>
diff --git a/general/echo/kmdf/exe/echoapp.vcxproj b/general/echo/kmdf/exe/echoapp.vcxproj
index 62821146..611109de 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj
+++ b/general/echo/kmdf/exe/echoapp.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{84FCC75B-B284-4321-8108-140360BF56AA}</ProjectGuid>
+    <ProjectGuid>{6064ECE2-B8F6-4272-85EC-C80BD65DE700}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{5D8FBCFF-DE4D-4607-9577-F4D8A83F971D}</SampleGuid>
+    <SampleGuid>{622CAFC6-E185-4727-952B-9B24EE9F7F80}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -169,7 +169,6 @@
   <ItemGroup>
     <Inf Exclude="@(Inf)" Include="*.inf" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
   </ItemGroup>
   <ItemGroup>
     <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
diff --git a/general/echo/kmdf/exe/echoapp.vcxproj.Filters b/general/echo/kmdf/exe/echoapp.vcxproj.Filters
index 51d35517..16c9210f 100644
--- a/general/echo/kmdf/exe/echoapp.vcxproj.Filters
+++ b/general/echo/kmdf/exe/echoapp.vcxproj.Filters
@@ -3,15 +3,15 @@
   <ItemGroup>
     <Filter Include="Source Files">
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{66A85886-4DDE-45CB-9A3F-E641ACCDBA7E}</UniqueIdentifier>
+      <UniqueIdentifier>{F7DC8A79-8789-4F30-AAF9-84E75E74662B}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{A498F6A0-D3A5-4F4B-8D99-056B439FB180}</UniqueIdentifier>
+      <UniqueIdentifier>{978DA09C-AAC5-4A3C-BDD6-C06EE55BF876}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files">
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{0B82D018-961F-414C-8BBC-6D96DAEA3805}</UniqueIdentifier>
+      <UniqueIdentifier>{069F7D15-D8CC-4677-BD02-7013C88EF23B}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/general/echo/kmdf/kmdfecho.sln b/general/echo/kmdf/kmdfecho.sln
index 4cc77bf9..87d4ca91 100644
--- a/general/echo/kmdf/kmdfecho.sln
+++ b/general/echo/kmdf/kmdfecho.sln
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
 MinimumVisualStudioVersion = 12.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{52FB1641-AFB0-4F37-8BE9-4138A77068CB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{2CB6609B-4511-4F2F-89DD-0F70D2D4978C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{D05198DA-5478-4E5A-B530-5412FDB8A1DD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AutoSync", "AutoSync", "{DA4A75C3-4783-40D0-87FF-48BE5D4C347A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{4713DF3C-3B4C-4E76-9FB3-111280705220}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{63B83859-9E79-4DA8-8A37-A657790D1DE9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{7010B108-FC52-4EC9-B504-AF41533C82A7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DriverSync", "DriverSync", "{284392FE-8376-4F89-9793-46999E72B1CD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{84FCC75B-B284-4321-8108-140360BF56AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoapp", "exe\echoapp.vcxproj", "{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{CDC025E9-1761-4E64-A166-BD45DE3FECDC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo", "driver\AutoSync\echo.vcxproj", "{C4DF013B-7414-4D27-B108-DC70B6A8DD80}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo_2", "driver\DriverSync\echo_2.vcxproj", "{349EBD20-0306-46A9-8921-622D7C07D20B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echo_2", "driver\DriverSync\echo_2.vcxproj", "{F95F639B-5A29-4D6A-A0BF-60558789C717}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,39 +25,39 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Debug|Win32.Build.0 = Debug|Win32
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Release|Win32.ActiveCfg = Release|Win32
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Release|Win32.Build.0 = Release|Win32
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Debug|x64.ActiveCfg = Debug|x64
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Debug|x64.Build.0 = Debug|x64
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Release|x64.ActiveCfg = Release|x64
-		{84FCC75B-B284-4321-8108-140360BF56AA}.Release|x64.Build.0 = Release|x64
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Debug|Win32.Build.0 = Debug|Win32
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Release|Win32.ActiveCfg = Release|Win32
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Release|Win32.Build.0 = Release|Win32
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Debug|x64.ActiveCfg = Debug|x64
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Debug|x64.Build.0 = Debug|x64
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Release|x64.ActiveCfg = Release|x64
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC}.Release|x64.Build.0 = Release|x64
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Debug|Win32.Build.0 = Debug|Win32
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Release|Win32.ActiveCfg = Release|Win32
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Release|Win32.Build.0 = Release|Win32
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Debug|x64.ActiveCfg = Debug|x64
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Debug|x64.Build.0 = Debug|x64
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Release|x64.ActiveCfg = Release|x64
-		{349EBD20-0306-46A9-8921-622D7C07D20B}.Release|x64.Build.0 = Release|x64
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|Win32.Build.0 = Debug|Win32
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|Win32.ActiveCfg = Release|Win32
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|Win32.Build.0 = Release|Win32
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|x64.ActiveCfg = Debug|x64
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Debug|x64.Build.0 = Debug|x64
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|x64.ActiveCfg = Release|x64
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB}.Release|x64.Build.0 = Release|x64
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|Win32.Build.0 = Debug|Win32
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|Win32.ActiveCfg = Release|Win32
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|Win32.Build.0 = Release|Win32
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|x64.ActiveCfg = Debug|x64
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Debug|x64.Build.0 = Debug|x64
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|x64.ActiveCfg = Release|x64
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80}.Release|x64.Build.0 = Release|x64
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|Win32.Build.0 = Debug|Win32
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|Win32.ActiveCfg = Release|Win32
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|Win32.Build.0 = Release|Win32
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|x64.ActiveCfg = Debug|x64
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Debug|x64.Build.0 = Debug|x64
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|x64.ActiveCfg = Release|x64
+		{F95F639B-5A29-4D6A-A0BF-60558789C717}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{84FCC75B-B284-4321-8108-140360BF56AA} = {52FB1641-AFB0-4F37-8BE9-4138A77068CB}
-		{CDC025E9-1761-4E64-A166-BD45DE3FECDC} = {D05198DA-5478-4E5A-B530-5412FDB8A1DD}
-		{349EBD20-0306-46A9-8921-622D7C07D20B} = {7010B108-FC52-4EC9-B504-AF41533C82A7}
-		{D05198DA-5478-4E5A-B530-5412FDB8A1DD} = {4713DF3C-3B4C-4E76-9FB3-111280705220}
-		{7010B108-FC52-4EC9-B504-AF41533C82A7} = {4713DF3C-3B4C-4E76-9FB3-111280705220}
+		{8E32E155-7C69-4746-A8F3-E66BBAE7FDFB} = {2CB6609B-4511-4F2F-89DD-0F70D2D4978C}
+		{C4DF013B-7414-4D27-B108-DC70B6A8DD80} = {DA4A75C3-4783-40D0-87FF-48BE5D4C347A}
+		{F95F639B-5A29-4D6A-A0BF-60558789C717} = {284392FE-8376-4F89-9793-46999E72B1CD}
+		{DA4A75C3-4783-40D0-87FF-48BE5D4C347A} = {63B83859-9E79-4DA8-8A37-A657790D1DE9}
+		{284392FE-8376-4F89-9793-46999E72B1CD} = {63B83859-9E79-4DA8-8A37-A657790D1DE9}
 	EndGlobalSection
 EndGlobal