Merge branch 'main' into feature/assembly-replacement-config

src/Directory.build.props

@@ -41,7 +41,7 @@
     <PackageReference Include="Xunit.StaFact" Version="1.1.11" />
     <PackageReference Include="NetTestRegimentation" Version="1.7.48" />
     <!--<PackageReference Include="PublicApiGenerator" Version="8.1.0" />-->
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup Condition="$(IsTestProject)">

src/ReactiveUI.Blazor.ViewToViewModelBindings/ReactiveUI.Blazor.ViewToViewModelBindings.csproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.5" ReferenceOutputAssembly="true" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.6" ReferenceOutputAssembly="true" />
     <PackageReference Include="ReactiveUI.Blazor" Version="20.1.1" ReferenceOutputAssembly="true" />
   </ItemGroup>
 

src/ReactiveUI.VetuviemSample.BlazorApp/ReactiveUI.VetuviemSample.BlazorApp.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 

src/Vetuviem.Core/AbstractControlBindingModel.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
+using System.Reactive.Disposables;
 
 namespace Vetuviem.Core
 {
@@ -36,5 +37,11 @@ public abstract void ApplyBindings(
             TView view,
             TViewModel viewModel,
             Action<IDisposable> disposeAction);
+
+        /// <inheritdoc/>
+        public abstract void ApplyBindings(
+            TView view,
+            TViewModel viewModel,
+            CompositeDisposable disposeAction);
     }
 }

src/Vetuviem.Core/AbstractEnableViewToViewModelBindings.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -34,6 +35,22 @@ public void ApplyBindings(
             }
         }
 
+        /// <inheritdoc />
+        public void ApplyBindings(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel)
+        {
+            var bindings = GetBindings();
+            foreach (var viewBindingModel in bindings)
+            {
+                viewBindingModel.ApplyBindings(
+                    view,
+                    viewModel,
+                    compositeDisposable);
+            }
+        }
+
         /// <summary>
         /// Gets the controls to be bound on the view.
         /// </summary>

src/Vetuviem.Core/CommandBinding.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Linq.Expressions;
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Windows.Input;
 using ReactiveUI;
 
@@ -67,5 +68,40 @@ public void ApplyBinding<TView>(
                 viewBinding,
                 _toEvent));
         }
+
+        /// <inheritdoc/>
+        public void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, ICommand>> viewBinding)
+            where TView : class, IViewFor<TViewModel>
+        {
+            if (compositeDisposable == null)
+            {
+                throw new ArgumentNullException(nameof(compositeDisposable));
+            }
+
+            if (view == null)
+            {
+                throw new ArgumentNullException(nameof(view));
+            }
+
+            if (viewModel == null)
+            {
+                throw new ArgumentNullException(nameof(viewModel));
+            }
+
+            if (viewBinding == null)
+            {
+                throw new ArgumentNullException(nameof(viewBinding));
+            }
+
+            view.BindCommand(
+                viewModel,
+                _viewModelBinding,
+                viewBinding,
+                _toEvent).DisposeWith(compositeDisposable);
+        }
     }
 }

src/Vetuviem.Core/ICommandBinding.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -30,5 +31,20 @@ void ApplyBinding<TView>(
             TViewModel viewModel,
             Expression<Func<TView, TViewProp>> viewBinding)
             where TView : class, IViewFor<TViewModel>;
+
+        /// <summary>
+        /// Applies a View to View Model Binding.
+        /// </summary>
+        /// <typeparam name="TView">The type for the view.</typeparam>
+        /// <param name="compositeDisposable">The disposable action registration. Used to clean up when bindings fall out of scope.</param>
+        /// <param name="view">The instance of the View to bind.</param>
+        /// <param name="viewModel">The instance of the ViewModel to Bind.</param>
+        /// <param name="viewBinding">Expression of the View Property to Bind to.</param>
+        void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, TViewProp>> viewBinding)
+            where TView : class, IViewFor<TViewModel>;
     }
 }

src/Vetuviem.Core/IControlBindingModel.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -23,5 +24,13 @@ public interface IControlBindingModel<in TView, in TViewModel>
         /// <param name="viewModel">The viewmodel.</param>
         /// <param name="disposeAction">The action to register disposals against.</param>
         void ApplyBindings(TView view, TViewModel viewModel, Action<IDisposable> disposeAction);
+
+        /// <summary>
+        /// Applies the binding between the view and the view model.
+        /// </summary>
+        /// <param name="view">The view.</param>
+        /// <param name="viewModel">The viewmodel.</param>
+        /// <param name="compositeDisposable">The disposable container to register disposals against.</param>
+        void ApplyBindings(TView view, TViewModel viewModel, CompositeDisposable compositeDisposable);
     }
 }

src/Vetuviem.Core/IEnableViewToViewModelBindings.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -19,12 +20,23 @@ public interface IEnableViewToViewModelBindings<in TView, in TViewModel>
         /// <summary>
         /// Apply control bindings between a View and ViewModel.
         /// </summary>
-        /// <param name="disposeWithAction">The ReactiveUI Disposal Tracker.</param>
+        /// <param name="disposeWithAction">The ReactiveUI Disposal Tracker. Used to discard binding registrations when the view is finished with them.</param>
         /// <param name="view">Instance of the view.</param>
         /// <param name="viewModel">Instance of the viewmodel.</param>
         void ApplyBindings(
             Action<IDisposable> disposeWithAction,
             TView view,
             TViewModel viewModel);
+
+        /// <summary>
+        /// Apply control bindings between a View and ViewModel.
+        /// </summary>
+        /// <param name="compositeDisposable">The Composite Disposable Tracker. Used to discard binding registrations when the view is finished with them.</param>
+        /// <param name="view">Instance of the view.</param>
+        /// <param name="viewModel">Instance of the viewmodel.</param>
+        void ApplyBindings(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel);
     }
 }

src/Vetuviem.Core/IOneOrTwoWayBind{TViewModel,TViewProp}.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -30,5 +31,20 @@ void ApplyBinding<TView>(
             TViewModel viewModel,
             Expression<Func<TView, TViewProp>> viewBinding)
             where TView : class, IViewFor<TViewModel>;
+
+        /// <summary>
+        /// Applies a View to View Model Binding.
+        /// </summary>
+        /// <typeparam name="TView">The type for the view.</typeparam>
+        /// <param name="compositeDisposable">The disposable action registration. Used to clean up when bindings fall out of scope.</param>
+        /// <param name="view">The instance of the View to bind.</param>
+        /// <param name="viewModel">The instance of the ViewModel to Bind.</param>
+        /// <param name="viewBinding">Expression of the View Property to Bind to.</param>
+        void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, TViewProp>> viewBinding)
+            where TView : class, IViewFor<TViewModel>;
     }
 }

src/Vetuviem.Core/IOneWayBind{TViewModel,TViewProp}.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -35,5 +36,20 @@ void ApplyBinding<TView>(
             TViewModel viewModel,
             Expression<Func<TView, TViewProp>> viewBinding)
             where TView : class, IViewFor<TViewModel>;
+
+        /// <summary>
+        /// Applies a View to View Model Binding.
+        /// </summary>
+        /// <typeparam name="TView">The type for the view.</typeparam>
+        /// <param name="compositeDisposable">The disposable action registration. Used to clean up when bindings fall out of scope.</param>
+        /// <param name="view">The instance of the View to bind.</param>
+        /// <param name="viewModel">The instance of the ViewModel to Bind.</param>
+        /// <param name="viewBinding">Expression of the View Property to Bind to.</param>
+        void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, TViewProp>> viewBinding)
+            where TView : class, IViewFor<TViewModel>;
     }
 }

src/Vetuviem.Core/OneWayBinding.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -49,5 +50,24 @@ public void ApplyBinding<TView>(
                 ViewModelBinding,
                 viewBinding));
         }
+
+        /// <inheritdoc/>
+        public void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, TViewProp>> viewBinding)
+            where TView : class, IViewFor<TViewModel>
+        {
+            if (compositeDisposable == null)
+            {
+                throw new ArgumentNullException(nameof(compositeDisposable));
+            }
+
+            view.OneWayBind(
+                viewModel,
+                ViewModelBinding,
+                viewBinding).DisposeWith(compositeDisposable);
+        }
     }
 }

src/Vetuviem.Core/OneWayBindingOnOneOrTwoWayBind.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -51,5 +52,25 @@ public void ApplyBinding<TView>(
                 viewBinding,
                 _vmToViewConverter));
         }
+
+        /// <inheritdoc/>
+        public void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, TViewProp>> viewBinding)
+            where TView : class, IViewFor<TViewModel>
+        {
+            if (compositeDisposable == null)
+            {
+                throw new ArgumentNullException(nameof(compositeDisposable));
+            }
+
+            view.OneWayBind(
+                viewModel,
+                _viewModelBinding,
+                viewBinding,
+                _vmToViewConverter).DisposeWith(compositeDisposable);
+        }
     }
 }

src/Vetuviem.Core/OneWayBindingOnOneOrTwoWayBind{TViewModel,TViewProp,TOut}.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq.Expressions;
+using System.Reactive.Disposables;
 using ReactiveUI;
 
 namespace Vetuviem.Core
@@ -53,5 +54,25 @@ public void ApplyBinding<TView>(
                 viewBinding,
                 _converterBinding));
         }
+
+        /// <inheritdoc/>
+        public void ApplyBinding<TView>(
+            CompositeDisposable compositeDisposable,
+            TView view,
+            TViewModel viewModel,
+            Expression<Func<TView, TOut>> viewBinding)
+            where TView : class, IViewFor<TViewModel>
+        {
+            if (compositeDisposable == null)
+            {
+                throw new ArgumentNullException(nameof(compositeDisposable));
+            }
+
+            view.OneWayBind(
+                viewModel,
+                _viewModelBinding,
+                viewBinding,
+                _converterBinding).DisposeWith(compositeDisposable);
+        }
     }
 }