From fea1a31073f6f4f42246521421842cdafef9f507 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <arobins@microsoft.com>
Date: Fri, 30 Nov 2018 11:36:44 -0800
Subject: [PATCH] Reenable TypeEquivalence tests

---
 .../typeequivalence/TypeEquivalence.targets           | 11 ++++++++++-
 .../baseservices/typeequivalence/impl/TypeImpl.csproj |  4 ----
 .../baseservices/typeequivalence/simple/Simple.csproj |  4 ----
 tests/src/dirs.proj                                   |  1 -
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/src/baseservices/typeequivalence/TypeEquivalence.targets b/tests/src/baseservices/typeequivalence/TypeEquivalence.targets
index f858bec03baa..47c493dec76a 100644
--- a/tests/src/baseservices/typeequivalence/TypeEquivalence.targets
+++ b/tests/src/baseservices/typeequivalence/TypeEquivalence.targets
@@ -13,11 +13,20 @@
       <Output TaskParameter="TargetOutputs" ItemName="ResolvedProjectReferencePaths" />
     </MSBuild>
 
+    <PropertyGroup>
+      <EmbedProjectReferenceResponseFile>$(IntermediateOutputPath)$(MSBuildProjectName).rsp</EmbedProjectReferenceResponseFile>
+    </PropertyGroup>
+
     <WriteLinesToFile
-        File="$(CompilerResponseFile)"
+        File="$(EmbedProjectReferenceResponseFile)"
         Lines="@(ResolvedProjectReferencePaths -> '/link:%(fullpath)')"
         Overwrite="true"
         Encoding="Unicode" />
+
+    <PropertyGroup Condition="Exists('$(EmbedProjectReferenceResponseFile)')">
+      <CompilerResponseFile>$(EmbedProjectReferenceResponseFile);$(CompilerResponseFile)</CompilerResponseFile>
+    </PropertyGroup>
+
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj b/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
index 665f26ca9c0a..b2f1ce1274ab 100644
--- a/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
+++ b/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
@@ -9,10 +9,6 @@
     <Compile Include="**/*.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <CompilerResponseFile>$(IntermediateOutputPath)TypeImpl.rsp</CompilerResponseFile>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="../contracts/TypeContracts.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/tests/src/baseservices/typeequivalence/simple/Simple.csproj b/tests/src/baseservices/typeequivalence/simple/Simple.csproj
index e9cd889ca347..9934730599e9 100644
--- a/tests/src/baseservices/typeequivalence/simple/Simple.csproj
+++ b/tests/src/baseservices/typeequivalence/simple/Simple.csproj
@@ -9,10 +9,6 @@
     <Compile Include="**/*.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <CompilerResponseFile>$(IntermediateOutputPath)Simple.rsp</CompilerResponseFile>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="../contracts/TypeContracts.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index 08de58094c95..785a05859bba 100644
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -31,7 +31,6 @@
       <DisabledProjects Include="Performance\Scenario\JitBench\unofficial_dotnet\JitBench.csproj" /> <!-- no official build support for SDK-style netcoreapp2.0 projects -->
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->
-      <DisabledProjects Include="baseservices\typeequivalence\**\*.csproj" />
     </ItemGroup>
 
     <!-- Test build is divided in slices which can be created within Test Group