dependency: Use ReactiveUI 14.* (#301)

reactiveui · Jun 24, 2021 · c044bfa · c044bfa
1 parent 02b1962
commit c044bfa
Show file tree

Hide file tree

Showing 22 changed files with 93 additions and 93 deletions.
diff --git a/samples/LoginApp.Android/LoginApp.Android.csproj b/samples/LoginApp.Android/LoginApp.Android.csproj
@@ -71,15 +71,15 @@
     <AndroidResource Include="Resources\values\styles.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="13.*" />
-    <PackageReference Include="ReactiveUI.AndroidX" Version="13.*" />
+    <PackageReference Include="ReactiveUI" Version="14.*" />
+    <PackageReference Include="ReactiveUI.AndroidX" Version="14.*" />
     <PackageReference Include="ReactiveUI.Validation" Version="2.*" />
     <PackageReference Include="ReactiveUI.Validation.AndroidX" Version="2.*" />
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.3.0.1" />
     <!-- We are pinning transitive deps versions coming from ReactiveUI.AndroidX.
          See: https://github.com/reactiveui/ReactiveUI.Validation/pull/216#issuecomment-783218308 -->
     <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
-    <PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.3.4" />
+    <PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.3.5" />
     <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/LoginApp.Forms.Android/LoginApp.Forms.Android.csproj b/samples/LoginApp.Forms.Android/LoginApp.Forms.Android.csproj
@@ -56,8 +56,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="13.*" />
-    <PackageReference Include="ReactiveUI.XamForms" Version="13.*" />
+    <PackageReference Include="ReactiveUI" Version="14.*" />
+    <PackageReference Include="ReactiveUI.XamForms" Version="14.*" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.*" />
     <PackageReference Include="Xamarin.Android.Support.v7.Preference" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.Media.Compat" Version="28.0.0.3" />
@@ -70,7 +70,7 @@
     <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.3" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.4" />
     <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />
     <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
   </ItemGroup>

diff --git a/samples/LoginApp.Forms/LoginApp.Forms.csproj b/samples/LoginApp.Forms/LoginApp.Forms.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ReactiveUI.XamForms" Version="13.*" />
+    <PackageReference Include="ReactiveUI.XamForms" Version="14.*" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.*" />
   </ItemGroup>
 

diff --git a/samples/LoginApp.Uwp/LoginApp.Uwp.csproj b/samples/LoginApp.Uwp/LoginApp.Uwp.csproj
@@ -148,7 +148,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" />
-    <PackageReference Include="ReactiveUI" Version="13.*" />
+    <PackageReference Include="ReactiveUI" Version="14.*" />
     <PackageReference Include="ReactiveUI.Validation" Version="2.*" />
   </ItemGroup>
   <ItemGroup>

diff --git a/samples/LoginApp.WinForms/LoginApp.WinForms.csproj b/samples/LoginApp.WinForms/LoginApp.WinForms.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ReactiveUI.WinForms" Version="13.*" />
+        <PackageReference Include="ReactiveUI.WinForms" Version="14.*" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/samples/LoginApp.Wpf/LoginApp.Wpf.csproj b/samples/LoginApp.Wpf/LoginApp.Wpf.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.4.6" />
-    <PackageReference Include="ReactiveUI.WPF" Version="13.*" />
+    <PackageReference Include="ReactiveUI.WPF" Version="14.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/LoginApp/LoginApp.csproj b/samples/LoginApp/LoginApp.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="13.*" />
-    <PackageReference Include="ReactiveUI.Fody" Version="13.*" />
+    <PackageReference Include="ReactiveUI" Version="14.*" />
+    <PackageReference Include="ReactiveUI.Fody" Version="14.*" />
     <PackageReference Include="ReactiveUI.Validation" Version="2.*" />
   </ItemGroup>
 </Project>
diff --git a/src/ReactiveUI.Validation.AndroidSupport/Extensions/ViewForExtensions.cs b/src/ReactiveUI.Validation.AndroidSupport/Extensions/ViewForExtensions.cs
@@ -44,7 +44,7 @@ public static class ViewForExtensions
         public static IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(
             this TView view,
             TViewModel? viewModel,
-            Expression<Func<TViewModel, TViewModelProperty>> viewModelProperty,
+            Expression<Func<TViewModel, TViewModelProperty?>> viewModelProperty,
             TextInputLayout viewProperty,
             IValidationTextFormatter<string>? formatter = null)
             where TView : IViewFor<TViewModel>
@@ -98,7 +98,7 @@ public static class ViewForExtensions
         public static IDisposable BindValidationEx<TView, TViewModel, TViewModelProperty>(
             this TView view,
             TViewModel? viewModel,
-            Expression<Func<TViewModel, TViewModelProperty>> viewModelProperty,
+            Expression<Func<TViewModel, TViewModelProperty?>> viewModelProperty,
             TextInputLayout viewProperty,
             IValidationTextFormatter<string>? formatter = null)
             where TView : IViewFor<TViewModel>
@@ -148,7 +148,7 @@ public static class ViewForExtensions
         public static IDisposable BindValidation<TView, TViewModel>(
             this TView view,
             TViewModel? viewModel,
-            Expression<Func<TViewModel?, ValidationHelper>> viewModelHelperProperty,
+            Expression<Func<TViewModel?, ValidationHelper?>> viewModelHelperProperty,
             TextInputLayout viewProperty,
             IValidationTextFormatter<string>? formatter = null)
             where TView : IViewFor<TViewModel>

diff --git a/src/ReactiveUI.Validation.AndroidSupport/ReactiveUI.Validation.AndroidSupport.csproj b/src/ReactiveUI.Validation.AndroidSupport/ReactiveUI.Validation.AndroidSupport.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.*" />
-    <PackageReference Include="ReactiveUI.AndroidSupport" Version="13.*" />
-    <PackageReference Include="ReactiveUI" Version="13.*" />
+    <PackageReference Include="ReactiveUI.AndroidSupport" Version="14.*" />
+    <PackageReference Include="ReactiveUI" Version="14.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReactiveUI.Validation.AndroidX/Extensions/ViewForExtensions.cs b/src/ReactiveUI.Validation.AndroidX/Extensions/ViewForExtensions.cs
@@ -44,7 +44,7 @@ public static class ViewForExtensions
         public static IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(
             this TView view,
             TViewModel? viewModel,
-            Expression<Func<TViewModel, TViewModelProperty>> viewModelProperty,
+            Expression<Func<TViewModel, TViewModelProperty?>> viewModelProperty,
             TextInputLayout viewProperty,
             IValidationTextFormatter<string>? formatter = null)
             where TView : IViewFor<TViewModel>
@@ -98,7 +98,7 @@ public static class ViewForExtensions
         public static IDisposable BindValidationEx<TView, TViewModel, TViewModelProperty>(
             this TView view,
             TViewModel? viewModel,
-            Expression<Func<TViewModel, TViewModelProperty>> viewModelProperty,
+            Expression<Func<TViewModel, TViewModelProperty?>> viewModelProperty,
             TextInputLayout viewProperty,
             IValidationTextFormatter<string>? formatter = null)
             where TView : IViewFor<TViewModel>
@@ -148,7 +148,7 @@ public static class ViewForExtensions
         public static IDisposable BindValidation<TView, TViewModel>(
             this TView view,
             TViewModel? viewModel,
-            Expression<Func<TViewModel?, ValidationHelper>> viewModelHelperProperty,
+            Expression<Func<TViewModel?, ValidationHelper?>> viewModelHelperProperty,
             TextInputLayout viewProperty,
             IValidationTextFormatter<string>? formatter = null)
             where TView : IViewFor<TViewModel>

diff --git a/src/ReactiveUI.Validation.AndroidX/ReactiveUI.Validation.AndroidX.csproj b/src/ReactiveUI.Validation.AndroidX/ReactiveUI.Validation.AndroidX.csproj
@@ -11,8 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.*" />
-    <PackageReference Include="ReactiveUI.AndroidX" Version="13.*" />
-    <PackageReference Include="ReactiveUI" Version="13.*" />
+    <PackageReference Include="ReactiveUI.AndroidX" Version="14.*" />
+    <PackageReference Include="ReactiveUI" Version="14.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReactiveUI.Validation.Tests/API/ApiApprovalTests.ValidationProject.net461.approved.txt b/src/ReactiveUI.Validation.Tests/API/ApiApprovalTests.ValidationProject.net461.approved.txt
@@ -65,9 +65,9 @@ namespace ReactiveUI.Validation.Components
     }
     public sealed class BasePropertyValidation<TViewModel, TViewModelProperty> : ReactiveUI.Validation.Components.BasePropertyValidation<TViewModel>
     {
-        public BasePropertyValidation(TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty>> viewModelProperty, System.Func<TViewModelProperty, bool> isValidFunc, System.Func<TViewModelProperty, string> message) { }
-        public BasePropertyValidation(TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty>> viewModelProperty, System.Func<TViewModelProperty, bool> isValidFunc, System.Func<TViewModelProperty, bool, string> messageFunc) { }
-        public BasePropertyValidation(TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty>> viewModelProperty, System.Func<TViewModelProperty, bool> isValidFunc, string message) { }
+        public BasePropertyValidation(TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, System.Func<TViewModelProperty?, bool> isValidFunc, System.Func<TViewModelProperty?, string> message) { }
+        public BasePropertyValidation(TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, System.Func<TViewModelProperty?, bool> isValidFunc, System.Func<TViewModelProperty?, bool, string> messageFunc) { }
+        public BasePropertyValidation(TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, System.Func<TViewModelProperty?, bool> isValidFunc, string message) { }
         protected override void Dispose(bool disposing) { }
         protected override System.IObservable<ReactiveUI.Validation.States.IValidationState> GetValidationChangeObservable() { }
     }
@@ -110,7 +110,7 @@ namespace ReactiveUI.Validation.Contexts
     {
         public ValidationContext(System.Reactive.Concurrency.IScheduler? scheduler = null) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        public ReactiveUI.Validation.Collections.ValidationText? Text { get; }
         public System.IObservable<bool> Valid { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         public System.Collections.ObjectModel.ReadOnlyObservableCollection<ReactiveUI.Validation.Components.Abstractions.IValidationComponent> Validations { get; }
@@ -143,11 +143,11 @@ namespace ReactiveUI.Validation.Extensions
             where TViewModel : ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
         public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TValue>(this TViewModel viewModel, System.IObservable<TValue> validationObservable, System.Func<TValue, bool> isValidFunc, System.Func<TValue, string> messageFunc)
             where TViewModel : ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
-        public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp>> viewModelProperty, System.Func<TViewModelProp, bool> isPropertyValid, System.Func<TViewModelProp, string> message)
+        public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp>> viewModelProperty, System.IObservable<bool> viewModelObservable, string message)
             where TViewModel : ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
-        public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp>> viewModelProperty, System.Func<TViewModelProp, bool> isPropertyValid, string message)
+        public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp?>> viewModelProperty, System.Func<TViewModelProp?, bool> isPropertyValid, System.Func<TViewModelProp?, string> message)
             where TViewModel : ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
-        public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp>> viewModelProperty, System.IObservable<bool> viewModelObservable, string message)
+        public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp?>> viewModelProperty, System.Func<TViewModelProp?, bool> isPropertyValid, string message)
             where TViewModel : ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
         public static ReactiveUI.Validation.Helpers.ValidationHelper ValidationRule<TViewModel, TViewModelProp, TValue>(this TViewModel viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProp>> viewModelProperty, System.IObservable<TValue> validationObservable)
             where TViewModel : ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel
@@ -168,7 +168,7 @@ namespace ReactiveUI.Validation.Extensions
         public static System.IDisposable BindValidation<TView, TViewModel, TViewProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null)
             where TView : ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
-        public static System.IDisposable BindValidation<TView, TViewModel, TViewProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper>> viewModelHelperProperty, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null)
+        public static System.IDisposable BindValidation<TView, TViewModel, TViewProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper?>> viewModelHelperProperty, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null)
             where TView : ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
         public static System.IDisposable BindValidation<TView, TViewModel, TViewModelProperty, TViewProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty>> viewModelProperty, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null)
@@ -207,7 +207,7 @@ namespace ReactiveUI.Validation.Helpers
     {
         public ValidationHelper(ReactiveUI.Validation.Components.Abstractions.IValidationComponent validation, System.IDisposable? cleanup = null) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText Message { get; }
+        public ReactiveUI.Validation.Collections.ValidationText? Message { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationChanged { get; }
         public void Dispose() { }
         protected virtual void Dispose(bool disposing) { }
@@ -244,10 +244,10 @@ namespace ReactiveUI.Validation.ValidationBindings
         public static ReactiveUI.Validation.ValidationBindings.Abstractions.IValidationBinding ForProperty<TView, TViewModel, TViewModelProperty, TViewProperty>(TView view, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty>> viewModelProperty, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null, bool strict = true)
             where TView : ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
-        public static ReactiveUI.Validation.ValidationBindings.Abstractions.IValidationBinding ForValidationHelperProperty<TView, TViewModel, TOut>(TView view, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper>> viewModelHelperProperty, System.Action<ReactiveUI.Validation.States.IValidationState, TOut> action, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<TOut> formatter)
+        public static ReactiveUI.Validation.ValidationBindings.Abstractions.IValidationBinding ForValidationHelperProperty<TView, TViewModel, TOut>(TView view, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper?>> viewModelHelperProperty, System.Action<ReactiveUI.Validation.States.IValidationState, TOut> action, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<TOut> formatter)
             where TView : ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
-        public static ReactiveUI.Validation.ValidationBindings.Abstractions.IValidationBinding ForValidationHelperProperty<TView, TViewModel, TViewProperty>(TView view, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper>> viewModelHelperProperty, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null)
+        public static ReactiveUI.Validation.ValidationBindings.Abstractions.IValidationBinding ForValidationHelperProperty<TView, TViewModel, TViewProperty>(TView view, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper?>> viewModelHelperProperty, System.Linq.Expressions.Expression<System.Func<TView, TViewProperty>> viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter = null)
             where TView : ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
         public static ReactiveUI.Validation.ValidationBindings.Abstractions.IValidationBinding ForViewModel<TView, TViewModel, TOut>(TView view, System.Action<TOut> action, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<TOut> formatter)