code sweep

Framework/Avalonia/Avalonia.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -7,15 +6,12 @@
 		<AssemblyName>Toolkit.Foundation.Avalonia</AssemblyName>
 		<RootNamespace>Toolkit.Foundation.Avalonia</RootNamespace>
 	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="11.0.0-preview4" />
 		<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview4" />
 		<PackageReference Include="Mediator.Abstractions" Version="2.1.0-preview.5" />
 	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Foundation\Foundation.csproj" />
 	</ItemGroup>
-
 </Project>

Framework/Avalonia/Extensions/IHostBuilderExtensions.cs

@@ -1,7 +1,7 @@
-using Mediator;
+using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
+using Toolkit.Framework.Foundation;
 
 namespace Toolkit.Foundation.Avalonia
 {

Framework/Avalonia/Extensions/IServiceCollectionExtensions.cs

@@ -2,6 +2,7 @@
 using FluentAvalonia.UI.Controls;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Toolkit.Framework.Foundation;
 
 namespace Toolkit.Foundation.Avalonia
 { 

Framework/Avalonia/Markups/CompositeExtension.cs

@@ -1,9 +1,9 @@
 using Avalonia.Markup.Xaml;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class CompositeExtension : TriggerExtension
 {
-    public class CompositeExtension : TriggerExtension
-    {
     [ConstructorArgument(nameof(Triggers))]
     public TriggerCollection Triggers { get; } = new TriggerCollection();
 
@@ -317,5 +317,4 @@ namespace Toolkit.Foundation.Avalonia
 
         base.OnInvoked(sender, args);
     }
-    }
 }

Framework/Avalonia/Markups/EventParameterExtension.cs

@@ -1,10 +1,10 @@
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class EventParameterExtension : MarkupExtension, IEventParameter
 {
-    public class EventParameterExtension : MarkupExtension, IEventParameter
-    {
     private readonly IValueConverter? converter;
 
     private readonly object? converterParameter;
@@ -14,7 +14,6 @@ namespace Toolkit.Foundation.Avalonia
 
     public EventParameterExtension()
     {
-
     }
 
     public EventParameterExtension(string key, string path)
@@ -61,5 +60,4 @@ namespace Toolkit.Foundation.Avalonia
     {
         return this;
     }
-    }
 }

Framework/Avalonia/Markups/InvokeExtension.cs

@@ -5,10 +5,10 @@ using Avalonia.Markup.Xaml;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class InvokeExtension : TriggerExtension
 {
-    public class InvokeExtension : TriggerExtension
-    {
     private static readonly AvaloniaProperty TargetProperty =
         AvaloniaProperty.RegisterAttached<InvokeExtension, Control, object>("Target");
 
@@ -420,5 +420,4 @@ namespace Toolkit.Foundation.Avalonia
         invoker = default;
         return false;
     }
-    }
 }

Framework/Avalonia/Markups/NavigateExtension.cs

@@ -3,11 +3,12 @@ using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Xaml;
 using Mediator;
+using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class NavigateExtension : TriggerExtension
 {
-    public class NavigateExtension : TriggerExtension
-    {
     private static readonly AttachedProperty<IMediator> MediatorProperty =
         AvaloniaProperty.RegisterAttached<NavigateExtension, Control, IMediator>("Mediator");
 
@@ -481,5 +482,4 @@ namespace Toolkit.Foundation.Avalonia
             }
         }
     }
-    }
 }

Framework/Avalonia/Markups/NavigationRouteExtension.cs

@@ -5,11 +5,12 @@ using Avalonia.Data;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Mediator;
+using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class NavigationRouteExtension : MarkupExtension
 {
-    public class NavigationRouteExtension : MarkupExtension
-    {
     private static readonly AttachedProperty<IMediator> MediatorProperty =
         AvaloniaProperty.RegisterAttached<NavigationRouteExtension, Control, IMediator>("Mediator");
 
@@ -91,5 +92,4 @@ namespace Toolkit.Foundation.Avalonia
 
         return null;
     }
-    }
 }

Framework/Avalonia/Markups/ParameterBindingExtension.cs

@@ -1,12 +1,13 @@
-using Avalonia.Controls;
+using Avalonia;
-using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Xaml;
+using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class ParameterBindingExtension : MarkupExtension, IParameter
 {
-    public class ParameterBindingExtension : MarkupExtension, IParameter
-    {
     private static readonly AttachedProperty<object> ValueProperty =
         AvaloniaProperty.RegisterAttached<ParameterBindingExtension, Control, object>("Value");
 
@@ -38,5 +39,4 @@ namespace Toolkit.Foundation.Avalonia
     {
         return this;
     }
-    }
 }

Framework/Avalonia/Markups/TriggerCollection.cs

@@ -1,9 +1,9 @@
 using System.Collections.ObjectModel;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class TriggerCollection : Collection<Delegate>
 {
-    public class TriggerCollection : Collection<Delegate>
-    {
     public void Add(object item)
     {
         if (item is Delegate trigger)
@@ -11,5 +11,4 @@ namespace Toolkit.Foundation.Avalonia
             base.Add(trigger);
         }
     }
-    }
 }

Framework/Avalonia/Markups/TriggerExtension.cs

@@ -1,12 +1,11 @@
 using Avalonia;
 using Avalonia.Markup.Xaml;
-using System;
 using System.Reflection;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class TriggerExtension : MarkupExtension
 {
-    public class TriggerExtension : MarkupExtension
-    {
     public AvaloniaObject? TargetObject { get; protected set; }
 
     protected object? TargetInvoke { get; private set; }
@@ -65,12 +64,9 @@ namespace Toolkit.Foundation.Avalonia
 
     protected virtual void OnAttached(IServiceProvider serviceProvider)
     {
-
     }
 
     protected virtual void OnInvoked(object sender, EventArgs args)
     {
-
-        }
     }
 }

Framework/Avalonia/Navigation/ContentControlNavigation.cs

@@ -1,14 +1,13 @@
 using Avalonia.Controls;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public record ContentControlNavigation : Navigation<ContentControl>
 {
-    public record ContentControlNavigation : Navigation<ContentControl>
-    {
     public ContentControlNavigation(ContentControl route,
         object? content,
         object? template,
         IDictionary<string, object>? parameters) : base(route, content, template, parameters)
     {
     }
-    }
 }

Framework/Avalonia/Navigation/ContentControlNavigationHandler.cs

@@ -1,10 +1,10 @@
 using Avalonia.Controls.Primitives;
 using Mediator;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class ContentControlNavigationHandler : IRequestHandler<ContentControlNavigation, bool>
 {
-    public class ContentControlNavigationHandler : IRequestHandler<ContentControlNavigation, bool>
-    {
     public async ValueTask<bool> Handle(ContentControlNavigation request, CancellationToken cancellationToken)
     {
         if (request.Template is TemplatedControl control)
@@ -15,5 +15,4 @@ namespace Toolkit.Foundation.Avalonia
 
         return await Task.FromResult(true);
     }
-    }
 }

Framework/Avalonia/Navigation/ContentDialogNavigation.cs

@@ -1,15 +1,13 @@
 using FluentAvalonia.UI.Controls;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public record ContentDialogNavigation : Navigation<ContentDialog>
 {
-    public record ContentDialogNavigation : Navigation<ContentDialog>
-    {
     public ContentDialogNavigation(ContentDialog route,
         object? content,
         object? template,
         IDictionary<string, object>? parameters) : base(route, content, template, parameters)
     {
-
-        }
     }
 }

Framework/Avalonia/Navigation/ContentDialogNavigationHandler.cs

@@ -1,10 +1,10 @@
 using FluentAvalonia.UI.Controls;
 using Mediator;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class ContentDialogNavigationHandler : IRequestHandler<ContentDialogNavigation, bool>
 {
-    public class ContentDialogNavigationHandler : IRequestHandler<ContentDialogNavigation, bool>
-    {
     public async ValueTask<bool> Handle(ContentDialogNavigation request, CancellationToken cancellationToken)
     {
         if (request.Template is ContentDialog contentDialog)
@@ -40,5 +40,4 @@ namespace Toolkit.Foundation.Avalonia
 
         return await Task.FromResult(true);
     }
-    }
 }

Framework/Avalonia/Navigation/FrameNavigation.cs

@@ -1,9 +1,9 @@
 using FluentAvalonia.UI.Controls;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public record FrameNavigation : Navigation<Frame>
 {
-    public record FrameNavigation : Navigation<Frame>
-    {
     public FrameNavigation(Frame route,
         object? content,
         object? template,
@@ -11,5 +11,4 @@ namespace Toolkit.Foundation.Avalonia
         parameters) : base(route, content, template, parameters)
     {
     }
-    }
 }

Framework/Avalonia/Navigation/FrameNavigationHandler.cs

@@ -2,10 +2,10 @@
 using FluentAvalonia.UI.Navigation;
 using Mediator;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class FrameNavigationHandler : IRequestHandler<FrameNavigation, bool>
 {
-    public class FrameNavigationHandler : IRequestHandler<FrameNavigation, bool>
-    {
     public async ValueTask<bool> Handle(FrameNavigation request, CancellationToken cancellationToken)
     {
         request.Route.NavigationPageFactory = new NavigationPageFactory();
@@ -29,5 +29,4 @@ namespace Toolkit.Foundation.Avalonia
 
         return await completionSource.Task;
     }
-    }
 }

Framework/Avalonia/Navigation/NavigateBackHandler.cs

@@ -2,11 +2,12 @@
 using Avalonia.Controls.Primitives;
 using FluentAvalonia.UI.Controls;
 using Mediator;
+using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class NavigateBackHandler : IRequestHandler<NavigateBack>
 {
-    public class NavigateBackHandler : IRequestHandler<NavigateBack>
-    {
     private readonly INavigationRouteDescriptorCollection descriptors;
 
     public NavigateBackHandler(INavigationRouteDescriptorCollection descriptors)
@@ -34,5 +35,4 @@ namespace Toolkit.Foundation.Avalonia
 
         return default;
     }
-    }
 }

Framework/Avalonia/Navigation/NavigateHandler.cs

@@ -1,11 +1,12 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Mediator;
+using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class NavigateHandler : IRequestHandler<Navigate>
 {
-    public class NavigateHandler : IRequestHandler<Navigate>
-    {
     private readonly INavigationRouteDescriptorCollection descriptors;
     private readonly IMediator mediator;
     private readonly INamedDataTemplateFactory namedDataTemplateFactory;
@@ -112,5 +113,4 @@ namespace Toolkit.Foundation.Avalonia
 
         return default;
     }
-    }
 }

Framework/Avalonia/Navigation/Navigation.cs

@@ -1,10 +1,10 @@
 using Avalonia.Controls.Primitives;
 using Mediator;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public record Navigation<TRoute> : IRequest<bool> where TRoute : TemplatedControl
 {
-    public record Navigation<TRoute> : IRequest<bool> where TRoute : TemplatedControl
-    {
     public TRoute Route { get; }
 
     public Navigation(TRoute route,
@@ -23,5 +23,4 @@ namespace Toolkit.Foundation.Avalonia
     public object? Template { get; }
 
     public IDictionary<string, object>? Parameters { get; }
-    }
 }

Framework/Avalonia/Navigation/NavigationPageFactory.cs

@@ -1,10 +1,10 @@
 using FluentAvalonia.UI.Controls;
 using Avalonia.Controls;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+internal class NavigationPageFactory : INavigationPageFactory
 {
-    internal class NavigationPageFactory : INavigationPageFactory
-    {
     public IControl? GetPage(Type srcType)
     {
         return default;
@@ -14,5 +14,4 @@ namespace Toolkit.Foundation.Avalonia
     {
         return (IControl)target;
     }
-    }
 }

Framework/Avalonia/Navigation/NavigationRouteHandler.cs

@@ -1,11 +1,12 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Mediator;
+using Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation.Avalonia
+namespace Toolkit.Foundation.Avalonia;
+
+public class NavigationRouteHandler : IRequestHandler<NavigationRoute>
 {
-    public class NavigationRouteHandler : IRequestHandler<NavigationRoute>
-    {
     private readonly INavigationRouteDescriptorCollection descriptors;
 
     public NavigationRouteHandler(INavigationRouteDescriptorCollection descriptors)
@@ -35,5 +36,4 @@ namespace Toolkit.Foundation.Avalonia
         descriptors.Add(new NavigationRouteDescriptor(request.Name, request.Route));
         return default;
     }
-    }
 }

Framework/Avalonia/Templates/TemplateSelector.cs

@@ -1,5 +1,6 @@
-using Avalonia.Controls.Templates;
+using Avalonia.Controls;
-using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Toolkit.Framework.Foundation;
 
 namespace Toolkit.Foundation.Avalonia
 {

Framework/Foundation/Configurations/ConfigurationChanged.cs

@@ -1,3 +1,3 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public record ConfigurationChanged<TConfiguration>(TConfiguration Configuration) where TConfiguration : class;

Framework/Foundation/Configurations/ConfigurationInitializer.cs

@@ -1,6 +1,6 @@
 using Mediator;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class ConfigurationInitializer<TConfiguration> : IInitializable where TConfiguration : class, new()
 {

Framework/Foundation/Configurations/ConfigurationWriter.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class ConfigurationWriter<TConfiguration> : IConfigurationWriter<TConfiguration> where TConfiguration : class, new()
 {

Framework/Foundation/Configurations/IConfigurationWriter.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface IConfigurationWriter<TConfiguration> where TConfiguration : class
 {

Framework/Foundation/Configurations/IWritableConfigurationProvider.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface IWritableConfigurationProvider
 {

Framework/Foundation/Configurations/IWritableJsonConfigurationBuilder.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface IWritableJsonConfigurationBuilder
 {

Framework/Foundation/Configurations/IWritableJsonConfigurationDescriptor.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface IWritableJsonConfigurationDescriptor
 {

Framework/Foundation/Configurations/WritableJsonConfigurationBuilder.cs

@@ -1,16 +1,13 @@
 using Json.Patch;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class WritableJsonConfigurationBuilder : IWritableJsonConfigurationBuilder
 {

Framework/Foundation/Configurations/WritableJsonConfigurationDescriptor.cs

@@ -1,3 +1,3 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public record WritableJsonConfigurationDescriptor(Type ConfigurationType, string Key) : IWritableJsonConfigurationDescriptor;

Framework/Foundation/Configurations/WritableJsonConfigurationExtensions.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public static class WritableJsonConfigurationExtensions
 {

Framework/Foundation/Configurations/WritableJsonConfigurationFile.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Text.Json;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 internal class WritableJsonConfigurationFile
 {

Framework/Foundation/Configurations/WritableJsonConfigurationProvider.cs

@@ -3,13 +3,12 @@ using Microsoft.Extensions.FileProviders;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class WritableJsonConfigurationProvider : JsonConfigurationProvider, IWritableConfigurationProvider
 {
     public WritableJsonConfigurationProvider(JsonConfigurationSource source) : base(source)
     {
-
     }
 
     public void Write<TValue>(string section, TValue value) where TValue : class, new()

Framework/Foundation/Configurations/WritableJsonConfigurationSource.cs

@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Configuration.Json;
+using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
 using Microsoft.Extensions.FileProviders;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class WritableJsonConfigurationSource : JsonConfigurationSource
 {

Framework/Foundation/Configurations/Write.cs

@@ -1,5 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public abstract record Write<TConfiguration>(string Section, Action<TConfiguration> UpdateDelegate) : IRequest where TConfiguration : class;

Framework/Foundation/Configurations/WriteHandler.cs

@@ -1,6 +1,6 @@
 using Mediator;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class WriteHandler<TConfiguration> : IRequestHandler<Write<TConfiguration>> where TConfiguration : class
 {

Framework/Foundation/Extensions/IHostBuilderExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Hosting;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public static class IHostBuilderExtensions
 {

Framework/Foundation/Extensions/IServiceCollectionExtensions.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public static class IServiceCollectionExtensions
 {
@@ -11,7 +11,6 @@ public static class IServiceCollectionExtensions
         return serviceCollection;
     }
 
-
     public static IServiceCollection AddFoundation(this IServiceCollection serviceCollection)
     {
         serviceCollection.AddSingleton<IServiceFactory>(provider => new ServiceFactory(provider.GetService, (instanceType, parameters) => ActivatorUtilities.CreateInstance(provider, instanceType, parameters!)))

Framework/Foundation/Extensions/IServiceFactoryExtensions.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public static class IServiceFactoryExtensions
 {

Framework/Foundation/Lifecycles/AppService.cs

@@ -1,7 +1,7 @@
 using Mediator;
 using Microsoft.Extensions.Hosting;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class AppService : IHostedService
 {

Framework/Foundation/Lifecycles/ICache.cs

@@ -1,6 +1,5 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface ICache
 {
-
 }

Framework/Foundation/Lifecycles/IInitializable.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface IInitializable
 {

Framework/Foundation/Lifecycles/IInitialization.cs

@@ -1,4 +1,4 @@
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public interface IInitialization
 {

Framework/Foundation/Lifecycles/Initialization.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class Initialization : IInitialization
 {

Framework/Foundation/Lifecycles/Initialize.cs

@@ -1,5 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public record Initialize : IRequest;

Framework/Foundation/Lifecycles/InitializeHandler.cs

@@ -1,6 +1,6 @@
 using Mediator;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public class InitializeHandler : IRequestHandler<Initialize>
 {

Framework/Foundation/Lifecycles/Initialized.cs

@@ -1,5 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation;
+namespace Toolkit.Framework.Foundation;
 
 public record class Initialized : IRequest;

Framework/Foundation/Navigation/IEventParameter.cs

@@ -1,10 +1,6 @@
-using System;
+namespace Toolkit.Foundation;
-using System.Collections.Generic;
 
-namespace Toolkit.Foundation
+public interface IEventParameter
 {
-    public interface IEventParameter
-    {
     List<object> GetValues(EventArgs args);
-    }
 }

Framework/Foundation/Navigation/INavigationConfirmation.cs

@@ -1,13 +1,11 @@
-
+namespace Toolkit.Foundation;
-namespace Toolkit.Foundation
-{
-    public interface INavigationConfirmation
-    {
-        ValueTask<bool> CanConfirm();
-    }
 
-    public interface INavigated
+public interface INavigationConfirmation
-    {
+{
-        ValueTask Navigated();
+    ValueTask<bool> CanConfirm();
-    }
+}
+
+public interface INavigated
+{
+    ValueTask Navigated();
 }

Framework/Foundation/Navigation/INavigationRouteDescriptor.cs

@@ -1,9 +1,8 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface INavigationRouteDescriptor
 {
-    public interface INavigationRouteDescriptor
-    {
     object Route { get; }
 
     string? Name { get; }
-    }
 }

Framework/Foundation/Navigation/INavigationRouteDescriptorCollection.cs

@@ -1,8 +1,5 @@
-using System.Collections.Generic;
+namespace Toolkit.Framework.Foundation;
 
-namespace Toolkit.Foundation
+public interface INavigationRouteDescriptorCollection : IList<INavigationRouteDescriptor>
 {
-    public interface INavigationRouteDescriptorCollection : IList<INavigationRouteDescriptor>
-    {
-    }
 }

Framework/Foundation/Navigation/IParameter.cs

@@ -1,9 +1,8 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface IParameter
 {
-    public interface IParameter
-    {
     string? Key { get; }
 
     KeyValuePair<string, object>? GetValue(object target);
-    }
 }

Framework/Foundation/Navigation/Navigate.cs

@@ -1,9 +1,9 @@
 using Mediator;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public record Navigate : IRequest
 {
-    public record Navigate : IRequest
-    {
     public Navigate(string name, params object?[] parameters)
     {
         Name = name;
@@ -25,5 +25,4 @@ namespace Toolkit.Foundation
     public string? FriendlyName { get; init; }
 
     public object?[] Parameters { get; }
-    }
 }

Framework/Foundation/Navigation/NavigateBack.cs

@@ -1,7 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
-{
-    public record NavigateBack(object Route) : IRequest;
 
-}
+public record NavigateBack(object Route) : IRequest;

Framework/Foundation/Navigation/NavigationRoute.cs

@@ -1,6 +1,5 @@
 using Mediator;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
-{
+
-    public record NavigationRoute(string Name, object Route) : IRequest;
+public record NavigationRoute(string Name, object Route) : IRequest;
-}

Framework/Foundation/Navigation/NavigationRouteDescriptor.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public record NavigationRouteDescriptor : INavigationRouteDescriptor
 {
-    public record NavigationRouteDescriptor : INavigationRouteDescriptor
-    {
     public NavigationRouteDescriptor(string name, object route)
     {
         Name = name;
@@ -11,5 +11,4 @@
     public string Name { get; }
 
     public object Route { get; }
-    }
 }

Framework/Foundation/Navigation/NavigationRouteDescriptorCollection.cs

@@ -1,9 +1,8 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class NavigationRouteDescriptorCollection : List<INavigationRouteDescriptor>, INavigationRouteDescriptorCollection
 {
-    public class NavigationRouteDescriptorCollection : List<INavigationRouteDescriptor>, INavigationRouteDescriptorCollection
-    {
     public NavigationRouteDescriptorCollection(IEnumerable<INavigationRouteDescriptor> collection) : base(collection)
     {
     }
-    }
 }

Framework/Foundation/Services/IServiceCreator.cs

@@ -1,7 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface IServiceCreator<T>
 {
-    public interface IServiceCreator<T>
-    {
     object Create(Func<Type, object[], object> creator, params object[] parameters);
-    }
 }

Framework/Foundation/Services/IServiceFactory.cs

@@ -1,9 +1,8 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface IServiceFactory
 {
-    public interface IServiceFactory
-    {
     object? Create(Type type, params object?[] parameters);
 
     T? Create<T>(Type type, params object?[] parameters);
-    }
 }

Framework/Foundation/Services/ServiceCreator.cs

@@ -1,10 +1,9 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class ServiceCreator<I, T> : IServiceCreator<I>
 {
-    public class ServiceCreator<I, T> : IServiceCreator<I>
-    {
     public virtual object Create(Func<Type, object[], object> creator, params object[] parameters)
     {
         return creator(typeof(T), parameters);
     }
-    }
 }

Framework/Foundation/Services/ServiceFactory.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class ServiceFactory : IServiceFactory
 {
-    public class ServiceFactory : IServiceFactory
-    {
     private readonly Func<Type, object?> factory;
     private readonly Func<Type, object?[], object> creator;
 
@@ -22,5 +22,4 @@
         dynamic? lookup = factory(typeof(IServiceCreator<>).MakeGenericType(type));
         return lookup is not null ? (T)lookup.Create(creator, parameters) : (T)creator(type, parameters);
     }
-    }
 }

Framework/Foundation/Services/ServiceFactoryDescriptor.cs

@@ -1,9 +1,9 @@
 using System.Reflection;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+internal class ServiceFactoryDescriptor
 {
-    internal class ServiceFactoryDescriptor
-    {
     private readonly IServiceFactory serviceFactory;
 
     public ServiceFactoryDescriptor(IServiceFactory serviceFactory)
@@ -17,9 +17,8 @@ namespace Toolkit.Foundation
         return methodInfo?.MakeGenericMethod(type).Invoke(this, new object[] { type });
     }
 
-        private T Create<T>(Type type)
+    private T? Create<T>(Type type)
     {
         return serviceFactory.Create<T>(type);
     }
-    }
 }

Framework/Foundation/Templates/INamedDataTemplateFactory.cs

@@ -1,7 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface INamedDataTemplateFactory
 {
-    public interface INamedDataTemplateFactory
-    {
     object? Create(string name, params object[] parameters);
-    }
 }

Framework/Foundation/Templates/INamedTemplateFactory.cs

@@ -1,7 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface INamedTemplateFactory
 {
-    public interface INamedTemplateFactory
-    {
     object? Create(string name);
-    }
 }

Framework/Foundation/Templates/ITemplateBuilder.cs

@@ -1,13 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface ITemplateBuilder
 {
-    public interface ITemplateBuilder
-    {
     IReadOnlyCollection<ITemplateDescriptor> Descriptors { get; }
 
     ITemplateBuilder Add<TViewModel, TView>(string name, ServiceLifetime lifetime = ServiceLifetime.Transient);
 
     ITemplateBuilder Add<TViewModel, TView>(ServiceLifetime lifetime = ServiceLifetime.Transient);
-    }
 }

Framework/Foundation/Templates/ITemplateDescriptor.cs

@@ -1,9 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface ITemplateDescriptor
 {
-    public interface ITemplateDescriptor
-    {
     Type ContentType { get; }
 
     ServiceLifetime Lifetime { get; }
@@ -11,5 +11,4 @@ namespace Toolkit.Foundation
     string? Name { get; }
 
     Type TemplateType { get; }
-    }
 }

Framework/Foundation/Templates/ITemplateDescriptorProvider.cs

@@ -1,12 +1,10 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
-{
 
-    public interface ITemplateDescriptorProvider
+public interface ITemplateDescriptorProvider
-    {
+{
     ITemplateDescriptor? Get(string name);
 
     ITemplateDescriptor? Get(Type type);
 
     ITemplateDescriptor? Get<T>();
-    }
 }

Framework/Foundation/Templates/ITemplateFactory.cs

@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface ITemplateFactory
 {
-    public interface ITemplateFactory
-    {
     object? Create([MaybeNull] object? data);
-    }
 }

Framework/Foundation/Templates/ITemplateSelector.cs

@@ -1,6 +1,5 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface ITemplateSelector
 {
-    public interface ITemplateSelector
-    {
-    }
 }

Framework/Foundation/Templates/ITypedDataTemplateFactory.cs

@@ -1,7 +1,6 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public interface ITypedDataTemplateFactory
 {
-    public interface ITypedDataTemplateFactory
-    {
     object? Create(Type type, params object[] parameters);
-    }
 }

Framework/Foundation/Templates/NamedDataTemplateFactory.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class NamedDataTemplateFactory : INamedDataTemplateFactory
 {
-    public class NamedDataTemplateFactory : INamedDataTemplateFactory
-    {
     private readonly Dictionary<string, object> cache = new();
 
     private readonly IReadOnlyCollection<ITemplateDescriptor> descriptors;
@@ -32,5 +32,4 @@
 
         return data;
     }
-    }
 }

Framework/Foundation/Templates/NamedTemplateFactory.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class NamedTemplateFactory : INamedTemplateFactory
 {
-    public class NamedTemplateFactory : INamedTemplateFactory
-    {
     private readonly Dictionary<string, object> cache = new();
 
     private readonly ITemplateDescriptorProvider provider;
@@ -37,5 +37,4 @@
 
         return view;
     }
-    }
 }

Framework/Foundation/Templates/TemplateBuilder.cs

@@ -1,10 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Collections.ObjectModel;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class TemplateBuilder : ITemplateBuilder
 {
-    public class TemplateBuilder : ITemplateBuilder
-    {
     private readonly List<ITemplateDescriptor> descriptors = new();
 
     public IReadOnlyCollection<ITemplateDescriptor> Descriptors => new ReadOnlyCollection<ITemplateDescriptor>(descriptors);
@@ -20,5 +20,4 @@ namespace Toolkit.Foundation
         descriptors.Add(new TemplateDescriptor(typeof(TViewModel), typeof(TView), null, lifetime));
         return this;
     }
-    }
 }

Framework/Foundation/Templates/TemplateDescriptor.cs

@@ -1,9 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class TemplateDescriptor : ITemplateDescriptor
 {
-    public class TemplateDescriptor : ITemplateDescriptor
-    {
     public TemplateDescriptor(Type dataType,
         Type templateType,
         string? name = null,
@@ -22,5 +22,4 @@ namespace Toolkit.Foundation
     public Type ContentType { get; }
 
     public string? Name { get; }
-    }
 }

Framework/Foundation/Templates/TemplateDescriptorProvider.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class TemplateDescriptorProvider : ITemplateDescriptorProvider
 {
-    public class TemplateDescriptorProvider : ITemplateDescriptorProvider
-    {
     private readonly IReadOnlyCollection<ITemplateDescriptor> descriptors;
 
     public TemplateDescriptorProvider(IReadOnlyCollection<ITemplateDescriptor> descriptors)
@@ -38,5 +38,4 @@
 
         return null;
     }
-    }
 }

Framework/Foundation/Templates/TemplateFactory.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class TemplateFactory : ITemplateFactory
 {
-    public class TemplateFactory : ITemplateFactory
-    {
     private readonly Dictionary<object, object> cache = new();
 
     private readonly ITemplateDescriptorProvider provider;
@@ -39,5 +39,4 @@ namespace Toolkit.Foundation
 
         return template;
     }
-    }
 }

Framework/Foundation/Templates/TypedDataTemplateFactory.cs

@@ -1,7 +1,7 @@
-namespace Toolkit.Foundation
+namespace Toolkit.Framework.Foundation;
+
+public class TypedDataTemplateFactory : ITypedDataTemplateFactory
 {
-    public class TypedDataTemplateFactory : ITypedDataTemplateFactory
-    {
     private readonly Dictionary<Type, object> cache = new();
 
     private readonly IReadOnlyCollection<ITemplateDescriptor> descriptors;
@@ -32,5 +32,4 @@
 
         return data;
     }
-    }
 }