Skip to content

Commit f0309fa

Browse files
Fix Rx operators duplicated in net4 (#3085)
Co-authored-by: Chris Pulman <chris.pulman@yahoo.com>
1 parent 875137d commit f0309fa

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,4 @@ namespace ReactiveUI.Winforms
106106
public int GetAffinityForObject(System.Type type, string propertyName, bool beforeChanged = false) { }
107107
public System.IObservable<ReactiveUI.IObservedChange<object, object?>> GetNotificationForProperty(object sender, System.Linq.Expressions.Expression expression, string propertyName, bool beforeChanged = false, bool suppressWarnings = false) { }
108108
}
109-
}
110-
namespace System.Reactive.Concurrency
111-
{
112-
public class ControlScheduler : System.Reactive.Concurrency.LocalScheduler, System.Reactive.Concurrency.ISchedulerPeriodic { }
113-
}
114-
namespace System.Reactive.Linq
115-
{
116-
public static class ControlObservable { }
117109
}

src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<None Include="..\ReactiveUI.Uwp\Rx\**\*.cs" LinkBase="Rx" />
1919
</ItemGroup>
2020

21-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) or $(TargetFramework) == 'net6.0-windows' ">
21+
<ItemGroup Condition=" $(TargetFramework) == 'net6.0-windows' ">
2222
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\ControlScheduler.cs" LinkBase="Rx" />
2323
<Compile Include="..\ReactiveUI.Uwp\Rx\Internal\Constants.cs" LinkBase="Rx" />
2424
<Compile Include="..\ReactiveUI.Uwp\Rx\Linq\**\*.cs" LinkBase="Rx" Exclude="..\ReactiveUI.Uwp\Rx\Linq\DispatcherObservable.cs" />

src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<None Include="..\ReactiveUI.Uwp\Rx\**\*.cs" LinkBase="Rx" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) or $(TargetFramework) == 'net6.0-windows' ">
19+
<ItemGroup Condition=" $(TargetFramework) == 'net6.0-windows' or $(TargetFramework) == 'net462' ">
2020
<Compile Include="..\ReactiveUI.Uwp\Rx\Concurrency\DispatcherScheduler.cs" LinkBase="Rx" />
2121
<Compile Include="..\ReactiveUI.Uwp\Rx\Internal\Constants.cs" LinkBase="Rx" />
2222
<Compile Include="..\ReactiveUI.Uwp\Rx\Linq\**\*.cs" LinkBase="Rx" Exclude="..\ReactiveUI.Uwp\Rx\Linq\ControlObservable.cs" />

0 commit comments

Comments
 (0)