Merge pull request #1250 from ltrzesniewski/fix-1112

Don't add duplicate FrameworkReference
dotnet · Jul 7, 2020 · c940949 · c940949
2 parents f7429f5 + 57dc70b
commit c940949
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets
@@ -7,6 +7,6 @@
     <Reference Condition="'$(UseWindowsRxVersion)' == 'true' "  Include="$(MSBuildThisFileDirectory)..\..\build\netcoreapp3.0\System.Reactive.dll" />
     <Reference Condition="'$(UseWindowsRxVersion)' != 'true' "  Include="$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\System.Reactive.dll" />
 
-    <FrameworkReference Condition="'$(UseWindowsRxVersion)' == 'true' " Include="Microsoft.WindowsDesktop.App" />
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App" Condition="'$(UseWindowsRxVersion)' == 'true' and !@(FrameworkReference->AnyHaveMetadataValue('Identity', 'Microsoft.WindowsDesktop.App'))" />
   </ItemGroup>
-</Project>
+</Project>