Remove Concord project

At this point the Concord project exists just to fix a signing issue in the Debugger NuGet packages. This project is causing problems in our port to the new SDK because it's a Net 45 portable project that is referenced by Net 20 projects. The old build silently ignores this incompatibility but the new SDK takes issue with it, and the method it uses to pass DLLs around. Taking the simpler approach here of just fixing the signing issues (side thread going with debugger team) and removing the project.

Remove Concord project
At this point the Concord project exists just to fix a signing issue in the Debugger NuGet packages. This project is causing problems in our port to the new SDK because it's a Net 45 portable project that is referenced by Net 20 projects. The old build silently ignores this incompatibility but the new SDK takes issue with it, and the method it uses to pass DLLs around. Taking the simpler approach here of just fixing the signing issues (side thread going with debugger team) and removing the project.
d6d33272 · Jared Parsons · Jared Parsons · fc8dbe5d · d6d33272 · d6d33272
31 changed file
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -181,8 +181,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicResultProviderTest", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressionCompilerTestUtilities", "src\ExpressionEvaluator\Core\Test\ExpressionCompiler\ExpressionCompilerTestUtilities.csproj", "{21B80A31-8FF9-4E3A-8403-AABD635AEED9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Concord", "src\ExpressionEvaluator\Core\Source\Concord\Concord.csproj", "{5002636A-FE8D-40BF-8818-AB513A2194FA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultProviderTestUtilities", "src\ExpressionEvaluator\Core\Test\ResultProvider\ResultProviderTestUtilities.csproj", "{ABDBAC1E-350E-4DC3-BB45-3504404545EE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EditorFeatures", "EditorFeatures", "{EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}"
@@ -758,10 +756,6 @@ Global
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5002636A-FE8D-40BF-8818-AB513A2194FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5002636A-FE8D-40BF-8818-AB513A2194FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5002636A-FE8D-40BF-8818-AB513A2194FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5002636A-FE8D-40BF-8818-AB513A2194FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1117,7 +1111,6 @@ Global
 		{B8DA3A90-A60C-42E3-9D8E-6C67B800C395} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6}
 		{ACE53515-482C-4C6A-E2D2-4242A687DFEE} = {151F6994-AEB3-4B12-B746-2ACFF26C7BBB}
 		{21B80A31-8FF9-4E3A-8403-AABD635AEED9} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6}
-		{5002636A-FE8D-40BF-8818-AB513A2194FA} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6}
 		{ABDBAC1E-350E-4DC3-BB45-3504404545EE} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6}
 		{913A4C08-898E-49C7-9692-0EF9DC56CF6E} = {235A3418-A3B0-4844-BCEB-F1CF45069232}
 		{151F6994-AEB3-4B12-B746-2ACFF26C7BBB} = {235A3418-A3B0-4844-BCEB-F1CF45069232}

--- a/build/Targets/Dependencies.props
+++ b/build/Targets/Dependencies.props
@@ -27,8 +27,8 @@
    <MicrosoftMetadataVisualizerVersion>1.0.0-beta1-61531-03</MicrosoftMetadataVisualizerVersion>
    <MicrosoftNETCoreRuntimeCoreCLRVersion>1.1.0</MicrosoftNETCoreRuntimeCoreCLRVersion>
    <MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
-    <MicrosoftVisualStudioDebuggerEngineVersion>15.0.26201-alpha</MicrosoftVisualStudioDebuggerEngineVersion>
-    <MicrosoftVisualStudioDebuggerMetadataVersion>15.0.26201-alpha</MicrosoftVisualStudioDebuggerMetadataVersion>
+    <MicrosoftVisualStudioDebuggerEngineVersion>15.0.26201-gamma</MicrosoftVisualStudioDebuggerEngineVersion>
+    <MicrosoftVisualStudioDebuggerMetadataVersion>15.0.26201-gamma</MicrosoftVisualStudioDebuggerMetadataVersion>
    <MicrosoftVisualStudioInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioInteractiveWindowVersion>
    <MicrosoftVisualStudioVsInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioVsInteractiveWindowVersion>
    <MicrosoftVSSDKBuildToolsVersion>15.0.26124-RC3</MicrosoftVSSDKBuildToolsVersion>

--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
@@ -16,11 +16,6 @@
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
  </PropertyGroup>
  <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="..\..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
      <Name>CodeAnalysis</Name>
@@ -90,4 +85,4 @@
  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Vsdconfig.targets" />
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha"
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma"
  },
  "frameworks": {
    "netstandard1.3": {
      "imports": "portable-net46"
    }
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
@@ -33,11 +33,6 @@
  <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\NetFX20\ResultProvider.NetFX20.csproj">
      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
      <Name>ResultProvider.NetFX20</Name>

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
@@ -34,11 +34,6 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <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>

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
-    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-alpha"
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
+    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma"
  },
  "frameworks": {
    ".NETPortable,Version=v4.5,Profile=Profile7": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj
@@ -27,11 +27,6 @@
      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
      <Name>TestUtilities</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
-      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
-      <Name>Concord</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
      <Name>CodeAnalysis</Name>
@@ -112,4 +107,4 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "Microsoft.DiaSymReader": "1.1.0",
    "xunit": "2.2.0-beta4-build3444",
    "xunit.runner.console": "2.2.0-beta4-build3444",
@@ -12,4 +12,4 @@
  "runtimes": {
    "win7": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\build\Targets\Settings.props" />
-  <PropertyGroup>
-    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ProjectGuid>{5002636A-FE8D-40BF-8818-AB513A2194FA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Microsoft.CodeAnalysis.ExpressionEvaluator</RootNamespace>
-    <AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.Concord.DoNotUse</AssemblyName>
-    <ConcordDir>$(MSBuildThisFileDirectory)</ConcordDir>
-    <NonShipping>true</NonShipping>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <FakeSignToolPath>$(NuGetPackageRoot)\FakeSign\0.9.2\tools\FakeSign.exe</FakeSignToolPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Engine\$(MicrosoftVisualStudioDebuggerEngineVersion)\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Engine.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Metadata\$(MicrosoftVisualStudioDebuggerMetadataVersion)\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Metadata.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <Target Name="SignConcord" BeforeTargets="PrepareForRun">
-    <Exec Command="&quot;$(FakeSignToolPath)&quot; -f &quot;$(OutDir)%(Content.Filename)%(Extension)&quot;" />
-  </Target>
-  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
--- a/src/ExpressionEvaluator/Core/Source/Concord/project.json
+++ b/src/ExpressionEvaluator/Core/Source/Concord/project.json
-{
-  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
-    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-alpha"
-  },
-  "frameworks": {
-    ".NETPortable,Version=v4.5,Profile=Profile7": {}
-  }
-}
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj
@@ -60,11 +60,6 @@
    <Compile Include="PseudoVariableUtilities.cs" />
  </ItemGroup>
  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\Concord\Concord.csproj">
-      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
-      <Name>Concord</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
      <Name>CodeAnalysis</Name>
@@ -87,4 +82,4 @@
    <None Include="project.json" />
  </ItemGroup>
  <Import Project="..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "Microsoft.DiaSymReader": "1.1.0"
  },
  "frameworks": {
@@ -8,4 +8,4 @@
      "imports": "portable-net46"
    }
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolver.csproj
+++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/FunctionResolver.csproj
@@ -60,13 +60,6 @@
    <VsdConfigXml Include="CSharp\FunctionResolver.vsdconfigxml" />
    <VsdConfigXml Include="VisualBasic\FunctionResolver.vsdconfigxml" />
  </ItemGroup>
-  <ItemGroup Label="Project References">
-    <ProjectReference Include="..\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>

--- a/src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json
+++ b/src/ExpressionEvaluator/Core/Source/FunctionResolver/project.json
@@ -3,9 +3,9 @@
    "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
    "System.Collections.Immutable": "1.3.1",
    "System.Reflection.Metadata": "1.4.2",
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "Microsoft.VisualStudio.Debugger.Metadata": {
-        "version": "15.0.26201-alpha",
+        "version": "15.0.26201-gamma",
        "exclude": "compile"
    }
  },

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
@@ -69,13 +69,6 @@
      <Link>Helpers\SystemHelpers.cs</Link>
    </Compile>
  </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>
@@ -102,4 +95,4 @@
  </ItemGroup>
  <Import Project="..\ResultProvider.projitems" Label="Shared" />
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/project.json
 {
  "dependencies": {
    "Microsoft.NetFX20": "1.0.3",
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
-    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-alpha"
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
+    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma"
  },
  "frameworks": {
    "net20": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
@@ -69,13 +69,6 @@
    </Compile>
    <Compile Include="Helpers\Placeholders.cs" />
  </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>
@@ -100,4 +93,4 @@
  </ItemGroup>
  <Import Project="..\ResultProvider.projitems" Label="Shared" />
  <Import Project="..\..\..\..\..\..\build\Targets\Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
-    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-alpha"
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
+    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma"
  },
  "frameworks": {
    ".NETPortable,Version=v4.5,Profile=Profile7": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
@@ -21,11 +21,6 @@
      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
      <Name>TestUtilities</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
-      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
-      <Name>Concord</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
      <Name>CodeAnalysis</Name>

--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "Microsoft.DiaSymReader": "1.1.0",
    "xunit": "2.2.0-beta4-build3444",
    "xunit.runner.console": "2.2.0-beta4-build3444",
@@ -9,4 +9,4 @@
  "frameworks": {
    "net46": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/project.json
+++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "xunit": "2.2.0-beta4-build3444",
    "xunit.runner.console": "2.2.0-beta4-build3444",
    "xunit.runner.visualstudio": "2.2.0-beta4-build1194"
@@ -11,4 +11,4 @@
  "runtimes": {
    "win7": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
@@ -25,11 +25,6 @@
      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
      <Name>TestUtilities</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
-      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
-      <Name>Concord</Name>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Reference Include="System" />

--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
 {
  "dependencies": {
    "System.Collections.Immutable": "1.3.1",
-    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma",
    "xunit": "2.2.0-beta4-build3444",
    "xunit.runner.console": "2.2.0-beta4-build3444",
    "xunit.runner.visualstudio": "2.2.0-beta4-build1194"
@@ -9,4 +9,4 @@
  "frameworks": {
    "net46": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
@@ -14,11 +14,6 @@
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
  </PropertyGroup>
  <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="..\..\..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
      <Name>CodeAnalysis</Name>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "Microsoft.VisualStudio.Debugger.Metadata": {
-        "version": "15.0.26201-alpha",
+        "version": "15.0.26201-gamma",
        "exclude": "compile"
    }
  },

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
@@ -15,11 +15,6 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <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\NetFX20\ResultProvider.NetFX20.csproj">
      <Project>{BEDC5A4A-809E-4017-9CFD-6C8D4E1847F0}</Project>
      <Name>ResultProvider.NetFX20</Name>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
@@ -16,11 +16,6 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <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>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
-    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-alpha"
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
+    "Microsoft.VisualStudio.Debugger.Metadata": "15.0.26201-gamma"
  },
  "frameworks": {
    ".NETPortable,Version=v4.5,Profile=Profile7": {}
  }
-}
\ No newline at end of file
+}
--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-alpha",
+    "Microsoft.VisualStudio.Debugger.Engine": "15.0.26201-gamma",
    "Microsoft.DiaSymReader": "1.1.0",
    "xunit": "2.2.0-beta4-build3444",
    "xunit.runner.console": "2.2.0-beta4-build3444",
@@ -12,4 +12,4 @@
  "runtimes": {
    "win7": {}
  }
-}
\ No newline at end of file
+}
--- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
+++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb
@@ -859,7 +859,7 @@ Public Class BuildDevDivInsertionFiles
        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\ExpressionEvaluatorPackage\Microsoft.VisualStudio.Debugger.Engine.dll")
        add("Vsix\VisualStudioIntegrationTestSetup\Microsoft.Diagnostics.Runtime.dll")
        add("Vsix\VisualStudioIntegrationTestSetup\Microsoft.VisualStudio.IntegrationTest.Setup.vsix")
        add("Exes\Toolset\System.AppContext.dll")