Fixed build and tests

Author: IsmailHassani

samples/Sample.Blazor/Components/Layout/MainLayout.razor.cs

@@ -1,7 +1,7 @@
-using ISynergy.Framework.Core.Abstractions;
+using ISynergy.Framework.Core.Abstractions;
 using ISynergy.Framework.Core.Abstractions.Base;
 using ISynergy.Framework.Core.Abstractions.Services;
-using ISynergy.Framework.Core.Messages;
+using ISynergy.Framework.Core.Services;
 using ISynergy.Framework.Mvvm.Messages;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;

samples/Sample.Maui/Views/ShellView.xaml.cs

@@ -7,10 +7,24 @@ namespace Sample.Views;
 
 public partial class ShellView : IShellView
 {
+    /// <summary>
+    /// Gets or sets the viewmodel and data context for a view.
+    /// </summary>
+    /// <value>The data context.</value>
     public IViewModel ViewModel
     {
-        get => BindingContext as IViewModel ?? throw new InvalidOperationException("ViewModel is not set");
-        set => BindingContext = value;
+        get
+        {
+            if (BindingContext is IViewModel viewModel)
+                return viewModel;
+
+            throw new InvalidOperationException("The BindingContext is not of type IViewModel.");
+        }
+        set
+        {
+            BindingContext = value;
+            SetBinding(View.TitleProperty, new Binding(nameof(value.Title)));
+        }
     }
 
     public ShellView(ShellViewModel viewModel)
@@ -45,7 +59,6 @@ protected virtual void Dispose(bool disposing)
         {
             // free managed resources
             ViewModel?.Dispose();
-            ViewModel = null;
         }
 
         // free native resources if there are any.

samples/Sample.Shared/Services/ExceptionHandlerService.cs

@@ -1,4 +1,4 @@
-using ISynergy.Framework.Core.Abstractions.Services;
+using ISynergy.Framework.Core.Abstractions.Services;
 using ISynergy.Framework.UI.Services.Base;
 using Microsoft.Extensions.Logging;
 
@@ -7,6 +7,7 @@ namespace Sample.Services;
 public class ExceptionHandlerService(
     IBusyService busyService,
     ILanguageService languageService,
-    ILogger<BaseExceptionHandlerService> logger) : BaseExceptionHandlerService(busyService, languageService, logger)
+    IMessengerService messengerService,
+    ILogger<BaseExceptionHandlerService> logger) : BaseExceptionHandlerService(busyService, languageService, messengerService, logger)
 {
 }

src/ISynergy.Framework.Automations/Abstractions/IActionQueueBuilder.cs

@@ -1,3 +1,5 @@
+using System.Collections.Concurrent;
+
 namespace ISynergy.Framework.Automations.Abstractions;
 
 /// <summary>

src/ISynergy.Framework.Core/Extensions/ConfigurationExtensions.cs

@@ -1,4 +1,4 @@
-using ISynergy.Framework.Core.Locators;
+using ISynergy.Framework.Core.Locators;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System.Runtime.CompilerServices;
@@ -48,7 +48,7 @@ public void Dispose()
     {
         try
         {
-            return ServiceLocator.Default.ServiceProvider.GetService<ILoggerFactory>()?
+            return ServiceLocator.Default.GetRequiredService<ILoggerFactory>()?
                 .CreateLogger(typeof(ConfigurationExtensions));
         }
         catch
@@ -77,7 +77,7 @@ public static void BindWithReload(this IConfiguration configuration, object inst
             };
 
             configuration.Bind(instance, options => options.ErrorOnUnknownConfiguration = false);
-            
+
             // Register change callback and store the token for disposal
             var reloadToken = configuration.GetReloadToken().RegisterChangeCallback((_) =>
             {
@@ -109,7 +109,7 @@ public static LogLevel GetDefaultLogLevel(this IConfiguration configuration) =>
     public static LogLevel GetLogLevel(this IConfiguration configuration, string category)
     {
         var logLevel = configuration.GetSection($"LogLevel:{category}").Get<LogLevel>();
-        
+
         // Return Information as default instead of None (which is default(LogLevel))
         if (logLevel == default(LogLevel))
         {

src/ISynergy.Framework.Core/Extensions/StringExtensions.cs

@@ -1,4 +1,4 @@
-using System.Drawing;
+using System.Drawing;
 using System.Globalization;
 using System.Reflection;
 using System.Text;
@@ -106,15 +106,18 @@ public static string IncreaseString2Long(this string self, long summand)
             }
         }
 
-        // No numeric suffix found
+        // If codePos is still at self.Length, all characters are digits
         if (codePos == self.Length)
-            return self + summand;
+        {
+            var num = long.Parse(self) + summand;
+            return num.ToString();
+        }
 
         var numberString = self[codePos..];
-        var num = long.Parse(numberString) + summand;
+        var num_value = long.Parse(numberString) + summand;
 
         // Format the number with leading zeros to maintain the original format
-        return self[..codePos] + num.ToString().PadLeft(numberString.Length, '0');
+        return self[..codePos] + num_value.ToString().PadLeft(numberString.Length, '0');
     }
 
     /// <summary>

src/ISynergy.Framework.Core/Services/MessengerService.cs

@@ -1,4 +1,4 @@
-using ISynergy.Framework.Core.Abstractions.Events;
+using ISynergy.Framework.Core.Abstractions.Events;
 using ISynergy.Framework.Core.Abstractions.Services;
 using ISynergy.Framework.Core.Events;
 using ISynergy.Framework.Core.Extensions;
@@ -24,7 +24,8 @@ public sealed class MessengerService : IMessengerService
 {
     private readonly object _recipientsLock = new object();
     private readonly object _cleanupLock = new object();
-    private readonly ILogger<MessengerService>? _logger;
+
+    private readonly ILogger<MessengerService> _logger;
 
     private Dictionary<Type, List<WeakActionAndToken>>? _recipientsOfSubclassesAction;
     private Dictionary<Type, List<WeakActionAndToken>>? _recipientsStrictAction;
@@ -33,7 +34,7 @@ public sealed class MessengerService : IMessengerService
     /// Initializes a new instance of the <see cref="MessengerService"/> class.
     /// </summary>
     /// <param name="logger">Optional logger for exception handling. If not provided, exceptions will be silently handled.</param>
-    public MessengerService(ILogger<MessengerService>? logger = null)
+    public MessengerService(ILogger<MessengerService> logger)
     {
         _logger = logger;
     }
@@ -411,7 +412,7 @@ public void SendToTargetOrType<TMessage>(
 
                     if (list is not null)
                     {
-                        SendToList(message, list, messageType, targetType, token, _logger);
+                        SendToList(message, list, messageType, targetType, token);
                     }
                 }
             }
@@ -433,7 +434,7 @@ public void SendToTargetOrType<TMessage>(
 
             if (list is not null)
             {
-                SendToList(message, list, messageType, targetType, token, _logger);
+                SendToList(message, list, messageType, targetType, token);
             }
         }
 
@@ -458,13 +459,12 @@ public void SendToTargetOrType<TMessage>(
     /// use a token when registering (or who used a different token) will not
     /// get the message. Similarly, messages sent without any token, or with a different
     /// token, will not be delivered to that recipient.</param>
-    private static void SendToList<TMessage>(
+    private void SendToList<TMessage>(
         TMessage message,
         List<WeakActionAndToken> list,
         Type messageType,
         Type? targetType,
-        object? token,
-        ILogger<MessengerService>? logger)
+        object? token)
     {
         if (message is null)
             return;
@@ -489,7 +489,7 @@ private static void SendToList<TMessage>(
                 {
                     // Log exceptions to prevent one failing recipient from affecting others
                     // This allows debugging while maintaining message delivery to other recipients
-                    logger?.LogWarning(ex, 
+                    _logger?.LogWarning(ex,
                         "Exception occurred while executing message handler. MessageType: {MessageType}, RecipientType: {RecipientType}",
                         message?.GetType().Name ?? "Unknown",
                         item.Action?.Target?.GetType().Name ?? "Unknown");

src/ISynergy.Framework.Mvvm/Abstractions/Services/INavigationService.cs

@@ -1,4 +1,4 @@
-using ISynergy.Framework.Mvvm.Abstractions.ViewModels;
+using ISynergy.Framework.Mvvm.Abstractions.ViewModels;
 
 namespace ISynergy.Framework.Mvvm.Abstractions.Services;
 

src/ISynergy.Framework.Mvvm/ViewModels/ViewModel.cs

@@ -1,6 +1,5 @@
-using ISynergy.Framework.Core.Abstractions.Services;
+using ISynergy.Framework.Core.Abstractions.Services;
 using ISynergy.Framework.Core.Base;
-using ISynergy.Framework.Core.Services;
 using ISynergy.Framework.Core.Validation;
 using ISynergy.Framework.Mvvm.Abstractions.ViewModels;
 using ISynergy.Framework.Mvvm.Commands;
@@ -120,27 +119,19 @@ protected ViewModel(
 
     private async void ScopedContextService_ScopedChanged(object? sender, Core.Events.ReturnEventArgs<bool> e)
     {
-        try
+        if (e.Value)
         {
-            if (e.Value)
-            {
-                IsInitialized = false;
+            IsInitialized = false;
 
-                // Clear existing data
-                Cleanup();
+            // Clear existing data
+            Cleanup();
 
-                // Reinitialize with new scope if needed
-                if (!IsDisposed)
-                {
-                    await InitializeAsync();
-                }
+            // Reinitialize with new scope if needed
+            if (!IsDisposed)
+            {
+                await InitializeAsync();
             }
         }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error in ScopedContextService_ScopedChanged for {ViewModelType}", GetType().Name);
-            _commonServices.ExceptionHandlerService?.HandleException(ex);
-        }
     }
 
     /// <summary>

src/ISynergy.Framework.UI.Blazor/Components/Controls/View.cs

@@ -1,4 +1,4 @@
-using ISynergy.Framework.Core.Attributes;
+using ISynergy.Framework.Core.Attributes;
 using ISynergy.Framework.Core.Enumerations;
 using ISynergy.Framework.Mvvm.Abstractions;
 using ISynergy.Framework.Mvvm.Abstractions.ViewModels;
@@ -18,7 +18,7 @@ public partial class View<TViewModel> : ComponentBase, IView
     /// Gets or sets the viewmodel and data context for a view.
     /// </summary>
     /// <value>The data context.</value>
-    [Inject] public TViewModel? ViewModel { get; set; }
+    [Inject] public required TViewModel ViewModel { get; set; }
 
     /// <summary>
     /// Gets or sets the IsEnabled property value.
@@ -30,10 +30,10 @@ public partial class View<TViewModel> : ComponentBase, IView
     /// </summary>
     private readonly List<ICommand> _subscribedCommands = new();
 
-    IViewModel? IView.ViewModel
+    IViewModel IView.ViewModel
     {
         get => ViewModel;
-        set => ViewModel = value is null ? null : (TViewModel)value;
+        set => ViewModel = (TViewModel)value;
     }
 
     protected override async Task OnInitializedAsync()