Skip to content

Commit c9fa2b8

Browse files
michaelstonismichaelstonis
committed
update to latest RxUI and solution configs
1 parent 07a2d90 commit c9fa2b8

File tree

5 files changed

+34
-25
lines changed

5 files changed

+34
-25
lines changed

‎Droid/Droid.csproj‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.props')" />
43
<PropertyGroup>
54
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
65
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,7 +15,7 @@
1615
<AndroidApplication>True</AndroidApplication>
1716
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1817
<AssemblyName>EightBot.ReactiveExtensionExamples.Droid</AssemblyName>
19-
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
2019
</PropertyGroup>
2120
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2221
<DebugSymbols>true</DebugSymbols>
@@ -53,6 +52,18 @@
5352
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2.1" />
5453
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2.1" />
5554
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="27.0.2.1" />
55+
<PackageReference Include="Xamarin.Forms">
56+
<Version>3.2.0.871581</Version>
57+
</PackageReference>
58+
<PackageReference Include="ReactiveUI">
59+
<Version>9.0.1</Version>
60+
</PackageReference>
61+
<PackageReference Include="ReactiveUI.XamForms">
62+
<Version>9.0.1</Version>
63+
</PackageReference>
64+
<PackageReference Include="Xamarin.Essentials">
65+
<Version>0.10.0-preview</Version>
66+
</PackageReference>
5667
</ItemGroup>
5768
<ItemGroup>
5869
<Compile Include="MainActivity.cs" />
@@ -97,20 +108,4 @@
97108
</ProjectReference>
98109
</ItemGroup>
99110
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
100-
<Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
101-
<Import Project="..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" />
102-
<Import Project="..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.Utils.targets')" />
103-
<Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" />
104-
<Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
105-
<Import Project="..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" />
106-
<Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
107-
<Import Project="..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.CardView.targets')" />
108-
<Import Project="..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets')" />
109-
<Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets')" />
110-
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" />
111-
<Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
112-
<Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" />
113-
<Import Project="..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" />
114-
<Import Project="..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets')" />
115-
<Import Project="..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.targets')" />
116111
</Project>

‎ReactiveExtensionExamples/ReactiveExtensionExamples.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Xamarin.Forms" Version="3.1.0.637273" />
8-
<PackageReference Include="ReactiveUI" Version="8.3.1" />
9-
<PackageReference Include="ReactiveUI.XamForms" Version="8.3.1" />
10-
<PackageReference Include="Refit" Version="4.6.16" />
11-
<PackageReference Include="Xamarin.Essentials" Version="0.8.0-preview" />
7+
<PackageReference Include="Xamarin.Forms" Version="3.2.0.871581" />
8+
<PackageReference Include="ReactiveUI" Version="9.0.1" />
9+
<PackageReference Include="ReactiveUI.XamForms" Version="9.0.1" />
10+
<PackageReference Include="Refit" Version="4.6.48" />
11+
<PackageReference Include="Xamarin.Essentials" Version="0.10.0-preview" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎ReactiveExtensionExamples/ViewModels/SearchViewModel.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using ReactiveUI;
1414
using Splat;
1515
using System.Reactive.Disposables;
16+
using ReactiveUI.Legacy;
1617

1718
namespace ReactiveExtensionExamples.ViewModels
1819
{

‎ReactiveExtensionExamples/ViewModels/XamarinEssentials.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public XamarinEssentials ()
3030
{
3131
var gyroscopeChanged =
3232
Observable
33-
.FromEvent<AccelerometerChangedEventHandler, AccelerometerChangedEventArgs>(
33+
.FromEvent<EventHandler<AccelerometerChangedEventArgs>, AccelerometerChangedEventArgs>(
3434
x => Accelerometer.ReadingChanged += x,
3535
x => Accelerometer.ReadingChanged -= x)
3636
.SubscribeOn(RxApp.TaskpoolScheduler)
@@ -39,7 +39,7 @@ public XamarinEssentials ()
3939
.Do(x =>
4040
{
4141
if (!Accelerometer.IsMonitoring)
42-
Accelerometer.Start(SensorSpeed.Ui);
42+
Accelerometer.Start(SensorSpeed.UI);
4343
})
4444
.Finally(() => {
4545
Accelerometer.Stop();

‎iOS/iOS.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,19 @@
9999
<Reference Include="System.Xml" />
100100
<Reference Include="System.Core" />
101101
<Reference Include="Xamarin.iOS" />
102+
<Reference Include="System.Runtime.Serialization" />
103+
<PackageReference Include="Xamarin.Forms">
104+
<Version>3.2.0.871581</Version>
105+
</PackageReference>
106+
<PackageReference Include="ReactiveUI">
107+
<Version>9.0.1</Version>
108+
</PackageReference>
109+
<PackageReference Include="ReactiveUI.XamForms">
110+
<Version>9.0.1</Version>
111+
</PackageReference>
112+
<PackageReference Include="Xamarin.Essentials">
113+
<Version>0.10.0-preview</Version>
114+
</PackageReference>
102115
</ItemGroup>
103116
<ItemGroup>
104117
<BundleResource Include="Resources\Default.png" />

0 commit comments

Comments
 (0)