Merge pull request #219 from reactiveui/rxui5-master

Ship ReactiveUI 5.0

Author: Paul Betts

.gitignore

@@ -21,3 +21,8 @@ NuGet-Release
 
 **/AppPackages
 version-bump.patch
+
+ReactiveUI.Events/Events.cs
+ReactiveUI.Events/Events_*.cs
+
+packages

.nuget/NuGet.exe

@@ -36,7 +36,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -88,18 +87,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\ReactiveUI.Android\ReactiveUI.Android.csproj">
-      <Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
-      <Name>ReactiveUI.Android</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_Monodroid.csproj">
-      <Project>{E92E477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
-      <Name>ReactiveUI.Routing_Monodroid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Monodroid.csproj">
-      <Project>{E92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
-      <Name>ReactiveUI.Xaml_Monodroid</Name>
-    </ProjectReference>
     <ProjectReference Include="..\ReactiveUI\ReactiveUI_Monodroid.csproj">
       <Project>{F92A477B-BB94-43C1-984E-E177EF9FEDB7}</Project>
       <Name>ReactiveUI_Monodroid</Name>
@@ -108,5 +95,9 @@
       <Project>{A92E477B-BB94-43C1-984E-E177EF9FEDB1}</Project>
       <Name>ReactiveUI.Mobile_Monodroid</Name>
     </ProjectReference>
+    <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Android.csproj">
+      <Project>{F5A6E11B-B074-4A0B-B937-267D840E31DF}</Project>
+      <Name>ReactiveUI.Android</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

AndroidPlayground/AndroidPlayground.csproj

@@ -1,13 +1,16 @@
-$Archs = {"Net40", "Net45", "SL5", "SL4-WindowsPhone71", "WP8", "WinRT45", "Mono", "Monodroid", "Monotouch"}
-$Projects = {"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Xaml", "ReactiveUI.Routing", "ReactiveUI.Blend", "ReactiveUI.Cocoa", "ReactiveUI.Gtk", "ReactiveUI.Android", "ReactiveUI.NLog", "ReactiveUI.Mobile"}
+$Archs = {"Portable-Net45+WinRT45+WP8", "Net45", "WP8", "WinRT45", "Mono", "Monoandroid", "Monotouch", "Monomac"}
+$Projects = {
+    "ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Platforms", "ReactiveUI.Blend", 
+    "ReactiveUI.NLog", "ReactiveUI.Mobile", "RxUIViewModelGenerator", "ReactiveUI.Events"
+}
 
-$SlnFileExists = Test-Path ".\ReactiveUI.sln"
+$SlnFileExists = Test-Path ".\ReactiveUI_VSAll.sln"
 if ($SlnFileExists -eq $False) {
     echo "*** ERROR: Run this in the project root ***"
     exit -1
 }
 
-C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" /maxcpucount:1 .\ReactiveUI.sln
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" /maxcpucount:1 .\ReactiveUI_VSAll.sln
 
 ###
 ### Build the Release directory
@@ -42,11 +45,11 @@ cp -r .\NuGet .\NuGet-Release
 
 $libDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "lib"}
 $srcDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "src"} | %{ls $_.FullName}
+$toolsDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "tools"}
 $nugetReleaseDir = Resolve-Path ".\NuGet-Release"
 
 # copy binaries
 foreach ($dir in $libDirs) {
-    $projName = $dir.FullName.Split("\\")[-2]
     $arches = ls $dir.FullName
 
     foreach ($arch in $arches) {
@@ -59,6 +62,20 @@ foreach ($dir in $libDirs) {
     }
 }
 
+# copy tools
+foreach ($dir in $toolsDirs) {
+    echo "foo"
+    echo $dir.FullName
+    $files = ls $dir.FullName
+
+    foreach ($file in $files) {
+        echo "bar" 
+        echo $file.FullName
+        $src = ".\Release\Net45\" + $file.Name
+        cp -fo "$src" $file.FullName
+    }        
+}
+
 # copy source
 foreach ($dir in $srcDirs) {
     $projName = $dir.Name
@@ -67,11 +84,11 @@ foreach ($dir in $srcDirs) {
     robocopy ".\$projFolderName\" "$($dir.FullName)" *.cs /S
 }
 
-$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0}
+$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0} | ?{!$_.FullName.Contains("src")}
 if ($stubs.Length -gt 0) {
     echo "*** BUILD FAILED ***"
     echo ""
-    echo "*** There are still stubs in the NuGet output, did you fully build? (Hint: Check Silverlight) ***"
+    echo "*** There are still stubs in the NuGet output, did you fully build? ***"
     #exit 1
 }
 

MakeRelease.ps1

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
     xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
-    xmlns:mobile="clr-namespace:ReactiveUI.Mobile;assembly=ReactiveUI.Mobile_WP8">
+    xmlns:mobile="clr-namespace:ReactiveUI.Mobile;assembly=ReactiveUI.Mobile">
 
     <!--Application Resources-->
     <Application.Resources>

MobileSample-WP8/App.xaml

@@ -46,9 +46,10 @@ public App()
                 PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled;
             }
 
-            RxApp.Register(typeof (AppBootstrapper), typeof (IApplicationRootState));
+            //TODo get rid of ugly casting
+            ((ModernDependencyResolver)RxApp.DependencyResolver).Register(() => new AppBootstrapper(), typeof(IApplicationRootState));
 
-            var host = RxApp.GetService<ISuspensionHost>();
+            var host = RxApp.DependencyResolver.GetService<ISuspensionHost>();
             host.SetupDefaultSuspendResume();
         }
 

MobileSample-WP8/App.xaml.cs

@@ -6,7 +6,7 @@
     xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:routing="clr-namespace:ReactiveUI.Routing;assembly=ReactiveUI.Routing_WP8"
+    xmlns:routing="clr-namespace:ReactiveUI.Xaml;assembly=ReactiveUI.Xaml"
     mc:Ignorable="d"
     FontFamily="{StaticResource PhoneFontFamilyNormal}"
     FontSize="{StaticResource PhoneFontSizeNormal}"

MobileSample-WP8/MainPage.xaml

@@ -169,22 +169,18 @@
       <Project>{B90F3D02-1E3A-4DD7-8E00-30F28B6DCC1E}</Project>
       <Name>ReactiveUI.Mobile_WP8</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WP8.csproj">
-      <Project>{9F70B056-893E-487D-8DD1-C012C4440618}</Project>
-      <Name>ReactiveUI.Routing_WP8</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
+    <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Xaml_WP8.csproj">
       <Project>{F9459904-F785-4255-866A-A619787CB895}</Project>
       <Name>ReactiveUI.Xaml_WP8</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
-      <Project>{884D2D0B-65CE-40CB-AE45-B1F45C4ECE76}</Project>
-      <Name>ReactiveUI_WP8</Name>
+    <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+      <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+      <Name>ReactiveUI</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\ext\WP80\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\ext\Portable-Net45+WinRT45+WP8\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Ninject.Common">
       <HintPath>.\Ninject.Common.dll</HintPath>
@@ -222,5 +218,4 @@
   -->
   <ProjectExtensions />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.4\tools\Microsoft.Bcl.Build.targets" />
 </Project>

MobileSample-WP8/MobileSample-WP8.csproj

@@ -11,7 +11,6 @@
 using Ninject;
 using ReactiveUI;
 using ReactiveUI.Mobile;
-using ReactiveUI.Routing;
 using MobileSample_WP8.Views;
 
 namespace MobileSample_WP8.ViewModels
@@ -73,10 +72,10 @@ public AppBootstrapper()
 
             Kernel.Bind<IScreen>().ToConstant(this);
 
-            RxApp.ConfigureServiceLocator(
-                (t, s) => Kernel.Get(t, s),
-                (t, s) => Kernel.GetAll(t, s),
-                (c, t, s) => { var r = Kernel.Bind(t).To(c); if (s != null) r.Named(s); });
+            //RxApp.ConfigureServiceLocator(
+            //    (t, s) => Kernel.Get(t, s),
+            //    (t, s) => Kernel.GetAll(t, s),
+            //    (c, t, s) => { var r = Kernel.Bind(t).To(c); if (s != null) r.Named(s); });
 
             Router.Navigate.Execute(new TestPage1ViewModel(this));
         }

MobileSample-WP8/ViewModels/AppBootstrapper.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.Serialization;
 using ReactiveUI;
-using ReactiveUI.Routing;
 
 namespace MobileSample_WP8.ViewModels
 {