Skip to content
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

Jump to bottom

feat: Update ReactiveUI to use Reactive Extensions 4.0.0 as minimum #1701

Merged
merged 5 commits into from Aug 3, 2018
Merged

feat: Update ReactiveUI to use Reactive Extensions 4.0.0 as minimum #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ce76dc
Updated references to system.reactive to 4.0.0
Aug 2, 2018
e75ddcd
Futher updates to handle 2.1 and general fixes
Aug 2, 2018
6e363ac
Merge branch 'master' into glennawatson-rx4
glennawatson Aug 3, 2018
51c5c7a
Removed unneeded netcoreapp 2.1 for the moment until we use features …
Aug 3, 2018
bf06d62
Merge branch 'glennawatson-rx4' of https://github.com/reactiveui/Reac…
Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.build.targets
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid80'">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'tizen40'">
<DefineConstants>$(DefineConstants);Tizen</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.0.1" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="Splat" Version="4.0.2" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="Splat" Version="4.0.2" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<Compile Remove="*.cs" />
<None Include="*.cs" />
<Compile Include="../ReactiveUI.Events/SingleAwaitSubject.cs" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Events.Winforms/ReactiveUI.Events.Winforms.csproj
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<Compile Remove="*.cs" />
<None Include="*.cs" />
<Compile Include="../ReactiveUI.Events/SingleAwaitSubject.cs" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
<Compile Remove="*.cs" />
<None Include="*.cs" />
<Compile Include="../ReactiveUI.Events/SingleAwaitSubject.cs" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/ReactiveUI.Events/ReactiveUI.Events.csproj
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
<Compile Remove="*.cs" />
<None Include="*.cs" />
<Compile Include="SingleAwaitSubject.cs" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
Expand Down Expand Up @@ -39,4 +39,8 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'tizen40' ">
<Compile Include="Events_TIZEN.cs" Condition="Exists('Events_TIZEN.cs')" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.Mac20' ">
<Reference Include="netstandard" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Fody" Version="3.0.3" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="3.0.3" PrivateAssets="All" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.Fody.Tests/ReactiveUI.Fody.Tests.csproj
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@

<ItemGroup>
<PackageReference Include="ApprovalTests" Version=" 3.0.13" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
View file
Open in desktop
Expand Up @@ -8,7 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="3.1.1" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.0.0" />
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.Mac20' ">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to reference netstandard to get the Xamarin.Mac20 to compile after updating. Bit weird.

<Reference Include="netstandard" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/ReactiveUI.Tests/ReactiveUI.Tests.csproj
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.2.build3984" />
<PackageReference Include="Xunit.StaFact" Version="0.2.9" />
<PackageReference Include="ApprovalTests" Version=" 3.0.13" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="3.1.1" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.0.0" />
<PackageReference Include="PublicApiGenerator" Version="6.0.0" />
</ItemGroup>

Expand Down
18 changes: 0 additions & 18 deletions src/ReactiveUI/Platforms/netcoreapp2.1/PlatformRegistrations.cs
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions src/ReactiveUI/ReactiveUI.csproj
View file
Open in desktop
@@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80;netcoreapp2.0;netcoreapp2.1;tizen40</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80;netcoreapp2.0;tizen40</TargetFrameworks>
<AssemblyName>ReactiveUI</AssemblyName>
<RootNamespace>ReactiveUI</RootNamespace>
<Description>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. Supports Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin Forms, WPF, Windows Forms, Windows Phone 8.1, Windows Store and Universal Windows Platform (UWP).</Description>
Expand All @@ -10,7 +10,7 @@
<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<PackageReference Include="System.Reactive" Version="3.1.1" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="Splat" Version="4.0.2" />
</ItemGroup>

Expand Down Expand Up @@ -47,6 +47,7 @@
<Compile Include="Platforms\mac\**\*.cs" />
<Compile Include="Platforms\xamarin-common\**\*.cs" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="netstandard" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid80' ">
Expand All @@ -60,11 +61,6 @@
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<Compile Include="Platforms\netcoreapp2.1\**\*.cs" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'tizen40' ">
<Compile Include="Platforms\tizen\**\*.cs" />
<Compile Include="Platforms\xamarin-common\**\*.cs" />
Expand Down