Moved the VMs to a separed project

HACK: dotnet/reactive#803
reactiveui · Feb 15, 2019 · f00f9bb · f00f9bb
1 parent 4076858
commit f00f9bb
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 10 deletions.
diff --git a/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/Cinephile.ViewModels.csproj b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/Cinephile.ViewModels.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="reactiveui" Version="*" />
+  </ItemGroup>
+
+    <ItemGroup>
+    <ProjectReference Include="..\Cinephile.Core\Cinephile.Core.csproj" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/...ephile/ViewModels/MovieDetailViewModel.cs → ...ephile.ViewModels/MovieDetailViewModel.cs b/...ephile/ViewModels/MovieDetailViewModel.cs → ...ephile.ViewModels/MovieDetailViewModel.cs
diff --git a/...ViewModels/UpcomingMoviesCellViewModel.cs → ...ViewModels/UpcomingMoviesCellViewModel.cs b/...ViewModels/UpcomingMoviesCellViewModel.cs → ...ViewModels/UpcomingMoviesCellViewModel.cs
diff --git a/...ViewModels/UpcomingMoviesListViewModel.cs → ...ViewModels/UpcomingMoviesListViewModel.cs b/...ViewModels/UpcomingMoviesListViewModel.cs → ...ViewModels/UpcomingMoviesListViewModel.cs
diff --git a/...ile/Cinephile/ViewModels/ViewModelBase.cs → ...ile/Cinephile.ViewModels/ViewModelBase.cs b/...ile/Cinephile/ViewModels/ViewModelBase.cs → ...ile/Cinephile.ViewModels/ViewModelBase.cs
diff --git a/samples/xamarin-forms/Cinephile/Cinephile.sln b/samples/xamarin-forms/Cinephile/Cinephile.sln
@@ -16,6 +16,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cinephile.UnitTests", "Cine
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F7F1F417-87A0-41F7-9F14-F46A772BDAF7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cinephile.ViewModels", "Cinephile.ViewModels\Cinephile.ViewModels.csproj", "{42AFC9D3-D010-44B3-85FC-E1AE52F70511}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -87,6 +89,18 @@ Global
 		{65DFE289-C949-48A5-AD74-6B93E3ECCCE6}.Release|iPhone.Build.0 = Release|Any CPU
 		{65DFE289-C949-48A5-AD74-6B93E3ECCCE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{65DFE289-C949-48A5-AD74-6B93E3ECCCE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhone.Build.0 = Release|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/samples/xamarin-forms/Cinephile/Cinephile/Cinephile.csproj b/samples/xamarin-forms/Cinephile/Cinephile/Cinephile.csproj
@@ -9,14 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="akavache" Version="6.3.2" />
-    <PackageReference Include="reactiveui" Version="*" />
-    <PackageReference Include="reactiveui.events.xamforms" Version="*" />
-    <PackageReference Include="reactiveui.xamforms" Version="*" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.4.859" />
     <PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
+    <PackageReference Include="ReactiveUI.XamForms" Version="9.10.1" />
+    <PackageReference Include="ReactiveUI.Events.XamForms" Version="9.10.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cinephile.Core\Cinephile.Core.csproj" />
+    <ProjectReference Include="..\Cinephile.ViewModels\Cinephile.ViewModels.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/xamarin-forms/Cinephile/Droid/Cinephile.Droid.csproj b/samples/xamarin-forms/Cinephile/Droid/Cinephile.Droid.csproj
@@ -77,18 +77,22 @@
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="System.Reactive" Version="4.1.2" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
     <PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2.1" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>4.4.0</Version>
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Threading.Tasks.Extensions">
-      <HintPath>$(UserProfile)\.nuget\packages\system.threading.tasks.extensions\4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+<ItemGroup>
+  <Reference Include="System.Threading.Tasks.Extensions">
+    <HintPath>$(UserProfile)\.nuget\packages\system.threading.tasks.extensions\4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+  </Reference>
+</ItemGroup>  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>