diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-03-16 07:32:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 07:32:12 -0700 |
| commit | 84aab5f59d023849b9ccdc290e698e4a61ac75a2 (patch) | |
| tree | 5236a7bea31a0b7deefd1a4f181c2d6cb1ded1aa /tests/override.targets | |
| parent | 8f4861922d1761bfcb339d2474fd1b414cec8004 (diff) | |
| download | coreclr-84aab5f59d023849b9ccdc290e698e4a61ac75a2.tar.gz coreclr-84aab5f59d023849b9ccdc290e698e4a61ac75a2.tar.bz2 coreclr-84aab5f59d023849b9ccdc290e698e4a61ac75a2.zip | |
Delete mscorlib facade (#10157)
Fixes #7607
Diffstat (limited to 'tests/override.targets')
| -rw-r--r-- | tests/override.targets | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/override.targets b/tests/override.targets index 36a9615e73..a01163225f 100644 --- a/tests/override.targets +++ b/tests/override.targets @@ -6,27 +6,19 @@ <!-- 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 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> </Project> |