OSS Sign Concord assemblies deployed to OutDir...

This change reverts the part of #12497 that removed Concord.csproj. This project will now be used to express the nuget dependency on MS.VS.D.Engine and MS.VS.D.Metadata as well as deploy the portable version for testing (and, as the title states, set the OSS sign bit post-build). Also, move to the latest version of the 14.3 Concord nugets (which allows us to remove explicit <Reference> items in our portable projects).

OSS Sign Concord assemblies deployed to OutDir...
This change reverts the part of #12497 that removed Concord.csproj. This project will now be used to express the nuget dependency on MS.VS.D.Engine and MS.VS.D.Metadata as well as deploy the portable version for testing (and, as the title states, set the OSS sign bit post-build). Also, move to the latest version of the 14.3 Concord nugets (which allows us to remove explicit <Reference> items in our portable projects).
e1a036a8 · Kevin Halverson · a4eb4580 · e1a036a8 · e1a036a8 · e1a036a8
36 changed file
--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/CSharpExpressionCompiler.csproj
@@ -20,9 +20,6 @@
    <RestorePackages>true</RestorePackages>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
  </PropertyGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
-  </ItemGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>

--- a/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.json
 {
-  "dependencies": { },
+  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422"
+  },
  "frameworks": {
    ".NETPortable,Version=v4.5,Profile=Profile7": { }
  }

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
@@ -33,10 +33,6 @@
      <Link>Compiler\SymbolDisplay\ObjectDisplay.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>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
  <ItemGroup>

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/CSharpResultProvider.Portable.csproj
@@ -33,10 +33,6 @@
      <Link>Compiler\SymbolDisplay\ObjectDisplay.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>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
  <ItemGroup Label="Project References">
@@ -50,6 +46,9 @@
      <Name>ResultProvider.Portable</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
  <Import Project="..\CSharpResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />

--- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json
+++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/Portable/project.json
+{  
+  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
+    "Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421"
+  },  
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile7": { }
+  }
+}
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj
@@ -84,7 +84,6 @@
    <Reference Include="System" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Xml" />
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="AccessibilityTests.cs" />

--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422"
  },
  "frameworks": {
-    "net46": {}
+    "net46": { }
  },
  "runtimes": {
    "win7": { }

--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj
@@ -14,9 +14,6 @@
    <UseCommonOutputDirectory>True</UseCommonOutputDirectory>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
  </PropertyGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
-  </ItemGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\Compilers\Test\Utilities\CSharp.Desktop\CSharpCompilerTestUtilities.Desktop.csproj">
      <Project>{7a4b2176-7bfd-4b75-a61a-e25a1fdd0a1e}</Project>

--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/FunctionPointerTests.cs
@@ -90,6 +90,11 @@ public override Type GetElementType()
            {
                return null;
            }
+
+            public override bool IsFunctionPointer()
+            {
+                return true;
+            }
        }
    }
 }
--- a/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
@@ -14,43 +14,26 @@
    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\..\..\</SolutionDir>
    <ConcordDir>$(MSBuildThisFileDirectory)</ConcordDir>
    <NonShipping>true</NonShipping>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <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="$(ConcordDir)Microsoft.VisualStudio.Debugger.Engine.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>false</Visible>
-    </None>
+    <None Include="project.json" />
  </ItemGroup>
  <ItemGroup>
-    <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Metadata">
-      <Visible>false</Visible>
-    </ConcordAssemblies>
-    <ConcordAssemblies Include="Microsoft.VisualStudio.Debugger.Engine">
-      <Visible>false</Visible>
-    </ConcordAssemblies>
+    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Engine\14.3.25422\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Engine.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(NuGetPackageRoot)\Microsoft.VisualStudio.Debugger.Metadata\14.3.25421\lib\portable-net45+win8\Microsoft.VisualStudio.Debugger.Metadata.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
  </ItemGroup>
-  <Target Name="IlasmNetFX20" 
-          AfterTargets="CoreCompile"
-          Inputs="@(ConcordAssemblies->'$(ConcordDir)%(Identity).NetFX20.il')"
-          Outputs="$(OutDir)NetFX20\%(Identity).dll">
-    <MakeDir Directories="$(OutDir)NetFX20" />
-    <Exec Command='"$(MSBuildFrameworkToolsPath)ilasm.exe" /dll /quiet /mdv:v2.0.50727 /output:"$(OutDir)NetFX20\@(ConcordAssemblies).dll" "$(ConcordDir)@(ConcordAssemblies).NetFX20.il"' />
-    <Exec Command='"$(FakeSignToolPath)" "$(OutDir)NetFX20\@(ConcordAssemblies).dll"' />
-  </Target>
-  <Target Name="IlasmPortable" 
-          AfterTargets="CoreCompile"
-          Inputs="@(ConcordAssemblies->'$(ConcordDir)%(Identity).Portable.il')"
-          Outputs="$(OutDir)%(Identity).dll">
-    <Exec Command='"$(MSBuildFrameworkToolsPath)ilasm.exe" /dll /quiet /output:"$(OutDir)@(ConcordAssemblies).dll" "$(ConcordDir)@(ConcordAssemblies).Portable.il"' />
-    <Exec Command='"$(FakeSignToolPath)" "$(OutDir)@(ConcordAssemblies).dll"' />
-  </Target>
-  <Target Name="CleanIlasmOutputs" AfterTargets="Clean">
-    <Delete Files="@(ConcordAssemblies->'$(OutDir)NetFX20\%(Identity).dll')" />
-    <Delete Files="@(ConcordAssemblies->'$(OutDir)%(Identity).dll')" />
+  <Target Name="SignConcord" BeforeTargets="PrepareForRun">
+    <Exec Command='"$(FakeSignToolPath)" -f "$(OutDir)%(Content.Filename)%(Extension)"' />
  </Target>
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />

--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.NetFX20.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.NetFX20.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.Engine.XML
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.XML
--- a/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.NetFX20.il
+++ b/src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.NetFX20.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/Concord/project.json
+++ b/src/ExpressionEvaluator/Core/Source/Concord/project.json
+{  
+  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
+    "Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421"
+  },  
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile7": { }
+  }
+}
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionCompiler.csproj
@@ -62,9 +62,6 @@
    <Compile Include="MethodContextReuseConstraints.cs" />
    <Compile Include="PseudoVariableUtilities.cs" />
  </ItemGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
-  </ItemGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>

--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.json
 {
  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422"
  },
  "frameworks": {
-    ".NETPortable,Version=v4.5,Profile=Profile7": {}
+    ".NETPortable,Version=v4.5,Profile=Profile7": { }
  }
 }
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/DebuggerPlaceholders.cs
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Helpers/DebuggerPlaceholders.cs
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.Debugger.Metadata
-{
-    // Starting in Visual Studio 2015, Update 1, a new api exists to detect if a type is a function pointer.
-    // This placeholder method is a temporary shim to allow Roslyn to avoid taking a dependency on Update 1 debugger
-    // binaries until Update 1 ships.  See https://github.com/dotnet/roslyn/issues/5428.
-    internal static class DebuggerMetadataExtensions
-    {
-        public static bool IsFunctionPointer(this Type type)
-        {
-            // Note: The Visual Studio 2015 RTM version of Microsoft.VisualStudio.Debugger.Metadata.dll does not support function pointers at all,
-            // so when running against the RTM version of that dll, this method will always return false.  Against the update 1 version,
-            // we can exploit the fact that the only time a pointer will ever have a null element type will be function pointers.
-            //
-            // Using this shim, rather than simply calling Type.IsFunctionPointer() allows the Update 1 expression evaluator to continue
-            // to work against the RTM debugger.
-            return type.IsPointer && type.GetElementType() == null;
-        }
-    }
-}
\ No newline at end of file
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
@@ -68,10 +68,6 @@
      <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>

--- 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.NetFX20": "1.0.3",
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
+    "Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421"
  },
  "frameworks": {
    "net20": { }

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/ResultProvider.Portable.csproj
@@ -69,10 +69,6 @@
    </Compile>
    <Compile Include="Helpers\Placeholders.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">
      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>
@@ -95,6 +91,9 @@
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
  <ItemGroup>
    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider" />
    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider" />

--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/Portable/project.json
+{  
+  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
+    "Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421"
+  },  
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile7": { }
+  }
+}
--- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.projitems
+++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.projitems
@@ -13,7 +13,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)Formatter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Formatter.TypeNames.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Formatter.Values.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\DebuggerPlaceholders.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Helpers\DynamicFlagsCustomTypeInfo_Factory.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Helpers\TypeAndCustomInfo.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Helpers\TypeWalker.cs" />

--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
@@ -19,7 +19,6 @@
  </PropertyGroup>
  <ItemGroup Label="File References">
    <Reference Include="System" />
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
  </ItemGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\..\Dependencies\DiaSymReader\DiaSymReader.csproj">

--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422"
  },
  "frameworks": {
    "net46": {}

--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
@@ -18,7 +18,6 @@
    <CopyNuGetImplementations>false</CopyNuGetImplementations>
  </PropertyGroup>
  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
    <Reference Include="Microsoft.CSharp" />
  </ItemGroup>
  <ItemGroup Label="Project References">

--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
 {
  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421"
  },
  "frameworks": {
    "net46": {}

--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/BasicExpressionCompiler.vbproj
@@ -18,9 +18,6 @@
    <RestorePackages>true</RestorePackages>
    <!-- Don't transitively copy output files, since everything builds to the same folder. -->
  </PropertyGroup>
-  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
-  </ItemGroup>
  <ItemGroup Label="Project References">
    <ProjectReference Include="..\..\..\Core\Source\Concord\Concord.csproj">
      <Project>{5002636a-fe8d-40bf-8818-ab513a2194fa}</Project>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.json
 {
-    "dependencies": { },
-    "frameworks": {
-        ".NETPortable,Version=v4.5,Profile=Profile7": {}
-    },
+  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422"
+  },
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile7": { }
+  }
 }
\ No newline at end of file
--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/NetFX20/BasicResultProvider.NetFX20.vbproj
@@ -24,10 +24,6 @@
  </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>

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/BasicResultProvider.Portable.vbproj
@@ -22,10 +22,6 @@
  </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>
@@ -64,6 +60,9 @@
    </SyntaxGetTextDefinition>
    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
  <Import Project="..\BasicResultProvider.projitems" Label="Shared" />
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\..\Tools\Vsdconfig\Vsdconfig.targets" />

--- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/Portable/project.json
+{  
+  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422",
+    "Microsoft.VisualStudio.Debugger.Metadata": "14.3.25421"
+  },  
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile7": { }
+  }
+}
--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj
@@ -85,7 +85,6 @@
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Xml" />
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Engine.dll" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="DebuggerDisplayAttributeTests.vb" />

--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
+    "Microsoft.VisualStudio.Debugger.Engine": "14.3.25422"
  },
  "frameworks": {
    "net46": {}

--- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj
@@ -18,7 +18,6 @@
    </VBRuntime>
  </PropertyGroup>
  <ItemGroup Label="File References">
-    <Reference Include="$(OutDir)Microsoft.VisualStudio.Debugger.Metadata.dll" />
    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
  <ItemGroup Label="Project References">