Fix regeression with Containment

[platform/upstream/coreclr.git] / tests / override.targets

diff --git a/tests/override.targets b/tests/override.targets
index 8bdff51..0e7f82b 100644 (file)
--- a/tests/override.targets
+++ b/tests/override.targets
@@ -3,32 +3,31 @@
     Overrides for all other targets (including build tools) can go in this file.
   -->
 
-  <Import Project="mono.targets" Condition="'$(OsEnvironment)'=='Unix'" />
-  <Import Project="roslyn.xplat.targets" Condition="'$(OsEnvironment)'=='Unix'" />
-  <!-- Contains overrides for the nuget reference resolution.  The regular nuget reference resolution will not 
+  <!-- Contains overrides for the nuget reference resolution.  The regular nuget reference resolution will not
        copy references local, which we need in order to correctly execute the xunit project -->
   <Import Project="xunitwrapper.targets" Condition="'$(IsXunitWrapperProject)'=='true'" />
-  
-  <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference the local version of mscorlib.
+
+  <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference System.Private.CoreLib.
        Some tests use functionality not available in the portable reference assemblies.
-       For portability reasons it's generally a good idea to reference the facades instead of the 
+       For portability reasons it's generally a good idea to reference the facades instead of the
        raw implementation assemblies.  However, these tests are useful. -->
   <Target Name="AddDesignTimeFacadeReferences"
-      Condition="'$(TargetingDefaultPlatform)' == 'true'"
+      Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"
       BeforeTargets="ResolveReferences"
       DependsOnTargets="GetReferenceAssemblyPaths"
   >
-    <PropertyGroup>
-      <_resolvedMscorlib Condition="'%(ReferencePath.FileName)' == 'mscorlib'">true</_resolvedMscorlib>
-    </PropertyGroup>
 
-    <!-- TODO_SPC: ? -->
     <ItemGroup>
-      <PossibleTargetFrameworks Include="$(_TargetFrameworkDirectories)" />
-      <ReferencePath Include="%(PossibleTargetFrameworks.Identity)mscorlib.dll" 
-                     Condition="'$(ReferenceLocalMscorlib)' != 'true' and '$(_resolvedMscorlib)' != 'true' and '%(PossibleTargetFrameworks.Identity)' != '' and Exists('%(PossibleTargetFrameworks.Identity)mscorlib.dll')" />
-      <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\ref\mscorlib.dll" 
-                     Condition="'$(ReferenceLocalMscorlib)' == 'true' and '$(_resolvedMscorlib)' != 'true'" />
+      <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\System.Private.CoreLib.dll" />
     </ItemGroup>
   </Target>
+
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <!--
+      Allow this project to setup the default target frameworks. Note this depends on the targeting packs that VS
+      installs to resolve mscorlib and System. That should be fixed in the future.
+      -->
+    <_TargetFrameworkDirectories></_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths></_FullFrameworkReferenceAssemblyPaths>
+  </PropertyGroup>
 </Project>