Only include DesignTimeFacadeAssemblies which are not in ReferencePath (

#1520) * Only include DesignTimeFacadeAssemblies which are not in ReferencePath Resolves #1345
dotnet · Jan 10, 2017 · 40cd4d0 · 40cd4d0
1 parent e8b8f2c
commit 40cd4d0
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/XMakeTasks/Microsoft.NETFramework.CurrentVersion.targets b/src/XMakeTasks/Microsoft.NETFramework.CurrentVersion.targets
@@ -97,9 +97,18 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
     <ItemGroup Condition="'$(_HasReferenceToSystemRuntime)' == 'true'">
       <_DesignTimeFacadeAssemblies Include="%(DesignTimeFacadeDirectories.Identity)*.dll"/>
-      <!-- If the user has manually referenced these assemblies, remove them so we don't end up with duplicates -->
-      <ReferencePath Remove="@(_DesignTimeFacadeAssemblies)"/>
-      <ReferencePath Include="%(_DesignTimeFacadeAssemblies.Identity)">
+
+      <_DesignTimeFacadeAssemblies_Names Include="@(_DesignTimeFacadeAssemblies->'%(FileName)')">
+          <OriginalIdentity>%(_DesignTimeFacadeAssemblies.Identity)</OriginalIdentity>
+      </_DesignTimeFacadeAssemblies_Names>
+
+      <_ReferencePath_Names Include="@(ReferencePath->'%(FileName)')">
+          <OriginalIdentity>%(ReferencePath.Identity)</OriginalIdentity>
+      </_ReferencePath_Names>
+
+      <_DesignTimeFacadeAssemblies_Names Remove="@(_ReferencePath_Names)"/>
+
+      <ReferencePath Include="@(_DesignTimeFacadeAssemblies_Names->'%(OriginalIdentity)')">
         <WinMDFile>false</WinMDFile>
         <CopyLocal>false</CopyLocal>
         <ResolvedFrom>ImplicitlyExpandDesignTimeFacades</ResolvedFrom>