Update version from 11.3.4 to 11.3.0 (#21)

* Update version from 11.3.4 to 11.3.7

* Refactor DI integration to use external Splat packages

Replaces internal Autofac, DryIoc, and Microsoft.Extensions.DependencyInjection dependency resolver implementations with the corresponding Splat.* packages. Updates AppBuilder extension methods to use new Splat APIs and removes obsolete code. Centralizes package version management and updates test projects and usages to reflect the new DI integration approach.

* Rename Splat.Avalonia.* to ReactiveUI.Avalonia.* and extend DI mixins

Renamed all Splat.Avalonia.* projects, files, and namespaces to ReactiveUI.Avalonia.* equivalents. Enhanced DI mixins for Autofac, DryIoc, Ninject, and Microsoft.Extensions.DependencyInjection to support additional configuration and builder hooks. Updated solution and test project references to match new naming. Adjusted InternalsVisibleTo attributes for new test project names.

* Update ReactiveUI.Avalonia.Tests.csproj

* Add tests for Autofac and Ninject Avalonia mixins

Introduces unit tests for Autofac and Ninject integration with Avalonia's ReactiveUI mixins, including null argument checks and builder return validation. Updates the test project to reference Autofac and Ninject projects with appropriate aliases.

* Refactor DI container mixins and update README setup docs

Refactored DI container extension methods for Autofac, DryIoc, Microsoft.Extensions.DependencyInjection, and Ninject to use consistent namespaces and signatures. Updated the README with improved setup instructions, usage examples, and API documentation for all supported DI containers. Adjusted related tests to match new namespaces and method signatures.

* Add tests for DI container and view registration APIs

Introduces new test classes covering AppBuilder extension methods for DI container integration (DryIoc, Microsoft.Extensions.DependencyInjection, and generic containers) and ReactiveUI view registration. These tests verify correct builder return values, null handling, and registration logic for the relevant extension methods.

* Update version from 11.3.0 to 11.3

Author: ChrisPulman

README.md

@@ -2,39 +2,37 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <AvaloniaVersion>11.3.0</AvaloniaVersion>
+    <AvaloniaLatestVersion>11.3.*</AvaloniaLatestVersion>
+    <SplatVersion>17.1.1</SplatVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
     <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
-    <PackageVersion Include="Autofac" Version="8.4.0" />
-    <PackageVersion Include="Avalonia" Version="11.3.7" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.7" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.7" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.7" />
-    <PackageVersion Include="DryIoc.Dll" Version="5.4.3" />
-    <PackageVersion Include="DynamicData" Version="9.4.1" />
+    <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.8.118" />
-    <PackageVersion Include="Ninject" Version="3.3.6" />
     <PackageVersion Include="ReactiveUI" Version="22.0.1" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.14.0" />
-    <PackageVersion Include="Splat" Version="17.1.1" />
-    <PackageVersion Include="Splat.Autofac" Version="17.1.1" />
-    <PackageVersion Include="Splat.Drawing" Version="17.1.1" />
-    <PackageVersion Include="Splat.DryIoc" Version="17.1.1" />
-    <PackageVersion Include="Splat.Ninject" Version="17.1.1" />
+    <PackageVersion Include="Splat" Version="$(SplatVersion)" />
+    <PackageVersion Include="Splat.Autofac" Version="$(SplatVersion)" />
+    <PackageVersion Include="Splat.Drawing" Version="$(SplatVersion)" />
+    <PackageVersion Include="Splat.DryIoc" Version="$(SplatVersion)" />
+    <PackageVersion Include="Splat.Microsoft.Extensions.DependencyInjection" Version="$(SplatVersion)" />
+    <PackageVersion Include="Splat.Ninject" Version="$(SplatVersion)" />
     <PackageVersion Include="stylecop.analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Collections.Immutable" Version="9.0.9" />
     <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.9" />
     <PackageVersion Include="NUnit" Version="4.4.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.10.0" />

src/Directory.Packages.props

@@ -0,0 +1,106 @@
+// Copyright (c) 2025 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using Autofac;
+using ReactiveUI.Builder;
+using Splat;
+using Splat.Autofac;
+using Splat.Builder;
+using AppBuilder = Avalonia.AppBuilder;
+
+namespace ReactiveUI.Avalonia.Splat;
+
+/// <summary>
+/// Avalonia Mixins.
+/// </summary>
+public static class AvaloniaMixins
+{
+    /// <summary>
+    /// Uses the splat with dry ioc.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="containerConfig">The configure.</param>
+    /// <param name="withResolver">The get resolver.</param>
+    /// <returns>
+    /// An App Builder.
+    /// </returns>
+    /// <exception cref="System.ArgumentNullException">builder.</exception>
+    public static AppBuilder UseReactiveUIWithAutofac(this AppBuilder builder, Action<ContainerBuilder> containerConfig, Action<AutofacDependencyResolver>? withResolver = null) =>
+        builder switch
+        {
+            null => throw new ArgumentNullException(nameof(builder)),
+            _ => builder.UseReactiveUI().AfterPlatformServicesSetup(_ =>
+            {
+                if (AppLocator.CurrentMutable is null)
+                {
+                    return;
+                }
+#if NETSTANDARD
+                if (containerConfig is null)
+                {
+                    throw new ArgumentNullException(nameof(containerConfig));
+                }
+#else
+                ArgumentNullException.ThrowIfNull(containerConfig);
+#endif
+                var containerBuilder = new ContainerBuilder();
+                var autofacResolver = containerBuilder.UseAutofacDependencyResolver();
+                containerBuilder.RegisterInstance(autofacResolver);
+                autofacResolver.InitializeReactiveUI(RegistrationNamespace.Avalonia);
+                RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
+                containerConfig(containerBuilder);
+                var container = containerBuilder.Build();
+                autofacResolver.SetLifetimeScope(container);
+
+                if (withResolver is not null)
+                {
+                    withResolver(autofacResolver);
+                }
+            })
+        };
+
+    /// <summary>
+    /// Uses the reactive UI with autofac.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="containerConfig">The container configuration.</param>
+    /// <param name="withResolver">The with resolver.</param>
+    /// <param name="withReactiveUIBuilder">The with reactive UI builder.</param>
+    /// <returns>
+    /// An App Builder.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">builder.</exception>
+    public static AppBuilder UseReactiveUIWithAutofac(this AppBuilder builder, Action<ContainerBuilder> containerConfig, Action<AutofacDependencyResolver>? withResolver = null, Action<ReactiveUIBuilder>? withReactiveUIBuilder = null)
+    {
+        if (builder is null)
+        {
+            throw new ArgumentNullException(nameof(builder));
+        }
+
+        if (containerConfig is null)
+        {
+            throw new ArgumentNullException(nameof(containerConfig));
+        }
+
+        return builder.UseReactiveUI(rxuiBuilder =>
+        {
+            var containerBuilder = new ContainerBuilder();
+            rxuiBuilder.UsingSplatModule(new AutofacSplatModule(containerBuilder));
+            containerConfig(containerBuilder);
+            var container = containerBuilder.Build();
+            var autofacResolver = container.Resolve<AutofacDependencyResolver>();
+            autofacResolver.SetLifetimeScope(container);
+            if (withResolver is not null)
+            {
+                withResolver(autofacResolver);
+            }
+
+            if (withReactiveUIBuilder is not null)
+            {
+                withReactiveUIBuilder(rxuiBuilder);
+            }
+        });
+    }
+}

src/ReactiveUI.Avalonia.Autofac/AvaloniaMixins.cs

@@ -8,8 +8,7 @@
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;avalonia;net;netcore</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Autofac" />
-    <PackageReference Include="System.Text.Json" />    
+    <PackageReference Include="Splat.Autofac" />  
     <ProjectReference Include="..\ReactiveUI.Avalonia\ReactiveUI.Avalonia.csproj" />
   </ItemGroup>
 </Project>

…ia.Autofac/Splat.Avalonia.Autofac.csproj …tofac/ReactiveUI.Avalonia.Autofac.csprojsrc/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj renamed to src/ReactiveUI.Avalonia.Autofac/ReactiveUI.Avalonia.Autofac.csproj src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj renamed to src/ReactiveUI.Avalonia.Autofac/ReactiveUI.Avalonia.Autofac.csproj

@@ -0,0 +1,88 @@
+// Copyright (c) 2025 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using DryIoc;
+using ReactiveUI.Builder;
+using Splat;
+using Splat.Builder;
+using Splat.DryIoc;
+using AppBuilder = Avalonia.AppBuilder;
+
+namespace ReactiveUI.Avalonia.Splat;
+
+/// <summary>
+/// Avalonia Mixins.
+/// </summary>
+public static class AvaloniaMixins
+{
+    /// <summary>
+    /// Uses the splat with dry ioc.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="containerConfig">The configure.</param>
+    /// <returns>An App Builder.</returns>
+    public static AppBuilder UseReactiveUIWithDryIoc(this AppBuilder builder, Action<Container> containerConfig) =>
+        builder switch
+        {
+            null => throw new ArgumentNullException(nameof(builder)),
+            _ => builder.UseReactiveUI().AfterPlatformServicesSetup(_ =>
+            {
+                if (AppLocator.CurrentMutable is null)
+                {
+                    return;
+                }
+
+#if NETSTANDARD
+                if (containerConfig is null)
+                {
+                    throw new ArgumentNullException(nameof(containerConfig));
+                }
+#else
+                ArgumentNullException.ThrowIfNull(containerConfig);
+#endif
+
+                var container = new Container();
+                container.UseDryIocDependencyResolver();
+                AppLocator.CurrentMutable.RegisterConstant(container);
+                RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
+                containerConfig(container);
+            })
+        };
+
+    /// <summary>
+    /// Uses the reactive UI with dry ioc.
+    /// </summary>
+    /// <param name="builder">The builder.</param>
+    /// <param name="containerConfig">The container configuration.</param>
+    /// <param name="withReactiveUIBuilder">The with reactive UI builder.</param>
+    /// <returns>An App Builder.</returns>
+    /// <exception cref="ArgumentNullException">builder.</exception>
+    public static AppBuilder UseReactiveUIWithDryIoc(this AppBuilder builder, Action<Container> containerConfig, Action<ReactiveUIBuilder>? withReactiveUIBuilder = null) =>
+        builder switch
+        {
+            null => throw new ArgumentNullException(nameof(builder)),
+            _ => builder.UseReactiveUI(rxuiBuilder =>
+            {
+#if NETSTANDARD
+                if (containerConfig is null)
+                {
+                    throw new ArgumentNullException(nameof(containerConfig));
+                }
+#else
+                ArgumentNullException.ThrowIfNull(containerConfig);
+#endif
+
+                var container = new Container();
+                rxuiBuilder.UsingSplatModule(new DryIocSplatModule(container));
+                AppLocator.CurrentMutable.RegisterConstant(container);
+                containerConfig(container);
+
+                if (withReactiveUIBuilder is not null)
+                {
+                    withReactiveUIBuilder(rxuiBuilder);
+                }
+            })
+        };
+}

src/ReactiveUI.Avalonia.DryIoc/AvaloniaMixins.cs

@@ -8,8 +8,7 @@
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;avalonia;net;netcore</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.Dll" />
-    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="Splat.DryIoc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ReactiveUI.Avalonia\ReactiveUI.Avalonia.csproj" />

…onia.DryIoc/Splat.Avalonia.DryIoc.csproj …DryIoc/ReactiveUI.Avalonia.DryIoc.csprojsrc/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj renamed to src/ReactiveUI.Avalonia.DryIoc/ReactiveUI.Avalonia.DryIoc.csproj src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj renamed to src/ReactiveUI.Avalonia.DryIoc/ReactiveUI.Avalonia.DryIoc.csproj

@@ -0,0 +1,38 @@
+using Avalonia;
+using DryIoc;
+using NUnit.Framework;
+using ReactiveUI.Avalonia.Splat;
+using Splat.DryIoc;
+
+namespace ReactiveUI.Avalonia.DryIoc.Tests;
+
+public class AvaloniaMixinsDryIocMoreTests
+{
+    [Test]
+    public void UseReactiveUIWithDryIoc_WithBuilderOverload_Returns_Builder()
+    {
+        var builder = AppBuilder.Configure<Application>();
+        var result = AvaloniaMixins.UseReactiveUIWithDryIoc(
+            builder,
+            containerConfig: c =>
+            {
+                c.RegisterInstance(new object());
+            },
+            withReactiveUIBuilder: _ => { });
+
+        Assert.That(result, Is.SameAs(builder));
+    }
+
+    [Test]
+    public void UseReactiveUIWithDIContainer_Generic_Returns_Builder()
+    {
+        var builder = AppBuilder.Configure<Application>();
+        var result = AppBuilderExtensions.UseReactiveUIWithDIContainer(
+            builder,
+            containerFactory: () => new Container(),
+            containerConfig: _ => { },
+            dependencyResolverFactory: c => new DryIocDependencyResolver(c));
+
+        Assert.That(result, Is.SameAs(builder));
+    }
+}

src/ReactiveUI.Avalonia.DryIoc1.Tests/AvaloniaMixinsDryIocMoreTests.cs

@@ -0,0 +1,69 @@
+using Avalonia;
+using DryIoc;
+using NUnit.Framework;
+using ReactiveUI.Avalonia.Splat;
+using Splat.DryIoc;
+
+namespace ReactiveUI.Avalonia.DryIoc.Tests;
+
+public class AvaloniaMixinsDryIocTests
+{
+    [Test]
+    public void UseReactiveUIWithDryIoc_ThrowsOnNullBuilder()
+    {
+        AppBuilder? builder = null;
+        Assert.Throws<ArgumentNullException>(() =>
+            AvaloniaMixins.UseReactiveUIWithDryIoc(builder!, _ => { }));
+    }
+
+    [Test]
+    public void UseReactiveUIWithDryIoc_ReturnsBuilder_NoThrow()
+    {
+        var builder = AppBuilder.Configure<Application>();
+        var result = builder.UseReactiveUIWithDryIoc(_ => { });
+        Assert.That(result, Is.SameAs(builder));
+    }
+
+    [Test]
+    public void UseReactiveUIWithDIContainer_ThrowsOnNullBuilder()
+    {
+        AppBuilder? builder = null;
+        Assert.Throws<ArgumentNullException>(() =>
+            AppBuilderExtensions.UseReactiveUIWithDIContainer(
+                builder!,
+                () => new Container(),
+                _ => { },
+                c => new DryIocDependencyResolver(c)));
+    }
+
+    [Test]
+    public void UseReactiveUIWithDIContainer_ReturnsBuilder_NoThrow()
+    {
+        var builder = AppBuilder.Configure<Application>();
+        var container = new Container();
+
+        var result = builder.UseReactiveUIWithDIContainer(
+            containerFactory: () => container,
+            containerConfig: _ => { },
+            dependencyResolverFactory: c => new DryIocDependencyResolver(c));
+
+        Assert.That(result, Is.SameAs(builder));
+    }
+
+    [Test]
+    public void DryIocDependencyResolver_Register_And_Resolve_WithAndWithoutContract()
+    {
+        var container = new Container();
+        var resolver = new DryIocDependencyResolver(container);
+
+        resolver.Register(() => "a", typeof(string));
+        resolver.Register(() => "b", typeof(string), "x");
+
+        var last = resolver.GetService(typeof(string));
+        Assert.That(last, Is.EqualTo("b"));
+
+        var all = resolver.GetServices(typeof(string)).ToArray();
+        Assert.That(all, Does.Contain("a"));
+        Assert.That(all, Does.Contain("b"));
+    }
+}