housekeeping: Updated to ReactiveUI 10 (#134)

* housekeeping: Updated Sample to ReactiveUI 10 - Changed Sample nuget dependencies to wild cards * fixing api approval tests * Moved all Dependencies to ReactiveUI 10.*
reactiveui · Sep 6, 2019 · a13b156 · a13b156
1 parent 4f35ab3
commit a13b156
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 26 deletions.
diff --git a/Sample/SextantSample.Android/SextantSample.Android.csproj b/Sample/SextantSample.Android/SextantSample.Android.csproj
@@ -59,14 +59,14 @@
         <Reference Include="System.Xml" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="System.Reactive" Version="4.1.6" />
+        <PackageReference Include="System.Reactive" Version="4.1.*" />
         <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
         <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
         <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
         <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
         <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
         <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
-        <PackageReference Include="ReactiveUI.XamForms" Version="9.19.5" />
+        <PackageReference Include="ReactiveUI.XamForms" Version="10.*" />
     </ItemGroup>
     <ItemGroup>
         <Compile Include="MainActivity.cs" />

diff --git a/Sample/SextantSample.iOS/SextantSample.iOS.csproj b/Sample/SextantSample.iOS/SextantSample.iOS.csproj
@@ -162,7 +162,7 @@
         <Reference Include="Xamarin.iOS" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="ReactiveUI.XamForms" Version="9.19.5" />
+        <PackageReference Include="ReactiveUI.XamForms" Version="10.*" />
     </ItemGroup>
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
     <ItemGroup>

diff --git a/Sample/SextantSample/SextantSample.csproj b/Sample/SextantSample/SextantSample.csproj
@@ -4,9 +4,9 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Xamarin.Forms" Version="4.0.*" />
+        <PackageReference Include="Xamarin.Forms" Version="4.1.*" />
         <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-        <PackageReference Include="ReactiveUI.XamForms" Version="9.19.5" />
+        <PackageReference Include="ReactiveUI.XamForms" Version="10.*" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Remove="MainPage.xaml" />

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -1,4 +1,5 @@
-<Project>  
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
   <PropertyGroup>
     <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -23,36 +24,30 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
     <EnableSourceLink Condition=" '$(OS)' != 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">false</EnableSourceLink>
-    <EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>    
+    <EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>
   </PropertyGroup>
-
   <ItemGroup Condition="$(IsTestProject)">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="Xunit.StaFact" Version="0.3.18" />
     <PackageReference Include="Shouldly" Version=" 3.0.2" />
-    <PackageReference Include="ReactiveUI.Testing" Version="9.19.5" />
-    <PackageReference Include="PublicApiGenerator" Version="9.1.0" />
+    <PackageReference Include="ReactiveUI.Testing" Version="10.*" />
+    <PackageReference Include="PublicApiGenerator" Version="9.3.0" />
     <PackageReference Include="NSubstitute" Version="4.2.1" />
   </ItemGroup>
-
   <ItemGroup Condition="$(IsTestProject)">
     <Compile Include="$(MSBuildThisFileDirectory)ApiGeneratorGlobalSuppressions.cs" />
   </ItemGroup>
-
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="stylecop.analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" PrivateAssets="all" />
     <PackageReference Include="Roslynator.Analyzers" Version="2.1.0" PrivateAssets="All" />
   </ItemGroup>
-
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>
- </Project>
-
+</Project>
diff --git a/src/Directory.build.targets b/src/Directory.build.targets
@@ -31,6 +31,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.24" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25" PrivateAssets="all" />
   </ItemGroup>  
 </Project>
diff --git a/src/Sextant.Tests/API/ApiApprovalTests.SextantProject.net472.approved.txt b/src/Sextant.Tests/API/ApiApprovalTests.SextantProject.net472.approved.txt
@@ -6,7 +6,7 @@ namespace Sextant
         public static string NavigationView { get; }
         public static Splat.IMutableDependencyResolver RegisterParameterViewStackService(this Splat.IMutableDependencyResolver dependencyResolver) { }
         public static Splat.IMutableDependencyResolver RegisterView<TView, TViewModel>(this Splat.IMutableDependencyResolver dependencyResolver, string contract = null)
-            where TView : ReactiveUI.IViewFor<>, new ()
+            where TView : ReactiveUI.IViewFor<TViewModel>, new ()
             where TViewModel :  class, Sextant.IViewModel { }
         public static Splat.IMutableDependencyResolver RegisterView<TView, TViewModel>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<ReactiveUI.IViewFor<TViewModel>> viewFactory, string contract = null)
             where TView : ReactiveUI.IViewFor

diff --git a/src/Sextant.Tests/API/ApiApprovalTests.SextantProject.netcoreapp2.2.approved.txt b/src/Sextant.Tests/API/ApiApprovalTests.SextantProject.netcoreapp2.2.approved.txt
@@ -6,7 +6,7 @@ namespace Sextant
         public static string NavigationView { get; }
         public static Splat.IMutableDependencyResolver RegisterParameterViewStackService(this Splat.IMutableDependencyResolver dependencyResolver) { }
         public static Splat.IMutableDependencyResolver RegisterView<TView, TViewModel>(this Splat.IMutableDependencyResolver dependencyResolver, string contract = null)
-            where TView : ReactiveUI.IViewFor<>, new ()
+            where TView : ReactiveUI.IViewFor<TViewModel>, new ()
             where TViewModel :  class, Sextant.IViewModel { }
         public static Splat.IMutableDependencyResolver RegisterView<TView, TViewModel>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<ReactiveUI.IViewFor<TViewModel>> viewFactory, string contract = null)
             where TView : ReactiveUI.IViewFor

diff --git a/src/Sextant.XamForms/Sextant.XamForms.csproj b/src/Sextant.XamForms/Sextant.XamForms.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="9.*" />
+    <PackageReference Include="ReactiveUI" Version="10.*" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
   </ItemGroup>
 

diff --git a/src/Sextant/DependencyResolverMixins.cs b/src/Sextant/DependencyResolverMixins.cs
@@ -26,7 +26,7 @@ public static class DependencyResolverMixins
         /// Registers the view stack service.
         /// </summary>
         /// <param name="dependencyResolver">The dependency resolver.</param>
-        /// <returns>The dependencyResovler.</returns>
+        /// <returns>The dependencyResolver.</returns>
         public static IMutableDependencyResolver RegisterViewStackService(this IMutableDependencyResolver dependencyResolver)
         {
             IView view = Locator.Current.GetService<IView>(NavigationView);
@@ -52,7 +52,7 @@ public static IMutableDependencyResolver RegisterParameterViewStackService(this
         /// <typeparam name="T">The view stack service type.</typeparam>
         /// <param name="dependencyResolver">The dependency resolver.</param>
         /// <param name="factory">The factory.</param>
-        /// <returns>The dependencyResovler.</returns>
+        /// <returns>The dependencyResolver.</returns>
         public static IMutableDependencyResolver RegisterViewStackService<T>(this IMutableDependencyResolver dependencyResolver, Func<IView, T> factory)
             where T : IViewStackService
         {
@@ -85,9 +85,7 @@ public static IMutableDependencyResolver RegisterView<TView, TViewModel>(this IM
         /// <param name="dependencyResolver">The dependency resolver.</param>
         /// <param name="viewFactory">The view factory.</param>
         /// <param name="contract">The contract.</param>
-        /// <returns>
-        /// The dependencyResovler.
-        /// </returns>
+        /// <returns>The dependencyResolver.</returns>
         public static IMutableDependencyResolver RegisterView<TView, TViewModel>(this IMutableDependencyResolver dependencyResolver, Func<IViewFor<TViewModel>> viewFactory, string contract = null)
             where TView : IViewFor
             where TViewModel : class, IViewModel

diff --git a/src/Sextant/Sextant.csproj b/src/Sextant/Sextant.csproj
@@ -11,7 +11,7 @@
     <Compile Remove="Platforms\**\*.cs" />
     <None Include="Platforms\**\*.cs" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-    <PackageReference Include="ReactiveUI" Version="9.*" />
+    <PackageReference Include="ReactiveUI" Version="10.*" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">