Copy ResultProvider sources, rather than binaries

We need to produce two copies of each ResultProvider DLL, one that runs on NetFX20 and one that is Portable. We originally believed that we could create a single DLL that would work for both and so we just copied the output of each ResultProvider project and signed it with a different Authenticode certificate. Now we know that - even though the source of both versions will be the same - we need to actually recompile for Portable. As a first step, we eliminate the copying mechanism and split each ResultProvider project in two. To minimize duplication, we introduce shared projects that hold on to most of the source. The next step will be to make the two copies reference different assemblies.

Copy ResultProvider sources, rather than binaries
We need to produce two copies of each ResultProvider DLL, one that runs on NetFX20 and one that is Portable. We originally believed that we could create a single DLL that would work for both and so we just copied the output of each ResultProvider project and signed it with a different Authenticode certificate. Now we know that - even though the source of both versions will be the same - we need to actually recompile for Portable. As a first step, we eliminate the copying mechanism and split each ResultProvider project in two. To minimize duplication, we introduce shared projects that hold on to most of the source. The next step will be to make the two copies reference different assemblies.
58292048 · Andrew Casey · 389960df · 58292048 · 58292048 · 58292048
31 changed file
--- a/build/VSL.Imports.Closed.targets
+++ b/build/VSL.Imports.Closed.targets
@@ -74,53 +74,14 @@
    
  </Target>

-  <!-- ====================================================================================
-  
-         Support for signing phone assemblies.
-
-       ==================================================================================== -->
-  <UsingTask TaskName="SignFiles" AssemblyFile="$(TF_BUILD_BUILDDIRECTORY)\MicroBuild\MicroBuild.Signing.dll" Condition="'$(RunningInMicroBuild)' == 'true'" />
-
-  <Target Name="CreateAndSignPhoneCopy" 
-          Condition="'$(NeedsPhoneCopy)' == 'true'"
-          DependsOnTargets="Compile"
-          BeforeTargets="SignVsixInputs"
-          Inputs="@(IntermediateAssembly)"
-          Outputs="$(OutDir)Phone\%(Filename)%(Extension)">
-    <Copy SourceFiles="@(IntermediateAssembly)"
-        DestinationFolder="$(OutDir)Phone" />
-
-    <ItemGroup Condition="'$(ShouldSignBuild)' == 'true'">
-        <PhoneAssembliesToSign Include="$(OutDir)Phone\%(IntermediateAssembly.Filename)%(IntermediateAssembly.Extension)">
-            <Authenticode>WindowsPhone623</Authenticode>
-            <StrongName>72</StrongName>
-        </PhoneAssembliesToSign>
-    </ItemGroup>
-
-    <Message Condition="'$(ShouldSignBuild)' == 'true'"
-             Text="Signing phone assemblies: using authenticode certificate '%(PhoneAssembliesToSign.Authenticode)' for @(PhoneAssembliesToSign)"/>
-    
-    <SignFiles Condition="'$(ShouldSignBuild)' == 'true'"
-               Files="@(PhoneAssembliesToSign)" 
-               IntermediatesDirectory="$(IntermediateOutputPath)"
-               BinariesDirectory="$(OutDir)Phone" 
-               Type="$(SignType)" />
-  </Target>
-
-  <Target Name="CleanPhoneCopy">
-    <RemoveDir Directories="$(OutDir)Phone')" />
-  </Target>
-
-  <PropertyGroup>
-    <CleanDependsOn>$(CleanDependsOn);CleanPhoneCopy</CleanDependsOn>
-  </PropertyGroup>
-
  <!-- ====================================================================================
  
         Support for signing VSIXes

       ==================================================================================== -->

+  <UsingTask TaskName="SignFiles" AssemblyFile="$(TF_BUILD_BUILDDIRECTORY)\MicroBuild\MicroBuild.Signing.dll" Condition="'$(RunningInMicroBuild)' == 'true'" />
+
  <PropertyGroup>
    <CreateVsixContainerDependsOn>$(CreateVsixContainerDependsOn);SignVsixInputs</CreateVsixContainerDependsOn>
    <PrepareForRunDependsOn>$(PrepareForRunDependsOn);SignVsix</PrepareForRunDependsOn>

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.projitems
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.projitems
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>3140fe61-0856-4367-9aa3-8081b9a80e36</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Placeholders.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\TypeExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)CSharpFormatter.TypeNames.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)CSharpFormatter.Values.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)CSharpFormatter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)CSharpResultProvider.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <VsdConfigXml Include="$(MSBuildThisFileDirectory)CSharpResultProvider.vsdconfigxml">
+      <SubType>Designer</SubType>
+    </VsdConfigXml>
+  </ItemGroup>
+</Project>
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.shproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.shproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>3140fe61-0856-4367-9aa3-8081b9a80e36</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="CSharpResultProvider.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.csproj
@@ -4,8 +4,8 @@
    <TargetNetFX20>true</TargetNetFX20>
  </PropertyGroup>
  <ImportGroup Label="Settings">
-    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
-    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
  </ImportGroup>
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,28 +15,24 @@
    <AuthenticodeCertificateName>MicrosoftSHA1Win8WinBlue</AuthenticodeCertificateName>
    <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
-    <NeedsPhoneCopy>true</NeedsPhoneCopy>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
-    <Compile Include="..\..\..\..\Compilers\CSharp\Portable\Parser\CharacterInfo.cs">
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Parser\CharacterInfo.cs">
      <Link>Compiler\Parser\CharacterInfo.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKind.cs">
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKind.cs">
      <Link>Compiler\Syntax\SyntaxKind.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs">
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs">
      <Link>Compiler\Syntax\SyntaxKindFacts.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
      <Link>Compiler\SymbolDisplay\ObjectDisplay.cs</Link>
    </Compile>
-    <Compile Include="CSharpFormatter.TypeNames.cs" />
-    <Compile Include="CSharpFormatter.Values.cs" />
-    <Compile Include="Helpers\Placeholders.cs" />
-    <Compile Include="Helpers\TypeExtensions.cs" />
-    <Compile Include="Resources.Designer.cs">
+    <Compile Include="..\Resources.Designer.cs">
+      <Link>Resources.Designer.cs</Link>
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
@@ -49,25 +45,19 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
  <ItemGroup>
-    <Compile Include="CSharpFormatter.cs" />
-    <Compile Include="CSharpResultProvider.cs" />
-    <VsdConfigXml Include="CSharpResultProvider.vsdconfigxml">
-      <SubType>Designer</SubType>
-    </VsdConfigXml>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
      <Name>Concord</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Core\Source\ResultProvider\ResultProvider.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Source\ResultProvider\NetFX20\ResultProvider.NetFX20.csproj">
      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
-      <Name>ResultProvider</Name>
+      <Name>ResultProvider.NetFX20</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="..\Resources.resx">
+      <Link>Resources.resx</Link>
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
      <CustomToolNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</CustomToolNamespace>
@@ -76,10 +66,11 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <Import Project="..\CSharpResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
-    <Import Project="..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
-    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
+    <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Imports.Closed.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/packages.config
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/packages.config
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
+  <ImportGroup Label="Settings">
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
+  </ImportGroup>
+  <PropertyGroup>
+    <OutDir>$(OutDir)Phone\</OutDir>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <ItemGroup Label="Linked Files">
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Parser\CharacterInfo.cs">
+      <Link>Compiler\Parser\CharacterInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKind.cs">
+      <Link>Compiler\Syntax\SyntaxKind.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs">
+      <Link>Compiler\Syntax\SyntaxKindFacts.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
+      <Link>Compiler\SymbolDisplay\ObjectDisplay.cs</Link>
+    </Compile>
+    <Compile Include="..\Resources.Designer.cs">
+      <Link>Resources.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
+      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
+      <Name>Concord</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Source\ResultProvider\Portable\ResultProvider.Portable.csproj">
+      <Project>{fa0e905d-ec46-466d-b7b2-3b5557f9428c}</Project>
+      <Name>ResultProvider.Portable</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Resources.resx">
+      <Link>Resources.resx</Link>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</CustomToolNamespace>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\CSharpResultProvider.projitems" Label="Shared" />
+  <ImportGroup Label="Targets">
+    <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Imports.Closed.targets" />
+    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/packages.config
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/packages.config
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
+</packages>
\ No newline at end of file
--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj
@@ -86,21 +86,6 @@
    <Compile Include="..\..\..\..\Compilers\CSharp\Portable\SymbolDisplay\ObjectDisplay.cs">
      <Link>Compiler\SymbolDisplay\ObjectDisplay.cs</Link>
    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\CSharpFormatter.cs">
-      <Link>ResultProvider\CSharpFormatter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\CSharpFormatter.TypeNames.cs">
-      <Link>ResultProvider\CSharpFormatter.TypeNames.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\CSharpFormatter.Values.cs">
-      <Link>ResultProvider\CSharpFormatter.Values.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\CSharpResultProvider.cs">
-      <Link>ResultProvider\CSharpResultProvider.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\TypeExtensions.cs">
-      <Link>ResultProvider\Helpers\TypeExtensions.cs</Link>
-    </Compile>
    <Compile Include="..\..\Source\ResultProvider\Resources.Designer.cs">
      <Link>Resources.Designer.cs</Link>
      <AutoGen>True</AutoGen>
@@ -135,10 +120,11 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <Import Project="..\..\Source\ResultProvider\CSharpResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
    <Import Project="..\..\..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
@@ -34,14 +34,22 @@
    <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Metadata" />
    <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Engine" />
  </ItemGroup>
-  <Target Name="Ilasm" 
+  <Target Name="IlasmNetFX20" 
          AfterTargets="CoreCompile"
-          Inputs="@(ConcordAssemblies->'$(ConcordDir)%(Identity).il')"
+          Inputs="@(ConcordAssemblies->'$(ConcordDir)%(Identity).NetFX20.il')"
          Outputs="$(OutDir)%(Identity).dll">
-    <Exec Command="$(MSBuildFrameworkToolsPath)ilasm.exe /dll /quiet /mdv:v2.0.50727 &quot;/output:$(OutDir)@(ConcordAssemblies).dll&quot; $(ConcordDir)@(ConcordAssemblies).il" />
+    <Exec Command="$(MSBuildFrameworkToolsPath)ilasm.exe /dll /quiet /mdv:v2.0.50727 &quot;/output:$(OutDir)@(ConcordAssemblies).dll&quot; $(ConcordDir)@(ConcordAssemblies).NetFX20.il" />
+  </Target>
+  <Target Name="IlasmPortable" 
+          AfterTargets="CoreCompile"
+          Inputs="@(ConcordAssemblies->'$(ConcordDir)%(Identity).Portable.il')"
+          Outputs="$(OutDir)Phone\%(Identity).dll">
+    <MakeDir Directories="$(OutDir)Phone" />
+    <Exec Command="$(MSBuildFrameworkToolsPath)ilasm.exe /dll /quiet &quot;/output:$(OutDir)Phone\@(ConcordAssemblies).dll&quot; $(ConcordDir)@(ConcordAssemblies).Portable.il" />
  </Target>
  <Target Name="CleanIlasmOutputs" AfterTargets="Clean">
    <Delete Files="@(ConcordAssemblies->'$(OutDir)%(Identity).dll')" />
+    <Delete Files="@(ConcordAssemblies->'$(OutDir)Phone\%(Identity).dll')" />
  </Target>
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />

--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.il
--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.Portable.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.Portable.il
--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.il
--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.Portable.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.Portable.il
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.csproj
@@ -4,8 +4,8 @@
    <TargetNetFX20>true</TargetNetFX20>
  </PropertyGroup>
  <ImportGroup Label="Settings">
-    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
-    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
  </ImportGroup>
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,63 +15,67 @@
    <AuthenticodeCertificateName>MicrosoftSHA1Win8WinBlue</AuthenticodeCertificateName>
    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
    <RestorePackages>true</RestorePackages>
-    <NeedsPhoneCopy>true</NeedsPhoneCopy>
  </PropertyGroup>
  <ItemGroup Label="Linked Files">
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
      <Link>Compiler\CaseInsensitiveComparison.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\Collections\PooledStringBuilder.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\Collections\PooledStringBuilder.cs">
      <Link>Compiler\Collections\PooledStringBuilder.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\InternalUtilities\FailFast.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\FailFast.cs">
      <Link>Compiler\InternalUtilities\FailFast.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\InternalUtilities\FatalError.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\FatalError.cs">
      <Link>Compiler\InternalUtilities\FatalError.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\InternalUtilities\EnumField.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\EnumField.cs">
      <Link>Compiler\InternalUtilities\EnumField.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\InternalUtilities\ExceptionUtilities.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\ExceptionUtilities.cs">
      <Link>Compiler\InternalUtilities\ExceptionUtilities.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\SharedCollections\ObjectPool`1.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\SharedCollections\ObjectPool`1.cs">
      <Link>Compiler\InternalUtilities\ObjectPool`1.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\SymbolDisplay\ObjectDisplayExtensions.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\SymbolDisplay\ObjectDisplayExtensions.cs">
      <Link>Compiler\SymbolDisplay\ObjectDisplayExtensions.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\SymbolDisplay\ObjectDisplayOptions.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\SymbolDisplay\ObjectDisplayOptions.cs">
      <Link>Compiler\SymbolDisplay\ObjectDisplayOptions.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\SymbolDisplay\SymbolDisplayPartKind.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\SymbolDisplay\SymbolDisplayPartKind.cs">
      <Link>Compiler\SymbolDisplay\SymbolDisplayPartKind.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\Symbols\WellKnownMemberNames.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\Symbols\WellKnownMemberNames.cs">
      <Link>Compiler\Symbols\WellKnownMemberNames.cs</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\Core\Portable\Xml\XmlCharType.cs">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\Xml\XmlCharType.cs">
      <Link>Compiler\Xml\XmlCharType.cs</Link>
    </Compile>
-    <Compile Include="..\ExpressionCompiler\ExpressionEvaluatorFatalError.cs">
-      <Link>Helpers\ExpressionEvaluatorFatalError.cs</Link>
+    <Compile Include="..\..\ExpressionCompiler\ExpressionEvaluatorFatalError.cs">
+      <Link>ExpressionCompiler\ExpressionEvaluatorFatalError.cs</Link>
    </Compile>
-    <Compile Include="..\ExpressionCompiler\DateTimeUtilities.cs">
-      <Link>Helpers\DateTimeUtilities.cs</Link>
+    <Compile Include="..\..\ExpressionCompiler\DateTimeUtilities.cs">
+      <Link>ExpressionCompiler\DateTimeUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\Helpers\Placeholders.cs">
+      <Link>Helpers\Placeholders.cs</Link>
+    </Compile>
+    <Compile Include="..\SystemHelpers.cs">
+      <Link>Helpers\SystemHelpers.cs</Link>
    </Compile>
-    <Compile Include="SystemHelpers.cs" />
  </ItemGroup>
  <ItemGroup Label="File References">
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
  </ItemGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
      <Name>Concord</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -80,40 +84,16 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
  <ItemGroup>
-    <Compile Include="Expansion\AggregateExpansion.cs" />
-    <Compile Include="Expansion\ArrayExpansion.cs" />
-    <Compile Include="Expansion\DebuggerTypeProxyExpansion.cs" />
-    <Compile Include="Expansion\Expansion.cs" />
-    <Compile Include="Expansion\MemberExpansion.cs" />
-    <Compile Include="Expansion\PointerDereferenceExpansion.cs" />
-    <Compile Include="Expansion\ResultsViewExpansion.cs" />
-    <Compile Include="Expansion\TypeVariablesExpansion.cs" />
-    <Compile Include="Formatter.TypeNames.cs" />
-    <Compile Include="Formatter.Values.cs" />
-    <Compile Include="Formatter.cs" />
-    <Compile Include="Helpers\ArrayBuilder.cs" />
-    <Compile Include="Helpers\DebuggerDisplayInfo.cs" />
-    <Compile Include="Helpers\DkmClrValueFlagsExtensions.cs" />
-    <Compile Include="Helpers\DkmEvaluationResultFlagsExtensions.cs" />
-    <Compile Include="Helpers\EnumContextDataItem.cs" />
-    <Compile Include="Helpers\EvalResultDataItem.cs" />
-    <Compile Include="Helpers\GeneratedMetadataNames.cs" />
-    <Compile Include="Helpers\HashFunctions.cs" />
-    <Compile Include="Helpers\InternalWellKnownMemberNames.cs" />
-    <Compile Include="Helpers\MemberAndDeclarationInfo.cs" />
-    <Compile Include="Helpers\Placeholders.cs" />
-    <Compile Include="Helpers\RawStringDataItem.cs" />
-    <Compile Include="Helpers\TypeHelpers.cs" />
-    <Compile Include="Helpers\ValueHelpers.cs" />
-    <Compile Include="Resources.Designer.cs">
+    <Compile Include="..\Resources.Designer.cs">
+      <Link>Resources.Designer.cs</Link>
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="ResultProvider.cs" />
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="..\Resources.resx">
+      <Link>Resources.resx</Link>
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
@@ -125,9 +105,10 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <Import Project="..\ResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
-    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Imports.Closed.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/packages.config
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/packages.config
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
+  <ImportGroup Label="Settings">
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
+  </ImportGroup>
+  <PropertyGroup>
+    <OutDir>$(OutDir)Phone\</OutDir>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FA0E905D-EC46-466D-B7B2-3B5557F9428C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
+    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
+    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <ItemGroup Label="Linked Files">
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
+      <Link>Compiler\CaseInsensitiveComparison.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\Collections\PooledStringBuilder.cs">
+      <Link>Compiler\Collections\PooledStringBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\FailFast.cs">
+      <Link>Compiler\InternalUtilities\FailFast.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\FatalError.cs">
+      <Link>Compiler\InternalUtilities\FatalError.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\EnumField.cs">
+      <Link>Compiler\InternalUtilities\EnumField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\ExceptionUtilities.cs">
+      <Link>Compiler\InternalUtilities\ExceptionUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\SharedCollections\ObjectPool`1.cs">
+      <Link>Compiler\InternalUtilities\ObjectPool`1.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\SymbolDisplay\ObjectDisplayExtensions.cs">
+      <Link>Compiler\SymbolDisplay\ObjectDisplayExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\SymbolDisplay\ObjectDisplayOptions.cs">
+      <Link>Compiler\SymbolDisplay\ObjectDisplayOptions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\SymbolDisplay\SymbolDisplayPartKind.cs">
+      <Link>Compiler\SymbolDisplay\SymbolDisplayPartKind.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\Symbols\WellKnownMemberNames.cs">
+      <Link>Compiler\Symbols\WellKnownMemberNames.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\Core\Portable\Xml\XmlCharType.cs">
+      <Link>Compiler\Xml\XmlCharType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ExpressionCompiler\ExpressionEvaluatorFatalError.cs">
+      <Link>ExpressionCompiler\ExpressionEvaluatorFatalError.cs</Link>
+    </Compile>
+    <Compile Include="..\..\ExpressionCompiler\DateTimeUtilities.cs">
+      <Link>ExpressionCompiler\DateTimeUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\Helpers\Placeholders.cs">
+      <Link>Helpers\Placeholders.cs</Link>
+    </Compile>
+    <Compile Include="..\SystemHelpers.cs">
+      <Link>Helpers\SystemHelpers.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
+      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
+      <Name>Concord</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <Compile Include="..\Resources.Designer.cs">
+      <Link>Resources.Designer.cs</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Resources.resx">
+      <Link>Resources.resx</Link>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\ResultProvider.projitems" Label="Shared" />
+  <ImportGroup Label="Targets">
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Imports.Closed.targets" />
+    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/packages.config
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/packages.config
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
+</packages>
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.projitems
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.projitems
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>75883ee4-8cbc-499f-b15c-c55fe036108a</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>ResultProvider</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Formatter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Formatter.TypeNames.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Formatter.Values.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ResultProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\AggregateExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\ArrayExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\DebuggerTypeProxyExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\Expansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\MemberExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\PointerDereferenceExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\ResultsViewExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expansion\TypeVariablesExpansion.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\ArrayBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\DebuggerDisplayInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\DkmClrValueFlagsExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\DkmEvaluationResultFlagsExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\EnumContextDataItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\EvalResultDataItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\GeneratedMetadataNames.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\HashFunctions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\InternalWellKnownMemberNames.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\MemberAndDeclarationInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\RawStringDataItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\TypeHelpers.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\ValueHelpers.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.shproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.shproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>bb3ca047-5d00-48d4-b7d3-233c1265c065</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="ResultProvider.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
@@ -67,82 +67,13 @@
      <Link>Compiler\Symbols\WellKnownMemberNames.cs</Link>
    </Compile>
    <Compile Include="..\..\Source\ExpressionCompiler\DateTimeUtilities.cs">
-      <Link>ResultProvider\Helpers\DateTimeUtilities.cs</Link>
+      <Link>ExpressionCompiler\DateTimeUtilities.cs</Link>
    </Compile>
    <Compile Include="..\..\Source\ExpressionCompiler\ExpressionCompilerConstants.cs">
      <Link>ExpressionCompiler\ExpressionCompilerConstants.cs</Link>
    </Compile>
    <Compile Include="..\..\Source\ExpressionCompiler\ExpressionEvaluatorFatalError.cs">
-      <Link>ResultProvider\Helpers\ExpressionEvaluatorFatalError.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\AggregateExpansion.cs">
-      <Link>ResultProvider\Expansion\AggregateExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\ArrayExpansion.cs">
-      <Link>ResultProvider\Expansion\ArrayExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\DebuggerTypeProxyExpansion.cs">
-      <Link>ResultProvider\Expansion\DebuggerTypeProxyExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\Expansion.cs">
-      <Link>ResultProvider\Expansion\Expansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\MemberExpansion.cs">
-      <Link>ResultProvider\Expansion\MemberExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\PointerDereferenceExpansion.cs">
-      <Link>ResultProvider\Expansion\PointerDereferenceExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\ResultsViewExpansion.cs">
-      <Link>ResultProvider\Expansion\ResultsViewExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Expansion\TypeVariablesExpansion.cs">
-      <Link>ResultProvider\Expansion\TypeVariablesExpansion.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Formatter.cs">
-      <Link>ResultProvider\Formatter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Formatter.TypeNames.cs">
-      <Link>ResultProvider\Formatter.TypeNames.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Formatter.Values.cs">
-      <Link>ResultProvider\Formatter.Values.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\ArrayBuilder.cs">
-      <Link>ResultProvider\Helpers\ArrayBuilder.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\DebuggerDisplayInfo.cs">
-      <Link>ResultProvider\Helpers\DebuggerDisplayInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\DkmClrValueFlagsExtensions.cs">
-      <Link>ResultProvider\Helpers\DkmClrValueFlagsExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\DkmEvaluationResultFlagsExtensions.cs">
-      <Link>ResultProvider\Helpers\DkmEvaluationResultFlagsExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\EvalResultDataItem.cs">
-      <Link>ResultProvider\Helpers\EvalResultDataItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\EnumContextDataItem.cs">
-      <Link>ResultProvider\Helpers\EnumContextDataItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\GeneratedMetadataNames.cs">
-      <Link>ResultProvider\Helpers\GeneratedMetadataNames.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\InternalWellKnownMemberNames.cs">
-      <Link>ResultProvider\Helpers\InternalWellKnownMemberNames.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\MemberAndDeclarationInfo.cs">
-      <Link>ResultProvider\Helpers\MemberAndDeclarationInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\RawStringDataItem.cs">
-      <Link>ResultProvider\Helpers\RawStringDataItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\TypeHelpers.cs">
-      <Link>ResultProvider\Helpers\TypeHelpers.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\ValueHelpers.cs">
-      <Link>ResultProvider\Helpers\ValueHelpers.cs</Link>
+      <Link>ExpressionCompiler\ExpressionEvaluatorFatalError.cs</Link>
    </Compile>
    <Compile Include="..\..\Source\ResultProvider\Resources.Designer.cs">
      <Link>Resources.Designer.cs</Link>
@@ -150,9 +81,6 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\ResultProvider.cs">
-      <Link>ResultProvider\ResultProvider.cs</Link>
-    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Debugger\Engine\DkmContinueCorruptingException.cs" />
@@ -221,6 +149,7 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <Import Project="..\..\Source\ResultProvider\ResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />

--- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
+++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj
@@ -44,9 +44,9 @@
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
    </ProjectReference>
-    <ProjectReference Include="..\Core\Source\ResultProvider\ResultProvider.csproj">
+    <ProjectReference Include="..\Core\Source\ResultProvider\NetFX20\ResultProvider.NetFX20.csproj">
      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
-      <Name>ResultProvider</Name>
+      <Name>ResultProvider.NetFX20</Name>
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
    </ProjectReference>
@@ -56,9 +56,9 @@
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bVsdConfigOutputGroup</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
    </ProjectReference>
-    <ProjectReference Include="..\CSharp\Source\ResultProvider\CSharpResultProvider.csproj">
+    <ProjectReference Include="..\CSharp\Source\ResultProvider\NetFX20\CSharpResultProvider.NetFX20.csproj">
      <Project>{BF9DAC1E-3A5E-4DC3-BB44-9A64E0D4E9D3}</Project>
-      <Name>CSharpResultProvider</Name>
+      <Name>CSharpResultProvider.NetFX20</Name>
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bVsdConfigOutputGroup</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
    </ProjectReference>
@@ -68,9 +68,9 @@
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bVsdConfigOutputGroup</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
    </ProjectReference>
-    <ProjectReference Include="..\VisualBasic\Source\ResultProvider\BasicResultProvider.vbproj">
+    <ProjectReference Include="..\VisualBasic\Source\ResultProvider\NetFX20\BasicResultProvider.NetFX20.vbproj">
      <Project>{76242A2D-2600-49DD-8C15-FEA07ECB1842}</Project>
-      <Name>BasicResultProvider</Name>
+      <Name>BasicResultProvider.NetFX20</Name>
      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bVsdConfigOutputGroup</IncludeOutputGroupsInVSIX>
      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup</IncludeOutputGroupsInVSIXLocalOnly>
    </ProjectReference>
@@ -101,4 +101,4 @@
    <Import Project="..\..\..\build\VSL.Imports.Closed.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/Package/source.extension.vsixmanifest
+++ b/src/ExpressionEvaluator/Package/source.extension.vsixmanifest
@@ -16,8 +16,8 @@
  </Dependencies>
  <Assets>
    <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="BasicExpressionCompiler" Path="|BasicExpressionCompiler;VsdConfigOutputGroup|" />
-    <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="BasicResultProvider" Path="|BasicResultProvider;VsdConfigOutputGroup|" />
+    <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="BasicResultProvider.NetFX20" Path="|BasicResultProvider.NetFX20;VsdConfigOutputGroup|" />
    <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpExpressionCompiler" Path="|CSharpExpressionCompiler;VsdConfigOutputGroup|" />
-    <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpResultProvider" Path="|CSharpResultProvider;VsdConfigOutputGroup|" />
+    <Asset Type="DebuggerEngineExtension" d:Source="Project" d:ProjectName="CSharpResultProvider.NetFX20" Path="|CSharpResultProvider.NetFX20;VsdConfigOutputGroup|" />
  </Assets>
 </PackageManifest>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.projitems
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.projitems
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>3140fe61-0856-4367-9aa3-8081b9a80e35</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Placeholders.vb" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\TypeExtensions.vb" />
+    <Compile Include="$(MSBuildThisFileDirectory)VisualBasicFormatter.TypeNames.vb" />
+    <Compile Include="$(MSBuildThisFileDirectory)VisualBasicFormatter.Values.vb" />
+    <Compile Include="$(MSBuildThisFileDirectory)VisualBasicFormatter.vb" />
+    <Compile Include="$(MSBuildThisFileDirectory)VisualBasicResultProvider.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <VsdConfigXml Include="$(MSBuildThisFileDirectory)VisualBasicResultProvider.vsdconfigxml">
+      <SubType>Designer</SubType>
+    </VsdConfigXml>
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="IdentifierComparison=Microsoft.CodeAnalysis.CaseInsensitiveComparison" />
+  </ItemGroup>
+</Project>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.shproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.shproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>3140fe61-0856-4367-9aa3-8081b9a80e35</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="BasicResultProvider.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.VisualBasic.targets" />
+</Project>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.vbproj
@@ -4,8 +4,8 @@
    <TargetNetFX20>true</TargetNetFX20>
  </PropertyGroup>
  <ImportGroup Label="Settings">
-    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
-    <Import Project="..\..\..\..\..\build\VSL.Settings.Closed.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
  </ImportGroup>
  <PropertyGroup>
    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
@@ -16,13 +16,12 @@
    <RootNamespace>
    </RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</AssemblyName>
-    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
    <VBSyntaxGeneratorToolPath>$(OutDir)\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
    <RemoveIntegerChecks>true</RemoveIntegerChecks>
    <RestorePackages>true</RestorePackages>
-    <NeedsPhoneCopy>true</NeedsPhoneCopy>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
@@ -33,61 +32,47 @@
    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
  </ItemGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
      <Name>Concord</Name>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Core\Source\ResultProvider\ResultProvider.csproj">
+    <ProjectReference Include="..\..\..\..\Core\Source\ResultProvider\NetFX20\ResultProvider.NetFX20.csproj">
      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
-      <Name>ResultProvider</Name>
+      <Name>ResultProvider.NetFX20</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup Label="Linked Files">
-    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\Scanner\CharacterInfo.vb">
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Scanner\CharacterInfo.vb">
      <Link>Compiler\Scanner\CharacterInfo.vb</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\Scanner\KeywordTable.vb">
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Scanner\KeywordTable.vb">
      <Link>Compiler\Scanner\KeywordTable.vb</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\SymbolDisplay\ObjectDisplay.vb">
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\SymbolDisplay\ObjectDisplay.vb">
      <Link>Compiler\SymbolDisplay\ObjectDisplay.vb</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKind.vb">
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKind.vb">
      <Link>Compiler\Syntax\SyntaxKind.vb</Link>
    </Compile>
-    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKindFacts.vb">
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKindFacts.vb">
      <Link>Compiler\Syntax\SyntaxKindFacts.vb</Link>
    </Compile>
-    <SyntaxGetTextDefinition Include="..\..\..\..\Compilers\VisualBasic\Portable\Syntax\Syntax.xml">
-      <Link>Compiler\Syntax\Syntax.xml</Link>
-      <SubType>Designer</SubType>
-    </SyntaxGetTextDefinition>
-    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <VsdConfigXml Include="VisualBasicResultProvider.vsdconfigxml">
-      <SubType>Designer</SubType>
-    </VsdConfigXml>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Helpers\Placeholders.vb" />
-    <Compile Include="Helpers\TypeExtensions.vb" />
-    <Compile Include="Resources.Designer.vb">
+    <Compile Include="..\Resources.Designer.vb">
+      <Link>Resources.Designer.vb</Link>
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="VisualBasicFormatter.TypeNames.vb" />
-    <Compile Include="VisualBasicFormatter.Values.vb" />
-    <Compile Include="VisualBasicFormatter.vb" />
-    <Compile Include="VisualBasicResultProvider.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="IdentifierComparison=Microsoft.CodeAnalysis.CaseInsensitiveComparison" />
+    <SyntaxGetTextDefinition Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\Syntax.xml">
+      <Link>Compiler\Syntax\Syntax.xml</Link>
+      <SubType>Designer</SubType>
+    </SyntaxGetTextDefinition>
+    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <EmbeddedResource Include="..\Resources.resx">
+      <Link>Resources.resx</Link>
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator</CustomToolNamespace>
@@ -96,13 +81,11 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup>
-    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
-  </ItemGroup>
+  <Import Project="..\BasicResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
-    <Import Project="..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
-    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
+    <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Imports.Closed.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/packages.config
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/packages.config
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
+</packages>
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TargetNetFX20>true</TargetNetFX20>
+  </PropertyGroup>
+  <ImportGroup Label="Settings">
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Settings.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Settings.Closed.targets" />
+  </ImportGroup>
+  <PropertyGroup>
+    <OutDir>$(OutDir)Phone\</OutDir>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <ProjectGuid>{76242A2D-2600-49DD-8C15-FEA07ECB1843}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>
+    </RootNamespace>
+    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider</AssemblyName>
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\..\</SolutionDir>
+    <VBSyntaxGeneratorToolPath>$(OutDir)..\VBSyntaxGenerator.exe</VBSyntaxGeneratorToolPath>
+    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
+    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
+    <RemoveIntegerChecks>true</RemoveIntegerChecks>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
+    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Core\Source\Concord\Concord.csproj">
+      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
+      <Name>Concord</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Source\ResultProvider\Portable\ResultProvider.Portable.csproj">
+      <Project>{fa0e905d-ec46-466d-b7b2-3b5557f9428c}</Project>
+      <Name>ResultProvider.Portable</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Label="Linked Files">
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Scanner\CharacterInfo.vb">
+      <Link>Compiler\Scanner\CharacterInfo.vb</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Scanner\KeywordTable.vb">
+      <Link>Compiler\Scanner\KeywordTable.vb</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\SymbolDisplay\ObjectDisplay.vb">
+      <Link>Compiler\SymbolDisplay\ObjectDisplay.vb</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKind.vb">
+      <Link>Compiler\Syntax\SyntaxKind.vb</Link>
+    </Compile>
+    <Compile Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\SyntaxKindFacts.vb">
+      <Link>Compiler\Syntax\SyntaxKindFacts.vb</Link>
+    </Compile>
+    <Compile Include="..\Resources.Designer.vb">
+      <Link>Resources.Designer.vb</Link>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <SyntaxGetTextDefinition Include="..\..\..\..\..\Compilers\VisualBasic\Portable\Syntax\Syntax.xml">
+      <Link>Compiler\Syntax\Syntax.xml</Link>
+      <SubType>Designer</SubType>
+    </SyntaxGetTextDefinition>
+    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\Resources.resx">
+      <Link>Resources.resx</Link>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator</CustomToolNamespace>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\BasicResultProvider.projitems" Label="Shared" />
+  <ImportGroup Label="Targets">
+    <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />
+    <Import Project="..\..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\..\..\..\build\VSL.Imports.Closed.targets" />
+    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/packages.config
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/packages.config
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.NetFX20" version="1.0.2-rc2" targetFramework="net20" />  
+</packages>
--- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj
@@ -54,12 +54,6 @@
      <Name>ResultProviderTestUtilities</Name>
    </ProjectReference>
    <!-- This reference is only needed to ensure correct build ordering (we link in all the necessary files as source). -->
-    <ProjectReference Include="..\..\Source\ResultProvider\BasicResultProvider.vbproj">
-      <Project>{76242a2d-2600-49dd-8c15-fea07ecb1842}</Project>
-      <Name>BasicResultProvider</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <Private>False</Private>
-    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
    <DebugSymbols>true</DebugSymbols>
@@ -83,27 +77,12 @@
    <Compile Include="..\..\..\..\Compilers\VisualBasic\Portable\SymbolDisplay\ObjectDisplay.vb">
      <Link>Compiler\SymbolDisplay\ObjectDisplay.vb</Link>
    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\Helpers\TypeExtensions.vb">
-      <Link>ResultProvider\Helpers\TypeExtensions.vb</Link>
-    </Compile>
    <Compile Include="..\..\Source\ResultProvider\Resources.Designer.vb">
      <Link>Resources.Designer.vb</Link>
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\VisualBasicFormatter.TypeNames.vb">
-      <Link>ResultProvider\VisualBasicFormatter.TypeNames.vb</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\VisualBasicFormatter.Values.vb">
-      <Link>ResultProvider\VisualBasicFormatter.Values.vb</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\VisualBasicFormatter.vb">
-      <Link>ResultProvider\VisualBasicFormatter.vb</Link>
-    </Compile>
-    <Compile Include="..\..\Source\ResultProvider\VisualBasicResultProvider.vb">
-      <Link>ResultProvider\VisualBasicResultProvider.vb</Link>
-    </Compile>
    <Compile Include="ArrayExpansionTests.vb" />
    <Compile Include="DebuggerTypeProxyAttributeTests.vb" />
    <Compile Include="ExpansionTests.vb" />
@@ -128,10 +107,11 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <Import Project="..\..\Source\ResultProvider\BasicResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
    <Import Project="..\..\..\..\..\build\VSL.Imports.Closed.targets" />
    <Import Project="..\..\..\..\..\build\Roslyn.Toolsets.Xunit.targets" />
    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/Roslyn.sln
+++ b/src/Roslyn.sln
--- a/src/RoslynLight.sln
+++ b/src/RoslynLight.sln