Reenable TypeEquivalence tests (dotnet/coreclr#21309)

Commit migrated from dotnet/coreclr@25413f4
picenka21 · Nov 30, 2018 · 8a34559 · 8a34559
1 parent 427e0c7
commit 8a34559
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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>
diff --git 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
@@ -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
@@ -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