Merge pull request #15030 from jaredpar/fix-dir2

Fully separate out tests to separate directories

build/Targets/Imports.targets

@@ -8,19 +8,16 @@
         <OutDir>$(OutDir)Exes\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
-    <When Condition="'$(RoslynProjectType)' == 'UnitTestFixed'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
-      </PropertyGroup>
-    </When>
     <When Condition="'$(RoslynProjectType)' == 'UnitTest'">
       <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\Current\</OutDir>
+        <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
-    <When Condition="'$(RoslynProjectType)' == 'UnitTestNext'">
+    <When Condition="'$(RoslynProjectType)' == 'UnitTestPortable' or '$(RoslynProjectType)' == 'UnitTestDesktop'">
       <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\Next\</OutDir>
+        <_CopyReferences>false</_CopyReferences>
+        <_CopyProjectReferences>false</_CopyProjectReferences>
+        <OutDir>$(OutDir)Dlls\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
     <When Condition="'$(RoslynProjectType)' == 'CompilerGeneratorTool'">
@@ -51,7 +48,14 @@
         <OutDir>$(OutDir)Ignore\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
-    <When Condition="'$(RoslynProjectType)' == 'Custom'">
+    <When Condition="'$(RoslynProjectType)' == 'DeploymentTest'">
+      <!-- Need to include PDB in deployment directory for debugging, and in some cases correctness when
+           stack traces are involved -->
+      <PropertyGroup>
+        <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(RoslynProjectType)' == 'Custom' or $(RoslynProjectType) == 'DeploymentTest'">
       <!-- Do nothing -->
     </When>
     <When Condition="'$(RoslynProjectType)' == '' and '$(OutputType)' == 'Library'">

build/Targets/Settings.props

@@ -41,6 +41,10 @@
 
     <CompilerGeneratorToolsDir>$(OutDir)CompilerGeneratorTools\</CompilerGeneratorToolsDir>
     <MSBuildAssemblyNameFragment>Core</MSBuildAssemblyNameFragment>
+
+    <!-- To copy .dll.config and .exe.config files of the referenced projects to the output dir 
+         (see https://github.com/Microsoft/msbuild/issues/1307) -->
+    <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.dll.config;.exe.config</AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
 
   <!-- Windows specific settings -->

src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj

@@ -16,7 +16,7 @@
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <NoStdLib>true</NoStdLib>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RoslynProjectType>UnitTest</RoslynProjectType>
+    <RoslynProjectType>UnitTestPortable</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Build Items">
     <SyntaxTestDefinition Include="..\..\Portable\Syntax\Syntax.xml" />

src/EditorFeatures/CSharpTest/project.json

@@ -2,6 +2,11 @@
     "dependencies": {
         "Microsoft.VisualStudio.Composition": "14.2.19-pre",
         "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
+        "BasicUndo": "0.9.3",
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Language.Intellisense": {
             "version": "14.3.25407",
             "suppressParent": "all"

src/EditorFeatures/Test/project.json

@@ -3,6 +3,11 @@
         "BasicUndo": "0.9.3",
         "Microsoft.VisualStudio.Composition": "14.2.19-pre",
         "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
+        "BasicUndo": "0.9.3",
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Language.Intellisense": {
             "version": "14.3.25407",
             "suppressParent": "all"

src/EditorFeatures/Test2/project.json

@@ -2,6 +2,7 @@
     "dependencies": {
         "Microsoft.VisualStudio.Composition": "14.2.19-pre",
         "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
+        "BasicUndo": "0.9.3",
         "Microsoft.VisualStudio.InteractiveWindow": {
             "version": "2.0.0-beta5-60820-04",
             "suppressParent": "all"

src/EditorFeatures/VisualBasicTest/project.json

 {
     "dependencies": {
         "Microsoft.VisualStudio.Composition": "14.2.19-pre",
+        "BasicUndo": "0.9.3",
         "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Language.Intellisense": {
             "version": "14.3.25407",
             "suppressParent": "all"

src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/CSharpAnalyzers.Test.csproj

@@ -8,10 +8,9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CSharpAnalyzers.Test</RootNamespace>
-    <AssemblyName>CSharpAnalyzers.UnitTests</AssemblyName>
+    <AssemblyName>CSharpAnalyzers.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
-    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj

@@ -37,6 +37,22 @@
       <Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project>
       <Name>Microsoft.CodeAnalysis.EditorFeatures</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
+      <Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
+      <Name>BasicCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj">
+      <Project>{ef986d9b-8cfc-4ecb-9729-e260a1f84aff}</Project>
+      <Name>VisualStudioEditor</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
+      <Project>{18f5fbb8-7570-4412-8cc7-0a86ff13b7ba}</Project>
+      <Name>TextEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
+      <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
+      <Name>Workspaces.Desktop</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
       <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
       <Name>UnitTestFramework</Name>
@@ -46,8 +62,10 @@
       <Name>ConvertToConditionalCS</Name>
     </ProjectReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.ComponentModel.Composition" />

src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj

@@ -33,6 +33,26 @@
       <Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>
       <Name>Microsoft.CodeAnalysis.CSharp.Workspaces</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
+      <Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
+      <Name>BasicCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\VisualStudioText\VisualStudioText.csproj">
+      <Project>{c25768b3-2fe1-4d6d-8c17-a6acd56f8389}</Project>
+      <Name>VisualStudioText</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\VisualStudio\VisualStudio.csproj">
+      <Project>{8da861d8-0cce-4334-b6c0-01a846c881ec}</Project>
+      <Name>VisualStudio</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
+      <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
+      <Name>Workspaces.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
+      <Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
+      <Name>BasicWorkspace</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
       <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
       <Name>UnitTestFramework</Name>
@@ -42,8 +62,10 @@
       <Name>ImplementNotifyPropertyChangedCS</Name>
     </ProjectReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />

src/Samples/Samples.sln

@@ -160,6 +160,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextEditorFeatures", "..\Ed
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioEditor", "..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj", "{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Desktop", "..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj", "{76C6F005-C89D-4348-BB4A-391898DBEB52}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompilerTestResources", "..\Compilers\Test\Resources\Core\CompilerTestResources.csproj", "{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.FX45", "..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj", "{F7712928-1175-47B3-8819-EE086753DEE2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdbUtilities", "..\Test\PdbUtilities\PdbUtilities.csproj", "{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
@@ -167,15 +175,20 @@ Global
 		..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		..\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
 		..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 4
+		..\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
+		..\Dependencies\CodeAnalysis.Metadata\Microsoft.CodeAnalysis.Metadata.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
+		..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
 		..\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
 		..\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
@@ -183,6 +196,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|ARM.Build.0 = Debug|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -191,6 +206,8 @@ Global
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Debug|x86.Build.0 = Debug|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|ARM.Build.0 = Release|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|x64.ActiveCfg = Release|Any CPU
@@ -199,6 +216,8 @@ Global
 		{CFF49CC1-85B5-49F7-B14B-A6EBF2592DD2}.Release|x86.Build.0 = Release|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|ARM.Build.0 = Debug|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -207,6 +226,8 @@ Global
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Debug|x86.Build.0 = Debug|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|ARM.Build.0 = Release|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|x64.ActiveCfg = Release|Any CPU
@@ -215,6 +236,8 @@ Global
 		{E1D96749-5BF9-4B04-81A1-9D4B3B1F6BF4}.Release|x86.Build.0 = Release|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|ARM.Build.0 = Debug|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -223,6 +246,8 @@ Global
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Debug|x86.Build.0 = Debug|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|ARM.Build.0 = Release|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|x64.ActiveCfg = Release|Any CPU
@@ -231,6 +256,8 @@ Global
 		{E2AE5575-436C-4CA5-9471-89D923FE84C6}.Release|x86.Build.0 = Release|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|ARM.Build.0 = Debug|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -239,6 +266,8 @@ Global
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Debug|x86.Build.0 = Debug|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|ARM.Build.0 = Release|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|x64.ActiveCfg = Release|Any CPU
@@ -247,6 +276,8 @@ Global
 		{23E24AFA-574E-47AA-860F-CAEF1DDCE74E}.Release|x86.Build.0 = Release|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|ARM.Build.0 = Debug|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -255,6 +286,8 @@ Global
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Debug|x86.Build.0 = Debug|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|ARM.Build.0 = Release|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|x64.ActiveCfg = Release|Any CPU
@@ -263,6 +296,8 @@ Global
 		{6A3B538F-247F-456C-A763-91991ABEB324}.Release|x86.Build.0 = Release|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|ARM.Build.0 = Debug|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -271,6 +306,8 @@ Global
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Debug|x86.Build.0 = Debug|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|ARM.Build.0 = Release|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|x64.ActiveCfg = Release|Any CPU
@@ -279,6 +316,8 @@ Global
 		{DE9D901F-43D6-4559-A068-B6E28E04F12E}.Release|x86.Build.0 = Release|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|ARM.Build.0 = Debug|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -287,6 +326,8 @@ Global
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Debug|x86.Build.0 = Debug|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|ARM.Build.0 = Release|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|x64.ActiveCfg = Release|Any CPU
@@ -295,6 +336,8 @@ Global
 		{D571F126-F0B6-487E-BB79-E91EAEE46F4F}.Release|x86.Build.0 = Release|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|ARM.Build.0 = Debug|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -303,6 +346,8 @@ Global
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Debug|x86.Build.0 = Debug|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|ARM.Build.0 = Release|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|x64.ActiveCfg = Release|Any CPU
@@ -311,6 +356,8 @@ Global
 		{A5C3CAA6-206D-41D1-9BE9-D8B5437D0D95}.Release|x86.Build.0 = Release|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|ARM.Build.0 = Debug|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -319,6 +366,8 @@ Global
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Debug|x86.Build.0 = Debug|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|ARM.Build.0 = Release|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|x64.ActiveCfg = Release|Any CPU
@@ -327,6 +376,8 @@ Global
 		{41C3D7F9-BB1F-46F9-82E5-12B8C52F27B6}.Release|x86.Build.0 = Release|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|ARM.Build.0 = Debug|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -335,6 +386,8 @@ Global
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Debug|x86.Build.0 = Debug|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|ARM.Build.0 = Release|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|x64.ActiveCfg = Release|Any CPU
@@ -343,6 +396,8 @@ Global
 		{DA0874AB-377A-48CF-99FF-0B209916309D}.Release|x86.Build.0 = Release|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -351,6 +406,8 @@ Global
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Debug|x86.Build.0 = Debug|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|ARM.Build.0 = Release|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|x64.ActiveCfg = Release|Any CPU
@@ -359,6 +416,8 @@ Global
 		{A8D29846-9D4B-4B9F-91FF-7AE83965347C}.Release|x86.Build.0 = Release|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|ARM.Build.0 = Debug|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -367,6 +426,8 @@ Global
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Debug|x86.Build.0 = Debug|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|ARM.Build.0 = Release|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|x64.ActiveCfg = Release|Any CPU
@@ -375,6 +436,8 @@ Global
 		{979ECA30-895D-4F3F-AD2E-1B6388FAEBEF}.Release|x86.Build.0 = Release|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|ARM.Build.0 = Debug|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -383,6 +446,8 @@ Global
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Debug|x86.Build.0 = Debug|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|ARM.Build.0 = Release|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|x64.ActiveCfg = Release|Any CPU
@@ -391,6 +456,8 @@ Global
 		{C182B3BA-431B-475E-ABA8-21A56283B493}.Release|x86.Build.0 = Release|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|ARM.Build.0 = Debug|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -399,6 +466,8 @@ Global
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Debug|x86.Build.0 = Debug|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|ARM.Build.0 = Release|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|x64.ActiveCfg = Release|Any CPU
@@ -407,6 +476,8 @@ Global
 		{EF5ACC32-7644-4CF0-87FC-AE9AFD0DB4D8}.Release|x86.Build.0 = Release|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|ARM.Build.0 = Debug|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -415,6 +486,8 @@ Global
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Debug|x86.Build.0 = Debug|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|ARM.Build.0 = Release|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|x64.ActiveCfg = Release|Any CPU
@@ -423,6 +496,8 @@ Global
 		{050DC082-5E4E-4175-8F7E-723B134774BE}.Release|x86.Build.0 = Release|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|ARM.Build.0 = Debug|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -431,6 +506,8 @@ Global
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Debug|x86.Build.0 = Debug|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|ARM.Build.0 = Release|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|x64.ActiveCfg = Release|Any CPU
@@ -439,6 +516,8 @@ Global
 		{409C5A1C-D4DE-43C4-86E1-F598C60B794B}.Release|x86.Build.0 = Release|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|ARM.Build.0 = Debug|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -447,6 +526,8 @@ Global
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Debug|x86.Build.0 = Debug|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|ARM.Build.0 = Release|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|x64.ActiveCfg = Release|Any CPU
@@ -455,6 +536,8 @@ Global
 		{E5603AB0-C831-4044-8E44-3CA853B6A152}.Release|x86.Build.0 = Release|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|ARM.Build.0 = Debug|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -463,6 +546,8 @@ Global
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Debug|x86.Build.0 = Debug|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|ARM.Build.0 = Release|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|x64.ActiveCfg = Release|Any CPU
@@ -471,6 +556,8 @@ Global
 		{D4277F22-5942-4DE7-9E42-B33168118D34}.Release|x86.Build.0 = Release|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|ARM.Build.0 = Debug|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -479,6 +566,8 @@ Global
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Debug|x86.Build.0 = Debug|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|ARM.Build.0 = Release|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|x64.ActiveCfg = Release|Any CPU
@@ -487,6 +576,8 @@ Global
 		{9E86BCE5-E095-4E9F-9C45-22D5AEB6AD2A}.Release|x86.Build.0 = Release|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|ARM.Build.0 = Debug|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -495,6 +586,8 @@ Global
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Debug|x86.Build.0 = Debug|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|ARM.Build.0 = Release|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|x64.ActiveCfg = Release|Any CPU
@@ -503,6 +596,8 @@ Global
 		{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}.Release|x86.Build.0 = Release|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|ARM.Build.0 = Debug|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -511,6 +606,8 @@ Global
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Debug|x86.Build.0 = Debug|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|ARM.Build.0 = Release|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|x64.ActiveCfg = Release|Any CPU
@@ -518,12 +615,14 @@ Global
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|x86.ActiveCfg = Release|Any CPU
 		{6E9FD555-EC3F-4865-A164-CB11A424B910}.Release|x86.Build.0 = Release|Any CPU
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|ARM.ActiveCfg = Debug|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|x64.ActiveCfg = Debug|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|x86.ActiveCfg = Debug|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Debug|x86.Build.0 = Debug|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Release|Any CPU.ActiveCfg = Release|x86
+		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Release|ARM.ActiveCfg = Release|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Release|Mixed Platforms.Build.0 = Release|x86
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Release|x64.ActiveCfg = Release|x86
@@ -531,6 +630,8 @@ Global
 		{0C3675A2-4DE8-4A86-BC2E-ABFC9CEB6BC5}.Release|x86.Build.0 = Release|x86
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|ARM.Build.0 = Debug|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -539,6 +640,8 @@ Global
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Debug|x86.Build.0 = Debug|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|ARM.Build.0 = Release|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|x64.ActiveCfg = Release|Any CPU
@@ -547,6 +650,8 @@ Global
 		{0101B6B7-FE1B-45E9-8C7F-5B4EFD12B030}.Release|x86.Build.0 = Release|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|ARM.Build.0 = Debug|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -555,6 +660,8 @@ Global
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Debug|x86.Build.0 = Debug|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|ARM.Build.0 = Release|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|x64.ActiveCfg = Release|Any CPU
@@ -563,6 +670,8 @@ Global
 		{82DF4070-0A70-4378-8A6E-7FF035CA619F}.Release|x86.Build.0 = Release|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|ARM.Build.0 = Debug|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -571,6 +680,8 @@ Global
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Debug|x86.Build.0 = Debug|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|ARM.Build.0 = Release|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|x64.ActiveCfg = Release|Any CPU
@@ -579,6 +690,8 @@ Global
 		{12E87057-11A1-4A58-AF89-7132789320F9}.Release|x86.Build.0 = Release|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|ARM.Build.0 = Debug|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -587,6 +700,8 @@ Global
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Debug|x86.Build.0 = Debug|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|ARM.Build.0 = Release|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|x64.ActiveCfg = Release|Any CPU
@@ -595,6 +710,8 @@ Global
 		{D2357ECA-345B-4E3A-9CA5-505082C13EAB}.Release|x86.Build.0 = Release|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|ARM.Build.0 = Debug|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -603,6 +720,8 @@ Global
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Debug|x86.Build.0 = Debug|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|ARM.Build.0 = Release|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|x64.ActiveCfg = Release|Any CPU
@@ -611,6 +730,8 @@ Global
 		{AF90D220-D21A-4A85-8CB7-E33057AC5AE3}.Release|x86.Build.0 = Release|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -619,6 +740,8 @@ Global
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Debug|x86.Build.0 = Debug|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|ARM.Build.0 = Release|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|x64.ActiveCfg = Release|Any CPU
@@ -627,6 +750,8 @@ Global
 		{4900921D-C548-4FBB-9681-BAF88E09DB3C}.Release|x86.Build.0 = Release|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|ARM.Build.0 = Debug|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -635,6 +760,8 @@ Global
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Debug|x86.Build.0 = Debug|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|ARM.Build.0 = Release|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|x64.ActiveCfg = Release|Any CPU
@@ -642,12 +769,14 @@ Global
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{D4D09B9B-8421-40B9-B4A9-594DAD5AF8DD}.Release|x86.Build.0 = Release|Any CPU
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|ARM.ActiveCfg = Debug|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|x64.ActiveCfg = Debug|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|x86.ActiveCfg = Debug|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Debug|x86.Build.0 = Debug|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|Any CPU.ActiveCfg = Release|x86
+		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|ARM.ActiveCfg = Release|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|Mixed Platforms.Build.0 = Release|x86
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|x64.ActiveCfg = Release|x86
@@ -655,6 +784,8 @@ Global
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965}.Release|x86.Build.0 = Release|x86
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|ARM.Build.0 = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -663,6 +794,8 @@ Global
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Debug|x86.Build.0 = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|ARM.Build.0 = Release|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|x64.ActiveCfg = Release|Any CPU
@@ -671,6 +804,8 @@ Global
 		{8DA861D8-0CCE-4334-B6C0-01A846C881EC}.Release|x86.Build.0 = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|ARM.Build.0 = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -679,6 +814,8 @@ Global
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Debug|x86.Build.0 = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|ARM.Build.0 = Release|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|x64.ActiveCfg = Release|Any CPU
@@ -687,6 +824,8 @@ Global
 		{C25768B3-2FE1-4D6D-8C17-A6ACD56F8389}.Release|x86.Build.0 = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x64.ActiveCfg = Debug|x64
@@ -695,6 +834,8 @@ Global
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Debug|x86.Build.0 = Debug|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|ARM.Build.0 = Release|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x64.ActiveCfg = Release|x64
@@ -703,6 +844,8 @@ Global
 		{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}.Release|x86.Build.0 = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|ARM.Build.0 = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x64.ActiveCfg = Debug|x64
@@ -711,6 +854,8 @@ Global
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Debug|x86.Build.0 = Debug|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|ARM.Build.0 = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x64.ActiveCfg = Release|x64
@@ -719,6 +864,8 @@ Global
 		{B501A547-C911-4A05-AC6E-274A50DFF30E}.Release|x86.Build.0 = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|ARM.Build.0 = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -727,6 +874,8 @@ Global
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Debug|x86.Build.0 = Debug|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|ARM.Build.0 = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x64.ActiveCfg = Release|Any CPU
@@ -735,6 +884,8 @@ Global
 		{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}.Release|x86.Build.0 = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|ARM.Build.0 = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -743,6 +894,8 @@ Global
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Debug|x86.Build.0 = Debug|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|ARM.Build.0 = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|x64.ActiveCfg = Release|Any CPU
@@ -751,6 +904,8 @@ Global
 		{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}.Release|x86.Build.0 = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|ARM.Build.0 = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -759,6 +914,8 @@ Global
 		{21B239D0-D144-430F-A394-C066D58EE267}.Debug|x86.Build.0 = Debug|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21B239D0-D144-430F-A394-C066D58EE267}.Release|ARM.ActiveCfg = Release|Any CPU
+		{21B239D0-D144-430F-A394-C066D58EE267}.Release|ARM.Build.0 = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|x64.ActiveCfg = Release|Any CPU
@@ -767,6 +924,8 @@ Global
 		{21B239D0-D144-430F-A394-C066D58EE267}.Release|x86.Build.0 = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|ARM.Build.0 = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -775,6 +934,8 @@ Global
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Debug|x86.Build.0 = Debug|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|ARM.Build.0 = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|x64.ActiveCfg = Release|Any CPU
@@ -783,6 +944,8 @@ Global
 		{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}.Release|x86.Build.0 = Release|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|ARM.Build.0 = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -791,6 +954,8 @@ Global
 		{2E87FA96-50BB-4607-8676-46521599F998}.Debug|x86.Build.0 = Debug|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E87FA96-50BB-4607-8676-46521599F998}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2E87FA96-50BB-4607-8676-46521599F998}.Release|ARM.Build.0 = Release|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|x64.ActiveCfg = Release|Any CPU
@@ -799,6 +964,8 @@ Global
 		{2E87FA96-50BB-4607-8676-46521599F998}.Release|x86.Build.0 = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|ARM.Build.0 = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -807,6 +974,8 @@ Global
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Debug|x86.Build.0 = Debug|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|ARM.Build.0 = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|x64.ActiveCfg = Release|Any CPU
@@ -815,6 +984,8 @@ Global
 		{3CDEEAB7-2256-418A-BEB2-620B5CB16302}.Release|x86.Build.0 = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|ARM.Build.0 = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -823,6 +994,8 @@ Global
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Debug|x86.Build.0 = Debug|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|ARM.Build.0 = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|x64.ActiveCfg = Release|Any CPU
@@ -830,12 +1003,14 @@ Global
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|x86.ActiveCfg = Release|Any CPU
 		{EDC68A0E-C68D-4A74-91B7-BF38EC909888}.Release|x86.Build.0 = Release|Any CPU
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|ARM.ActiveCfg = Debug|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.ActiveCfg = Debug|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x64.Build.0 = Debug|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Debug|x86.ActiveCfg = Debug|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Any CPU.ActiveCfg = Release|x64
+		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|ARM.ActiveCfg = Release|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|Mixed Platforms.Build.0 = Release|x64
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x64.ActiveCfg = Release|x64
@@ -843,6 +1018,8 @@ Global
 		{6DA08F12-32F2-4DD9-BBAD-982EB71A2C9B}.Release|x86.ActiveCfg = Release|x64
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|ARM.Build.0 = Debug|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -851,6 +1028,8 @@ Global
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Debug|x86.Build.0 = Debug|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|ARM.Build.0 = Release|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|x64.ActiveCfg = Release|Any CPU
@@ -859,6 +1038,8 @@ Global
 		{02459936-CD2C-4F61-B671-5C518F2A3DDC}.Release|x86.Build.0 = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|ARM.Build.0 = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -867,6 +1048,8 @@ Global
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Debug|x86.Build.0 = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|ARM.Build.0 = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|x64.ActiveCfg = Release|Any CPU
@@ -875,6 +1058,8 @@ Global
 		{288089C5-8721-458E-BE3E-78990DAB5E2E}.Release|x86.Build.0 = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|ARM.Build.0 = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -883,6 +1068,8 @@ Global
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Debug|x86.Build.0 = Debug|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|ARM.Build.0 = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|x64.ActiveCfg = Release|Any CPU
@@ -891,6 +1078,8 @@ Global
 		{288089C5-8721-458E-BE3E-78990DAB5E2D}.Release|x86.Build.0 = Release|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|ARM.Build.0 = Debug|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -899,6 +1088,8 @@ Global
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Debug|x86.Build.0 = Debug|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|ARM.ActiveCfg = Release|Any CPU
+		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|ARM.Build.0 = Release|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|x64.ActiveCfg = Release|Any CPU
@@ -907,6 +1098,8 @@ Global
 		{909B656F-6095-4AC2-A5AB-C3F032315C45}.Release|x86.Build.0 = Release|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|ARM.Build.0 = Debug|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -915,6 +1108,8 @@ Global
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Debug|x86.Build.0 = Debug|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|ARM.Build.0 = Release|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|x64.ActiveCfg = Release|Any CPU
@@ -922,12 +1117,14 @@ Global
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|x86.ActiveCfg = Release|Any CPU
 		{6AA96934-D6B7-4CC8-990D-DB6B9DD56E34}.Release|x86.Build.0 = Release|Any CPU
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|ARM.ActiveCfg = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.ActiveCfg = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x64.Build.0 = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Debug|x86.ActiveCfg = Debug|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Any CPU.ActiveCfg = Release|x64
+		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|ARM.ActiveCfg = Release|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|Mixed Platforms.Build.0 = Release|x64
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x64.ActiveCfg = Release|x64
@@ -935,6 +1132,8 @@ Global
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB}.Release|x86.ActiveCfg = Release|x64
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|ARM.Build.0 = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -943,6 +1142,8 @@ Global
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Debug|x86.Build.0 = Debug|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|ARM.ActiveCfg = Release|Any CPU
+		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|ARM.Build.0 = Release|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|x64.ActiveCfg = Release|Any CPU
@@ -951,6 +1152,8 @@ Global
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}.Release|x86.Build.0 = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|ARM.Build.0 = Debug|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -959,12 +1162,94 @@ Global
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Debug|x86.Build.0 = Debug|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|ARM.Build.0 = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|x64.Build.0 = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|x86.ActiveCfg = Release|Any CPU
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF}.Release|x86.Build.0 = Release|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|ARM.ActiveCfg = Debug|ARM
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|ARM.Build.0 = Debug|ARM
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x64.ActiveCfg = Debug|x64
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x64.Build.0 = Debug|x64
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Debug|x86.Build.0 = Debug|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|ARM.ActiveCfg = Release|ARM
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|ARM.Build.0 = Release|ARM
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x64.ActiveCfg = Release|x64
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x64.Build.0 = Release|x64
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x86.ActiveCfg = Release|Any CPU
+		{76C6F005-C89D-4348-BB4A-391898DBEB52}.Release|x86.Build.0 = Release|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|ARM.Build.0 = Debug|ARM
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x64.ActiveCfg = Debug|x64
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x64.Build.0 = Debug|x64
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Debug|x86.Build.0 = Debug|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|ARM.ActiveCfg = Release|ARM
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|ARM.Build.0 = Release|ARM
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x64.ActiveCfg = Release|x64
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x64.Build.0 = Release|x64
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}.Release|x86.Build.0 = Release|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|ARM.ActiveCfg = Debug|ARM
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|ARM.Build.0 = Debug|ARM
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x64.ActiveCfg = Debug|x64
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x64.Build.0 = Debug|x64
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Debug|x86.Build.0 = Debug|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|ARM.ActiveCfg = Release|ARM
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|ARM.Build.0 = Release|ARM
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x64.ActiveCfg = Release|x64
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x64.Build.0 = Release|x64
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x86.ActiveCfg = Release|Any CPU
+		{F7712928-1175-47B3-8819-EE086753DEE2}.Release|x86.Build.0 = Release|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|ARM.ActiveCfg = Debug|ARM
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|ARM.Build.0 = Debug|ARM
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|x64.ActiveCfg = Debug|x64
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|x64.Build.0 = Debug|x64
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|ARM.ActiveCfg = Release|ARM
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|ARM.Build.0 = Release|ARM
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x64.ActiveCfg = Release|x64
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x64.Build.0 = Release|x64
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1040,5 +1325,9 @@ Global
 		{1B665337-9D6A-451A-AEAC-F7BF1AF95FFB} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
 		{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
 		{EF986D9B-8CFC-4ECB-9729-E260A1F84AFF} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
+		{76C6F005-C89D-4348-BB4A-391898DBEB52} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
+		{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
+		{F7712928-1175-47B3-8819-EE086753DEE2} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
+		{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED} = {B769A73C-FA3A-43ED-B58E-AB037E503240}
 	EndGlobalSection
 EndGlobal

src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/BasicAnalyzers.Test.vbproj

@@ -5,11 +5,10 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{5399E7A8-F8F1-4F2E-A5D2-9C96F3DD2A2D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AssemblyName>BasicAnalyzers.UnitTests</AssemblyName>
+    <AssemblyName>BasicAnalyzers.Tests</AssemblyName>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
-    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj

@@ -14,6 +14,34 @@
     <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{b501a547-c911-4a05-ac6e-274a50dff30e}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
+      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
+      <Name>TestUtilities.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
+      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
+      <Name>TestUtilities.FX45</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
+      <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
+      <Name>Workspaces.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
+      <Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
+      <Name>BasicWorkspace</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
       <Project>{D571F126-F0B6-487E-BB79-E91EAEE46F4F}</Project>
       <Name>UnitTestFramework</Name>

src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj

@@ -32,6 +32,38 @@
       <Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project>
       <Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{b501a547-c911-4a05-ac6e-274a50dff30e}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\VisualStudioText\VisualStudioText.csproj">
+      <Project>{c25768b3-2fe1-4d6d-8c17-a6acd56f8389}</Project>
+      <Name>VisualStudioText</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\VisualStudio\VisualStudio.csproj">
+      <Project>{8da861d8-0cce-4334-b6c0-01a846c881ec}</Project>
+      <Name>VisualStudio</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
+      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
+      <Name>TestUtilities.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
+      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
+      <Name>TestUtilities.FX45</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
+      <Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
+      <Name>BasicWorkspace</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
       <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
       <Name>UnitTestFramework</Name>
@@ -41,8 +73,10 @@
       <Name>ImplementNotifyPropertyChangedVB</Name>
     </ProjectReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj

@@ -38,6 +38,42 @@
       <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
       <Name>UnitTestFramework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{b501a547-c911-4a05-ac6e-274a50dff30e}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj">
+      <Project>{ef986d9b-8cfc-4ecb-9729-e260a1f84aff}</Project>
+      <Name>VisualStudioEditor</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
+      <Project>{18f5fbb8-7570-4412-8cc7-0a86ff13b7ba}</Project>
+      <Name>TextEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
+      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
+      <Name>TestUtilities.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
+      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
+      <Name>TestUtilities.FX45</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
+      <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
+      <Name>Workspaces.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
+      <Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
+      <Name>BasicWorkspace</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Impl\RemoveByValVB.vbproj">
       <Project>{4900921D-C548-4FBB-9681-BAF88E09DB3C}</Project>
       <Name>RemoveByValVB</Name>

src/Scripting/CSharpTest/CSharpScriptingTest.csproj

@@ -14,7 +14,7 @@
     <TargetFrameworkProfile></TargetFrameworkProfile>
     <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RoslynProjectType>UnitTest</RoslynProjectType>
+    <RoslynProjectType>UnitTestDesktop</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
@@ -72,7 +72,7 @@
     <InternalsVisibleToTest Include="Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <Content Include="app.config" />
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>

src/Scripting/CSharpTest/InteractiveSessionTests.cs

@@ -41,7 +41,7 @@ public class InteractiveSessionTests : TestBase
         #region Namespaces, Types
 
         [Fact]
-        public void CompilationChain_NestedTypesClass()
+        public async Task CompilationChain_NestedTypesClass()
         {
             var script = CSharpScript.Create(@"
 static string outerStr = null;
@@ -60,13 +60,13 @@ class InnerClass
 
             using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
             {
-                script.RunAsync().Wait();
+                await script.RunAsync();
                 Assert.Equal("test", redirect.Output.Trim());
             }
         }
 
         [Fact]
-        public void CompilationChain_NestedTypesStruct()
+        public async Task CompilationChain_NestedTypesStruct()
         {
             var script = CSharpScript.Create(@"
 static string outerStr = null;
@@ -85,13 +85,13 @@ struct InnerStruct
 
             using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
             {
-                script.RunAsync().Wait();
+                await script.RunAsync();
                 Assert.Equal("test", redirect.Output.Trim());
             }
         }
 
         [Fact]
-        public void CompilationChain_InterfaceTypes()
+        public async Task CompilationChain_InterfaceTypes()
         {
             var script = CSharpScript.Create(@"
 interface I1 { int Goo();}
@@ -104,7 +104,7 @@ class InnerClass : I1
 iC.Goo()
 ");
 
-            Assert.Equal(1, script.EvaluateAsync().Result);
+            Assert.Equal(1, await script.EvaluateAsync());
         }
 
         [Fact]

src/Scripting/CSharpTest/ScriptTests.cs

@@ -10,6 +10,7 @@
 using Roslyn.Utilities;
 using Xunit;
 using System.IO;
+using System.Globalization;
 
 namespace Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests
 {
@@ -91,10 +92,13 @@ public async Task TestRunScriptWithSpecifiedReturnType()
 
         [Fact]
         public async Task TestRunVoidScript()
+        {
+            using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
             {
                 var state = await CSharpScript.RunAsync("System.Console.WriteLine(0);");
                 Assert.Null(state.ReturnValue);
             }
+        }
 
         [WorkItem(5279, "https://github.com/dotnet/roslyn/issues/5279")]
         [Fact]
@@ -331,11 +335,14 @@ public async Task ReturnIntAsObject()
 
         [Fact]
         public async Task NoReturn()
+        {
+            using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
             {
                 var script = CSharpScript.Create<object>("System.Console.WriteLine();");
                 var result = await script.EvaluateAsync();
                 Assert.Null(result);
             }
+        }
 
         [Fact]
         public async Task ReturnAwait()
@@ -378,9 +385,13 @@ public async Task ReturnInNestedScopeWithTrailingVoidExpression()
     return 1;
 }
 System.Console.WriteLine();");
+
+            using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
+            {
                 result = await script.EvaluateAsync();
                 Assert.Equal(1, result);
             }
+        }
 
         [Fact]
         public async Task ReturnInNestedScopeWithTrailingVoidExpressionAsInt()
@@ -402,9 +413,13 @@ public async Task ReturnInNestedScopeWithTrailingVoidExpressionAsInt()
     return 1;
 }
 System.Console.WriteLine()");
+
+            using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
+            {
                 result = await script.EvaluateAsync();
                 Assert.Equal(0, result);
             }
+        }
 
         [Fact]
         public async Task ReturnIntWithTrailingDoubleExpression()
@@ -513,6 +528,8 @@ public async Task ReturnInLoadedFileTrailingExpression()
 
         [Fact]
         public async Task ReturnInLoadedFileTrailingVoidExpression()
+        {
+            using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
             {
                 var resolver = TestSourceReferenceResolver.Create(
                     KeyValuePair.Create("a.csx", @"
@@ -533,6 +550,7 @@ public async Task ReturnInLoadedFileTrailingVoidExpression()
                 result = await script.EvaluateAsync();
                 Assert.Equal(2, result);
             }
+        }
 
         [Fact]
         public async Task MultipleLoadedFilesWithTrailingExpression()
@@ -676,8 +694,11 @@ public async Task StreamWithOffset()
             var resolver = new StreamOffsetResolver();
             var options = ScriptOptions.Default.WithSourceResolver(resolver);
             var script = CSharpScript.Create(@"#load ""a.csx""", options);
+            using (var redirect = new OutputRedirect(CultureInfo.InvariantCulture))
+            {
                 await script.EvaluateAsync();
             }
+        }
 
         private class StreamOffsetResolver : SourceReferenceResolver
         {

src/Scripting/CSharpTest/project.json

 {
     "dependencies": {
-        "System.AppContext": "4.1.0"
+        "System.AppContext": "4.1.0",
+        "System.ValueTuple": "4.0.1-beta-24425-02"
     },
     "frameworks": {
         "netstandard1.3": {

src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj

@@ -30,6 +30,10 @@
       <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
       <Name>BasicCodeAnalysis</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Test\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
       <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
       <Name>TestUtilities</Name>

src/Scripting/CoreTest/ScriptingTest.csproj

@@ -14,7 +14,7 @@
     <TargetFrameworkProfile></TargetFrameworkProfile>
     <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RoslynProjectType>UnitTest</RoslynProjectType>
+    <RoslynProjectType>UnitTestPortable</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">

src/Scripting/CoreTestUtilities/RedirectedOutput.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.CodeAnalysis.Scripting
 {
-    public struct OutputRedirect : IDisposable
+    public sealed class OutputRedirect : IDisposable
     {
         private readonly TextWriter _oldOut;
         private readonly StringWriter _newOut;

src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj

@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
     <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RoslynProjectType>UnitTest</RoslynProjectType>
+    <RoslynProjectType>UnitTestDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

@@ -830,6 +830,7 @@ Public Class BuildDevDivInsertionFiles
         add("Vsix\VisualStudioSetup\System.Composition.Convention.dll")
         add("Vsix\VisualStudioSetup\System.Composition.Hosting.dll")
         add("Vsix\VisualStudioSetup\System.Composition.TypedParts.dll")
+        add("Vsix\VisualStudioSetup.Next\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll")
         add("Dlls\BasicExpressionCompiler\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.vsdconfig")
         add("Dlls\BasicResultProvider.Portable\Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.vsdconfig")
         add("Dlls\CSharpExpressionCompiler\Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.vsdconfig")
@@ -847,15 +848,14 @@ Public Class BuildDevDivInsertionFiles
         add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll")
         add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll.config")
         add("Dlls\TestUtilities.FX45\Roslyn.Test.Utilities.FX45.dll")
-        add("UnitTests\Current\BasicUndo.dll")
-        add("UnitTests\Current\Esent.Interop.dll")
-        add("UnitTests\Current\Moq.dll")
-        add("UnitTests\Current\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll")
-        add("UnitTests\Current\Microsoft.DiaSymReader.dll")
-        add("UnitTests\Current\Microsoft.DiaSymReader.Native.amd64.dll")
-        add("UnitTests\Current\Microsoft.DiaSymReader.Native.x86.dll")
-        add("UnitTests\Current\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll")
-        add("Vsix\VisualStudioSetup.Next\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll")
+        add("UnitTests\EditorServicesTest\BasicUndo.dll")
+        add("UnitTests\EditorServicesTest\Esent.Interop.dll")
+        add("UnitTests\EditorServicesTest\Moq.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.amd64.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.x86.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll")
         add("Dlls\Concord\Microsoft.VisualStudio.Debugger.Engine.dll")
         add("Vsix\VisualStudioTestSetup\Microsoft.Diagnostics.Runtime.dll")
         add("Vsix\VisualStudioTestSetup\Roslyn.VisualStudio.Test.Setup.vsix")

src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj

@@ -17,7 +17,7 @@
     <RuntimeIndentifier>x64</RuntimeIndentifier>
     <NuGetRuntimeIdentifier>$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)</NuGetRuntimeIdentifier>
     <NoStdLib>true</NoStdLib>
-    <RoslynProjectType>Custom</RoslynProjectType>
+    <RoslynProjectType>DeploymentTest</RoslynProjectType>
     <OutDir>$(OutDir)CoreClrTest</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" />
@@ -29,18 +29,62 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
+      <Project>{1ee8cad3-55f9-4d91-96b2-084641da9a6c}</Project>
+      <Name>CodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{b501a547-c911-4a05-ac6e-274a50dff30e}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Compilers\CSharp\Test\Syntax\CSharpCompilerSyntaxTest.csproj">
       <Project>{50d26304-0961-4a51-abf6-6cad1a56d202}</Project>
       <Name>CSharpCompilerSyntaxTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj">
+      <Project>{4371944a-d3ba-4b5b-8285-82e5ffc6d1f9}</Project>
+      <Name>CSharpCompilerTestUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
+      <Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
+      <Name>BasicCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\CoreTestUtilities\ScriptingTestUtilities.csproj">
+      <Project>{21a01c2d-2501-4619-8144-48977dd22d9c}</Project>
+      <Name>ScriptingTestUtilities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj">
       <Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project>
       <Name>ScriptingTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
+      <Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
+      <Name>Scripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\CSharp\CSharpScripting.csproj">
+      <Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
+      <Name>CSharpScripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\VisualBasic\BasicScripting.vbproj">
+      <Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
+      <Name>BasicScripting</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tools\CommonNetCoreReferences\CommonNetCoreReferences.csproj">
       <Project>{b5a6057a-eb4c-49fb-987d-943137e72e47}</Project>
       <Name>CommonNetCoreReferences</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Utilities\Portable\TestUtilities.csproj">
+      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
+      <Name>TestUtilities</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\..\build\Targets\Imports.targets" />
 </Project>

src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj

@@ -12,7 +12,8 @@
     <TargetFrameworkIdentifier />
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <CopyNuGetImplementations>true</CopyNuGetImplementations>
-    <RoslynProjectType>Deployment</RoslynProjectType>
+    <RoslynProjectType>DeploymentTest</RoslynProjectType>
+    <OutDir>$(OutDir)UnitTests\Portable\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>false</DebugSymbols>
@@ -21,18 +22,62 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
+      <Project>{1ee8cad3-55f9-4d91-96b2-084641da9a6c}</Project>
+      <Name>CodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{b501a547-c911-4a05-ac6e-274a50dff30e}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\CSharp\Test\Syntax\CSharpCompilerSyntaxTest.csproj">
+      <Project>{50d26304-0961-4a51-abf6-6cad1a56d202}</Project>
+      <Name>CSharpCompilerSyntaxTest</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj">
+      <Project>{4371944a-d3ba-4b5b-8285-82e5ffc6d1f9}</Project>
+      <Name>CSharpCompilerTestUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
+      <Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
+      <Name>BasicCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\CoreTestUtilities\ScriptingTestUtilities.csproj">
+      <Project>{21a01c2d-2501-4619-8144-48977dd22d9c}</Project>
+      <Name>ScriptingTestUtilities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Scripting\CoreTest\ScriptingTest.csproj">
       <Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project>
       <Name>ScriptingTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\Core\Scripting.csproj">
+      <Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
+      <Name>Scripting</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Scripting\CSharpTest\CSharpScriptingTest.csproj">
       <Project>{2dae4406-7a89-4b5f-95c3-bc5422ce47ce}</Project>
       <Name>CSharpScriptingTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\CSharp\CSharpScripting.csproj">
+      <Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
+      <Name>CSharpScripting</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Scripting\VisualBasicTest\BasicScriptingTest.vbproj">
       <Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
       <Name>BasicScriptingTest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Scripting\VisualBasic\BasicScripting.vbproj">
+      <Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
+      <Name>BasicScripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Utilities\Portable\TestUtilities.csproj">
       <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
       <Name>TestUtilities</Name>

src/Tools/BuildBoss/ProjectCheckerUtil.cs

@@ -49,6 +49,8 @@ internal bool CheckAll(TextWriter textWriter)
                 allGood &= CheckProjectReferences(textWriter);
             }
 
+            allGood &= CheckTestDeploymentProjects(textWriter);
+
             return allGood;
         }
 
@@ -295,5 +297,60 @@ private bool IsUnitTestCorrectlySpecified(TextWriter textWriter, RoslynProjectDa
             return true;
         }
 
+        /// <summary>
+        /// Verify our test deployment projects properly reference everything which is labeled as a portable
+        /// unit test.  This ensurse they are properly deployed during build and test.
+        /// </summary>
+        private bool CheckTestDeploymentProjects(TextWriter textWriter)
+        {
+            var fileName = Path.GetFileNameWithoutExtension(_data.FileName);
+            var isDesktop = fileName == "DeployDesktopTestRuntime";
+            var isCoreClr = fileName == "DeployCoreClrTestRuntime";
+            if (!isDesktop && !isCoreClr)
+            {
+                return true;
+            }
+
+            var allGood = true;
+            var data = _projectUtil.GetRoslynProjectData();
+            if (data.DeclaredKind != RoslynProjectKind.DeploymentTest)
+            {
+                textWriter.WriteLine("Test deployment project must be marked as <RoslynProjectKind>DeploymentTest</RoslynProjectKind>");
+                allGood = false;
+            }
+
+            var set = new HashSet<ProjectKey>(_projectUtil.GetDeclaredProjectReferences());
+            foreach (var projectData in _solutionMap.Values)
+            {
+                var rosData = projectData.ProjectUtil.TryGetRoslynProjectData();
+                if (rosData == null)
+                {
+                    continue;
+                }
+
+                var kind = rosData.Value.DeclaredKind;
+                bool include;
+                switch (kind)
+                {
+                    case RoslynProjectKind.UnitTestPortable:
+                        include = true;
+                        break;
+                    case RoslynProjectKind.UnitTestDesktop:
+                        include = isDesktop;
+                        break;
+                    default:
+                        include = false;
+                        break;
+                }
+
+                if (include && !set.Contains(projectData.Key))
+                {
+                    textWriter.WriteLine($"Portable unit test {projectData.FileName} must be referenced");
+                    allGood = false;
+                }
+            }
+
+            return allGood;
+        }
     }
 }

src/Tools/BuildBoss/RoslynProjectData.cs

@@ -13,11 +13,12 @@ internal enum RoslynProjectKind
         Exe,
         ExeCoreClr,
         UnitTest,
-        UnitTestFixed,
-        UnitTestNext,
+        UnitTestDesktop,
+        UnitTestPortable,
         CompilerGeneratorTool,
         DeploymentCompilerGeneratorTools,
         Deployment,
+        DeploymentTest,
         Vsix,
         Depedency,
         Custom
@@ -35,18 +36,20 @@ internal static class RoslynProjectKindUtil
             {
                 case "ExeCoreClr":
                     return RoslynProjectKind.Exe;
-                case "UnitTestFixed":
-                    return RoslynProjectKind.UnitTestFixed;
+                case "UnitTestPortable":
+                    return RoslynProjectKind.UnitTestPortable;
+                case "UnitTestDesktop":
+                    return RoslynProjectKind.UnitTestDesktop;
                 case "UnitTest":
                     return RoslynProjectKind.UnitTest;
-                case "UnitTestNext":
-                    return RoslynProjectKind.UnitTestNext;
                 case "CompilerGeneratorTool":
                     return RoslynProjectKind.CompilerGeneratorTool;
                 case "DeploymentCompilerGeneratorTools":
                     return RoslynProjectKind.DeploymentCompilerGeneratorTools;
                 case "Deployment":
                     return RoslynProjectKind.Deployment;
+                case "DeploymentTest":
+                    return RoslynProjectKind.DeploymentTest;
                 case "Vsix":
                     return RoslynProjectKind.Vsix;
                 case "Dependency":
@@ -62,15 +65,16 @@ internal static bool IsAnyUnitTest(RoslynProjectKind kind)
         {
             return
                 kind == RoslynProjectKind.UnitTest ||
-                kind == RoslynProjectKind.UnitTestFixed ||
-                kind == RoslynProjectKind.UnitTestNext;
+                kind == RoslynProjectKind.UnitTestDesktop ||
+                kind == RoslynProjectKind.UnitTestPortable;
         }
 
         internal static bool IsDeploymentProject(RoslynProjectKind kind)
         {
             return
                 kind == RoslynProjectKind.Exe ||
-                kind == RoslynProjectKind.UnitTestFixed;
+                kind == RoslynProjectKind.DeploymentTest ||
+                IsAnyUnitTest(kind);
         }
     }
 

src/Tools/MicroBuild/RunSignTool.proj

 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Settings.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\Targets\Dependencies.props" />
 
   <Target Name="Build">
     <Exec Command="$(NuGetPackageRoot)\RoslynTools.Microsoft.SignTool\$(RoslynToolsMicrosoftSignToolVersion)\tools\SignTool.exe $(SignRoslynArgs) &quot;$(OutDir.TrimEnd('\'))&quot;" WorkingDirectory="$(ProjectDir)" />

src/VisualStudio/CSharp/Test/CSharpVisualStudioTest.csproj

@@ -14,10 +14,38 @@
     <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Compilers\Test\Utilities\VisualBasic\BasicCompilerTestUtilities.vbproj">
+      <Project>{4371944a-d3ba-4b5b-8285-82e5ffc6d1f8}</Project>
+      <Name>BasicCompilerTestUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Compilers\VisualBasic\Portable\BasicCodeAnalysis.vbproj">
+      <Project>{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}</Project>
+      <Name>BasicCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\VisualStudioEditor\VisualStudioEditor.csproj">
+      <Project>{ef986d9b-8cfc-4ecb-9729-e260a1f84aff}</Project>
+      <Name>VisualStudioEditor</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\VisualStudio\VisualStudio.csproj">
+      <Project>{8da861d8-0cce-4334-b6c0-01a846c881ec}</Project>
+      <Name>VisualStudio</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\EditorFeatures\TestUtilities2\ServicesTestUtilities2.vbproj">
       <Project>{3dfb4701-e3d6-4435-9f70-a6e35822c4f2}</Project>
       <Name>ServicesTestUtilities2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\EditorFeatures\VisualBasic\BasicEditorFeatures.vbproj">
+      <Project>{49bfae50-1bce-48ae-bc89-78b7d90a3ecd}</Project>
+      <Name>BasicEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Features\VisualBasic\Portable\BasicFeatures.vbproj">
+      <Project>{a1bcd0ce-6c2f-4f8c-9a48-d9d93928e26d}</Project>
+      <Name>BasicFeatures</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Interactive\EditorFeatures\Core\InteractiveEditorFeatures.csproj">
       <Project>{92412d1a-0f23-45b5-b196-58839c524917}</Project>
       <Name>InteractiveEditorFeatures</Name>
@@ -26,10 +54,42 @@
       <Project>{fe2cbea6-d121-4faa-aa8b-fc9900bf8c83}</Project>
       <Name>CSharpInteractiveEditorFeatures</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Interactive\EditorFeatures\VisualBasic\BasicInteractiveEditorFeatures.vbproj">
+      <Project>{849e516a-595f-474b-adb4-e099f921cedf}</Project>
+      <Name>BasicInteractiveEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Interactive\Features\InteractiveFeatures.csproj">
+      <Project>{8e2a252e-a140-45a6-a81a-2652996ea589}</Project>
+      <Name>InteractiveFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Interactive\Host\InteractiveHost.csproj">
+      <Project>{eba4dfa1-6ded-418f-a485-a3b608978906}</Project>
+      <Name>InteractiveHost</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripting\Core\Scripting.csproj">
+      <Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>
+      <Name>Scripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripting\CSharp\CSharpScripting.csproj">
+      <Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
+      <Name>CSharpScripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Scripting\VisualBasic\BasicScripting.vbproj">
+      <Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
+      <Name>BasicScripting</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
+      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
+      <Name>PdbUtilities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
       <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
       <Name>TestUtilities.FX45</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Workspaces\CoreTestUtilities\WorkspacesTestUtilities.csproj">
+      <Project>{3f2fdc1c-dc6f-44cb-b4a1-a9026f25d66e}</Project>
+      <Name>WorkspacesTestUtilities</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
       <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
       <Name>Workspaces.Desktop</Name>
@@ -66,10 +126,30 @@
       <Project>{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}</Project>
       <Name>ServicesVisualStudio</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Workspaces\Remote\Core\RemoteWorkspaces.csproj">
+      <Project>{f822f72a-cc87-4e31-b57d-853f65cbebf3}</Project>
+      <Name>RemoteWorkspaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Workspaces\Remote\ServiceHub\ServiceHub.csproj">
+      <Project>{80fddd00-9393-47f7-8baf-7e87ce011068}</Project>
+      <Name>ServiceHub</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\BasicWorkspace.vbproj">
+      <Project>{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}</Project>
+      <Name>BasicWorkspace</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Core\SolutionExplorerShim\SolutionExplorerShim.csproj">
+      <Project>{7be3deeb-87f8-4e15-9c21-4f94b0b1c2d6}</Project>
+      <Name>SolutionExplorerShim</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\TestUtilities2\VisualStudioTestUtilities2.vbproj">
       <Project>{69f853e5-bd04-4842-984f-fc68cc51f402}</Project>
       <Name>VisualStudioTestUtilities2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\VisualBasic\Impl\BasicVisualStudio.vbproj">
+      <Project>{d49439d7-56d2-450f-a4f0-74cb95d620e6}</Project>
+      <Name>BasicVisualStudio</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Impl\CSharpVisualStudio.csproj">
       <Project>{5DEFADBD-44EB-47A2-A53E-F1282CC9E4E9}</Project>
       <Name>CSharpVisualStudio</Name>
@@ -85,17 +165,14 @@
     <ProjectReference Include="..\..\..\Features\CSharp\Portable\CSharpFeatures.csproj">
       <Project>{3973B09A-4FBF-44A5-8359-3D22CEB71F71}</Project>
       <Name>CSharpFeatures</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Features\Core\Portable\Features.csproj">
       <Project>{EDC68A0E-C68D-4A74-91B7-BF38EC909888}</Project>
       <Name>Features</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">

src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj

@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects>
-    <RoslynProjectType>UnitTestNext</RoslynProjectType>
+    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">

src/VisualStudio/Core/Test/project.json

 {
     "dependencies": {
+        "BasicUndo": "0.9.3",
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.RemoteControl": {
             "version": "14.0.249-master2E2DC10C",
             "suppressParent": "all"

src/VisualStudio/IntegrationTests/VisualStudioIntegrationTests.csproj

@@ -11,7 +11,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <Nonshipping>true</Nonshipping>
-    <RoslynProjectType>UnitTestNext</RoslynProjectType>
+    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"></PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"></PropertyGroup>

src/Workspaces/CoreTest/project.json

 {
     "dependencies": {
         "xunit": "2.1.0",
-        "xunit.runner.console": "2.2.0-beta1-build3239"
+        "xunit.runner.console": "2.2.0-beta1-build3239",
+        "Microsoft.CodeAnalysis.Elfie": {
+            "version": "0.10.6-rc2",
+            "suppressParent": "all"
+        }
     },
     "frameworks": {
         "net46": { }