From 90d0af97647780337a3dc9879e50b4bc132c37f5 Mon Sep 17 00:00:00 2001
From: Ashley Hauck <ashauck@microsoft.com>
Date: Fri, 15 Sep 2017 09:24:22 -0700
Subject: [PATCH] Correctly produce vbcscompilertests runtimeconfig.json

---
 build/scripts/build.ps1                                       | 3 +--
 .../Server/VBCSCompilerTests/VBCSCompilerTests.csproj         | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index 5f780bc3dae..cf021bdf397 100644
--- a/build/scripts/build.ps1
+++ b/build/scripts/build.ps1
@@ -298,8 +298,7 @@ function Test-XUnitCoreClr() {
     # A number of our tests need to be published before they can be executed in order to get some 
     # runtime assets.
     $needPublish = @(
-        "src\Compilers\CSharp\Test\Symbol\CSharpCompilerSymbolTest.csproj",
-        "src\Compilers\Server\VBCSCompilerTests\VBCSCompilerTests.csproj"
+        "src\Compilers\CSharp\Test\Symbol\CSharpCompilerSymbolTest.csproj"
     )
 
     foreach ($file in $needPublish) {
diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
index bfd00088860..e2aa6a5a8d3 100644
--- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
+++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Roslyn.Compilers.CompilerServer.UnitTests</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <RoslynProjectType>UnitTestPortable</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
@@ -40,6 +40,8 @@
     <PackageReference Include="xunit" Version="$(xunitVersion)" />
     <PackageReference Include="xunit.analyzers" Version="$(xunitanalyzersVersion)" />
     <PackageReference Include="xunit.runner.console" Version="$(xunitrunnerconsoleVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-- 
GitLab