Skip to content

Support for generic -windows targets in ReactiveUI.WPF (#3558) #3559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+3 −2
Closed

Support for generic -windows targets in ReactiveUI.WPF (#3558) #3559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<!--
Added 19041 target as a workaround for System.Reactive targeting net5.0-windows10.0.19041.0
When 19041 is selected by the end user it causes the DispatcherScheduler in System.Reactive to be exposed and used.
Added generic "*-windows" target workaround to include missing DispatcherScheduler from System.Reactive, in the same fashion 17763 is fixed. This allows inclusion of ReactiveUI.WPF in 3rd party libraries targeting generic netX.X-windows
-->
<TargetFrameworks>net462;net472;net48;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net462;net472;net48;net6.0-windows;net7.0-windows;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
<PackageDescription>Contains the ReactiveUI platform specific extensions for Windows Presentation Foundation (WPF)</PackageDescription>
<PackageId>ReactiveUI.WPF</PackageId>
<UseWpf>true</UseWpf>
Expand All @@ -26,7 +27,7 @@
<Compile Include="..\ReactiveUI.Uwp\Rx\Linq\**\*.cs" LinkBase="Rx" Exclude="..\ReactiveUI.Uwp\Rx\Linq\*Observable.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework) == 'net462' or $(TargetFramework) == 'net6.0-windows10.0.17763.0' or $(TargetFramework) == 'net7.0-windows10.0.17763.0' ">
<ItemGroup Condition=" $(TargetFramework) == 'net462' or $(TargetFramework.EndsWith('windows')) or $(TargetFramework.EndsWith('windows10.0.17763.0'))">
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\DispatcherScheduler.cs" LinkBase="Rx" />
<Compile Include="..\ReactiveUI.Uwp\Rx\Linq\DispatcherObservable.cs" LinkBase="Rx" />
</ItemGroup>
Expand Down