Permalink
Browse files

Fix building with VS2010/.NET40 even on non-.NET45 machines, use late…

…st RxUI 3.2.0
  • Loading branch information...
1 parent 4bd6acf commit a86cad4701e71e48a89c6b17f5b59d056c9ee07a @PKRoma PKRoma committed with Peter Klavins Jul 12, 2012
@@ -40,10 +40,10 @@
<HintPath>..\packages\FluentAssertions.1.7.1.1\Lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation">
- <HintPath>..\packages\reactiveui-xaml.3.0.1\lib\Net4\Microsoft.Practices.ServiceLocation.dll</HintPath>
+ <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Reactive.Testing">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\Microsoft.Reactive.Testing.dll</HintPath>
+ <HintPath>..\packages\Rx_Experimental-Testing.1.1.11111\lib\Net4-Full\Microsoft.Reactive.Testing.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
@@ -72,36 +72,33 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="ReactiveUI">
- <HintPath>..\packages\reactiveui-core.3.0.1\lib\Net4\ReactiveUI.dll</HintPath>
+ <HintPath>..\packages\reactiveui-core.3.2.0\lib\Net4\ReactiveUI.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Blend">
- <HintPath>..\packages\reactiveui-xaml.3.0.1\lib\Net4\ReactiveUI.Blend.dll</HintPath>
+ <HintPath>..\packages\reactiveui-xaml.3.2.0\lib\Net4\ReactiveUI.Blend.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Routing">
- <HintPath>..\packages\reactiveui-xaml.3.0.1\lib\Net4\ReactiveUI.Routing.dll</HintPath>
+ <HintPath>..\packages\reactiveui-xaml.3.2.0\lib\Net4\ReactiveUI.Routing.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Testing">
- <HintPath>..\packages\reactiveui-testing.3.0.1\lib\Net4\ReactiveUI.Testing.dll</HintPath>
+ <HintPath>..\packages\reactiveui-testing.3.2.0\lib\Net4\ReactiveUI.Testing.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Xaml">
- <HintPath>..\packages-mod\reactiveui-xaml.3.0.1\lib\Net4\ReactiveUI.Xaml.dll</HintPath>
+ <HintPath>..\packages\reactiveui-xaml.3.2.0\lib\Net4\ReactiveUI.Xaml.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath>..\packages\RestSharp.102.7\lib\net35\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
- <Reference Include="System.Reactive.Core">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Core.dll</HintPath>
+ <Reference Include="System.Reactive">
+ <HintPath>..\packages\Rx_Experimental-Main.1.1.11111\lib\Net4\System.Reactive.dll</HintPath>
</Reference>
- <Reference Include="System.Reactive.Interfaces">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Interfaces.dll</HintPath>
+ <Reference Include="System.Reactive.Providers">
+ <HintPath>..\packages\Rx_Experimental-Providers.1.1.11111\lib\Net4\System.Reactive.Providers.dll</HintPath>
</Reference>
- <Reference Include="System.Reactive.Linq">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.PlatformServices.dll</HintPath>
+ <Reference Include="System.Reactive.Windows.Threading">
+ <HintPath>..\packages\Rx_Experimental-Xaml.1.1.11111\lib\Net4\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
@@ -8,6 +8,7 @@
using Ninject.MockingKernel.Moq;
using Xunit;
using ReactiveUI.Sample.ViewModels;
+using ReactiveUI.Routing;
namespace ReactiveUI.Sample.ViewModels.Tests
{
@@ -28,7 +29,7 @@ public void LoginScenarioRoutingTest()
// Our app starts on the Login page by default
this.Log().Info("Current Route: {0}", fixture.Router.GetUrlForCurrentRoute());
- var loginModel = fixture.Router.CurrentViewModel.First() as ILoginViewModel;
+ var loginModel = fixture.Router.GetCurrentViewModel() as ILoginViewModel;
loginModel.Should().NotBeNull();
// Put in a fake user/pass and hit the Ok button
@@ -38,7 +39,7 @@ public void LoginScenarioRoutingTest()
// Make sure we're now showing the repo page
this.Log().Info("Current Route: {0}", fixture.Router.GetUrlForCurrentRoute());
- (fixture.Router.CurrentViewModel.First() is IRepoSelectionViewModel).Should().BeTrue();
+ (fixture.Router.GetCurrentViewModel() is IRepoSelectionViewModel).Should().BeTrue();
}
}
}
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="CommonServiceLocator" version="1.0" />
<package id="FluentAssertions" version="1.7.1.1" />
<package id="Moq" version="4.0.10827" />
<package id="Newtonsoft.Json" version="4.0.8" />
@@ -9,11 +10,14 @@
<package id="Ninject.MockingKernel" version="3.0.0.5" />
<package id="Ninject.MockingKernel.Moq" version="3.0.0.5" />
<package id="NLog" version="2.0.0.2000" />
- <package id="reactiveui-core" version="3.0.1" />
- <package id="reactiveui-testing" version="3.0.1" />
- <package id="reactiveui-xaml" version="3.0.1" />
+ <package id="reactiveui-core" version="3.2.0" />
+ <package id="reactiveui-testing" version="3.2.0" />
+ <package id="reactiveui-xaml" version="3.2.0" />
<package id="RestSharp" version="102.7" />
- <package id="Rx-Compat_Unofficial" version="2.0.20304" />
+ <package id="Rx_Experimental-Main" version="1.1.11111" />
+ <package id="Rx_Experimental-Providers" version="1.1.11111" />
+ <package id="Rx_Experimental-Testing" version="1.1.11111" />
+ <package id="Rx_Experimental-Xaml" version="1.1.11111" />
<package id="xunit" version="1.9.0.1566" />
<package id="xunit.extensions" version="1.9.0.1566" />
</packages>
@@ -42,7 +42,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.ServiceLocation">
- <HintPath>..\packages\reactiveui-xaml.3.0.1\lib\Net4\Microsoft.Practices.ServiceLocation.dll</HintPath>
+ <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
@@ -69,36 +69,30 @@
<HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI">
- <HintPath>..\packages\reactiveui-core.3.0.1\lib\Net4\ReactiveUI.dll</HintPath>
+ <HintPath>..\packages\reactiveui-core.3.2.0\lib\Net4\ReactiveUI.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Blend">
- <HintPath>..\packages\reactiveui-xaml.3.0.1\lib\Net4\ReactiveUI.Blend.dll</HintPath>
+ <HintPath>..\packages\reactiveui-xaml.3.2.0\lib\Net4\ReactiveUI.Blend.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Routing">
- <HintPath>..\packages\reactiveui-xaml.3.0.1\lib\Net4\ReactiveUI.Routing.dll</HintPath>
+ <HintPath>..\packages\reactiveui-xaml.3.2.0\lib\Net4\ReactiveUI.Routing.dll</HintPath>
</Reference>
<Reference Include="ReactiveUI.Xaml">
- <HintPath>..\packages-mod\reactiveui-xaml.3.0.1\lib\Net4\ReactiveUI.Xaml.dll</HintPath>
+ <HintPath>..\packages\reactiveui-xaml.3.2.0\lib\Net4\ReactiveUI.Xaml.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath>..\packages\RestSharp.102.7\lib\net35\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
- <Reference Include="System.Reactive.Core">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Core.dll</HintPath>
+ <Reference Include="System.Reactive">
+ <HintPath>..\packages\Rx_Experimental-Main.1.1.11111\lib\Net4\System.Reactive.dll</HintPath>
</Reference>
- <Reference Include="System.Reactive.Interfaces">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Linq">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Linq.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.PlatformServices.dll</HintPath>
+ <Reference Include="System.Reactive.Providers">
+ <HintPath>..\packages\Rx_Experimental-Providers.1.1.11111\lib\Net4\System.Reactive.Providers.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
- <HintPath>..\packages\Rx-Compat_Unofficial.2.0.20304\lib\Net40\System.Reactive.Windows.Threading.dll</HintPath>
+ <HintPath>..\packages\Rx_Experimental-Xaml.1.1.11111\lib\Net4\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
@@ -30,7 +30,7 @@ public string Password
set { this.RaiseAndSetIfChanged(x => x.Password, value); }
}
- public RoutingState Router { get; protected set; }
+ public IRoutingState Router { get; protected set; }
public AppViewModel(IKernel testKernel)
{
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="CommonServiceLocator" version="1.0" />
<package id="Moq" version="4.0.10827" />
<package id="Newtonsoft.Json" version="4.0.8" />
<package id="Ninject" version="3.0.0.15" />
@@ -8,8 +9,10 @@
<package id="Ninject.MockingKernel" version="3.0.0.5" />
<package id="Ninject.MockingKernel.Moq" version="3.0.0.5" />
<package id="NLog" version="2.0.0.2000" />
- <package id="reactiveui-core" version="3.0.1" />
- <package id="reactiveui-xaml" version="3.0.1" />
+ <package id="reactiveui-core" version="3.2.0" />
+ <package id="reactiveui-xaml" version="3.2.0" />
<package id="RestSharp" version="102.7" />
- <package id="Rx-Compat_Unofficial" version="2.0.20304" />
+ <package id="Rx_Experimental-Main" version="1.1.11111" />
+ <package id="Rx_Experimental-Providers" version="1.1.11111" />
+ <package id="Rx_Experimental-Xaml" version="1.1.11111" />
</packages>

0 comments on commit a86cad4

Please sign in to comment.