From 8a34559bb7c5f60368b0866ee85c8b630faf16f9 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <arobins@microsoft.com>
Date: Fri, 30 Nov 2018 15:01:04 -0800
Subject: [PATCH] Reenable TypeEquivalence tests (dotnet/coreclr#21309)

Commit migrated from https://github.com/dotnet/coreclr/commit/25413f4b21c859a262d9c5231622e1e536fdb267
---
 .../src/baseservices/typeequivalence/TypeEquivalence.targets  | 11 ++++++++++-
 .../src/baseservices/typeequivalence/impl/TypeImpl.csproj     |  4 ----
 .../src/baseservices/typeequivalence/simple/Simple.csproj     |  4 ----
 src/coreclr/tests/src/dirs.proj                               |  1 -
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/coreclr/tests/src/baseservices/typeequivalence/TypeEquivalence.targets b/src/coreclr/tests/src/baseservices/typeequivalence/TypeEquivalence.targets
index f858bec..47c493d 100644
--- a/src/coreclr/tests/src/baseservices/typeequivalence/TypeEquivalence.targets
+++ b/src/coreclr/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/src/coreclr/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj b/src/coreclr/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
index 665f26c..b2f1ce1 100644
--- a/src/coreclr/tests/src/baseservices/typeequivalence/impl/TypeImpl.csproj
+++ b/src/coreclr/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/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj b/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj
index e9cd889..9934730 100644
--- a/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj
+++ b/src/coreclr/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/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj
index 08de580..785a058 100644
--- a/src/coreclr/tests/src/dirs.proj
+++ b/src/coreclr/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
-- 
2.7.4