dapplo · Lakritzator · Apr 2, 2023 · Mar 31, 2023 · Mar 31, 2023 · Apr 1, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,6 +3,7 @@
  <Copyright>Copyright © Dapplo</Copyright>
  <Authors>Dapplo</Authors>
  <PackageIcon>icon.png</PackageIcon>
+ <PackageReadmeFile>README.md</PackageReadmeFile>
  <RepositoryUrl>https://github.com/dapplo/Dapplo.Microsoft.Extensions</RepositoryUrl>
  <RepositoryType>git</RepositoryType>
  <PackageProjectUrl>https://github.com/dapplo/Dapplo.Microsoft.Extensions</PackageProjectUrl>
@@ -43,5 +44,7 @@
  </PackageReference>
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
  <None Include="$(SolutionDir)\icon.png" Pack="true" PackagePath="\"/>
+ <None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="LICENSE" />
+ <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="\"/>
  </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This repository brings you a few extensions on the generic host which will help
 - Dapplo.Microsoft.Extensions.Hosting.AppServices - Simple services, e.g. make sure you application runs only once!
 - Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro - Bases upon Dapplo.Microsoft.Extensions.Hosting.Wpf and bootstraps [Caliburn.Micro](https://caliburnmicro.com)
 - Dapplo.Microsoft.Extensions.Hosting.WinForms - Have a way to bootstrap Windows Forms with all the possible generic host functionality, and manage the lifetime.
-- Dapplo.Microsoft.Extensions.Hosting.Wpf -  Have a way to bootstrap WPF with all the possible generic host functionality, and manage the lifetime.
+- Dapplo.Microsoft.Extensions.Hosting.Wpf - Have a way to bootstrap WPF with all the possible generic host functionality, and manage the lifetime.
 - Dapplo.Microsoft.Extensions.Hosting.Plugins - Makes it possible to find & load additional plug-in which can add services to your application.
 
 FYI: there is a solution with samples in the samples directory and one which is used on the build server in the src.
@@ -28,15 +28,15 @@ Dapplo.Microsoft.Extensions.Hosting.Plugins
 --------------------------------------------
 [![Nuget](https://img.shields.io/nuget/v/Dapplo.Microsoft.Extensions.Hosting.Plugins.svg)](https://www.nuget.org/packages/Dapplo.Microsoft.Extensions.Hosting.Plugins/)
 
-This extension adds plug-in support to generic host based dotnet core 3.0 applications.
+This extension adds plug-in support to generic host based dotnet core 6.0 applications.
 
 You can simply add the location of plug-ins by specifying globs to find your plug-in assemblies.
 This can be both files to include and / or exclude.
 Each located plug-ins is loaded into it's own AssemblyLoadContext, dependencies are found and loaded in the same AssemblyLoadContext via an AssemblyDependencyResolver (which was introduced in dotnet core 3.0).
 
 [Here](https://github.com/dapplo/Dapplo.Microsoft.Extensions.Hosting/blob/master/samples/Dapplo.Hosting.Sample.ConsoleDemo/Program.cs#L27)
  is an example how to use the loading, and also how to handle framework assemblies:
-```
+```C#
 .ConfigurePlugins(pluginBuilder =>
  {
  // Specify the location from where the Dll's are "globbed"
@@ -55,7 +55,7 @@ Now you will need to follow a naming convention, this is for speed so there is n
 
 Example for the IPlugin implementation, this can configure the HostBuilderContext:
 
-```
+```C#
  /// <summary>
  /// This plug-in configures the HostBuilderContext to have the hosted services from the online example
  /// </summary>
@@ -70,6 +70,16 @@ Example for the IPlugin implementation, this can configure the HostBuilderContex
  }
 ```
 
+This can also be simplified to use the following code with up to 3 configured services:
+```C#
+ /// <summary>
+ /// This plug-in configures the HostBuilderContext to have the hosted services from the online example
+ /// </summary>
+ public class Plugin : PluginBase<LifetimeEventsHostedService, TimedHostedService>
+ {
+ }
+```
+
 
 Dapplo.Microsoft.Extensions.Hosting.AppServices
 -----------------------------------------------
@@ -79,7 +89,7 @@ This extension adds some generic application services for desktop applications,
 
 [Here](https://github.com/dapplo/Dapplo.Microsoft.Extensions.Hosting/blob/master/samples/Dapplo.Hosting.Sample.WinFormsDemo/Program.cs#L25) is an example how to make sure your application only runs once.
 
-```
+```C#
 .ConfigureSingleInstance(builder =>
  {
  builder.MutexId = "{B9CE32C0-59AE-4AF0-BE39-5329AAFF4BE8}";
@@ -107,7 +117,7 @@ With this you can enhance your application with a UI, and use all the services p
 This means you can have a constructor which requests a logger, or other forms.
 
 It's not much more than adding something like this to your hostBuilder:
-```
+```C#
  .ConfigureWinForms<Form1>()
  .UseWinFormsLifetime()
 ```
@@ -126,7 +136,7 @@ With this you can enhance your application with a UI, and use all the services p
 This means your MainWindow can have a constructor which requests a logger, or other windows.
 
 It's not much more than adding something like this to your hostBuilder:
-```
+```C#
  .ConfigureWpf<MainWindow>()
  .UseWpfLifetime()
 ```
@@ -145,7 +155,38 @@ With this you can enhance your application with a UI, and use all the services p
 This means your MainWindowViewModel can have a constructor which requests a logger, or other windows.
 
 It's not much more than adding something like this to your hostBuilder:
-```
+```C#
  .ConfigureCaliburnMicro<MainViewModel>()
 ```
 It assumes Dapplo.Microsoft.Extensions.Hosting.Wpf is used!
+
+
+Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.Wpf
+---------------------------------------
+
+[![Nuget](https://img.shields.io/nuget/v/Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.Wpf.svg)](https://www.nuget.org/packages/Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.Wpf/)
+
+This extension adds [ReactiveUI](https://reactiveui.net/) support to generic host based applications.
+With this you can enhance your application with ReactiveUI functions, and use all the services provided by the generic host like combining Splat with Microsoft DI, logging etc, together with this great Reactive MVVM framework.
+
+This is based on the Dapplo.Microsoft.Extensions.Hosting.Wpf extension, so you can use that to start your application.
+
+Use the following code to merge ReactiveUI.Splat with the Microsoft Dependency Resolver in your application:
+```C#
+ .ConfigureSplatForMicrosoftDependencyResolver()
+```
+
+Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.WinForms
+---------------------------------------
+
+[![Nuget](https://img.shields.io/nuget/v/Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.WinForms.svg)](https://www.nuget.org/packages/Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.WinForms/)
+
+This extension adds [ReactiveUI](https://reactiveui.net/) support to generic host based applications.
+With this you can enhance your application with ReactiveUI functions, and use all the services provided by the generic host like combining Splat with Microsoft DI, logging etc, together with this great Reactive MVVM framework.
+
+This is based on the Dapplo.Microsoft.Extensions.Hosting.WinForms extension, so you can use that to start your application.
+
+Use the following code to merge ReactiveUI.Splat with the Microsoft Dependency Resolver in your application:
+```C#
+ .ConfigureSplatForMicrosoftDependencyResolver()
+```
diff --git a/samples/Dapplo.Hosting.Sample.PluginOriginalSample/LifetimeEventsHostedService.cs b/samples/Dapplo.Hosting.Sample.PluginOriginalSample/LifetimeEventsHostedService.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Dapplo and contributors. All rights reserved.
+// Copyright (c) Dapplo and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Threading;
@@ -12,7 +12,7 @@ namespace Dapplo.Hosting.Sample.PluginOriginalSample;
 /// <summary>
 /// Example for a IHostedService which tracks live-time events
 /// </summary>
-internal class LifetimeEventsHostedService : IHostedService
+public class LifetimeEventsHostedService : IHostedService
 {
  private readonly ILogger logger;
  private readonly IHostApplicationLifetime hostApplicationLifetime;
@@ -62,4 +62,4 @@ private void OnStopped()
 
  // Perform post-stopped activities here
  }
-}
+}
diff --git a/samples/Dapplo.Hosting.Sample.PluginOriginalSample/Plugin.cs b/samples/Dapplo.Hosting.Sample.PluginOriginalSample/Plugin.cs
@@ -2,20 +2,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Dapplo.Microsoft.Extensions.Hosting.Plugins;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace Dapplo.Hosting.Sample.PluginOriginalSample;
 
 /// <summary>
 /// This plug-in configures the HostBuilderContext to have the hosted services from the online example
 /// </summary>
 [PluginOrder(100)]
-public class Plugin : IPlugin
+public class Plugin : PluginBase<LifetimeEventsHostedService, TimedHostedService>
 {
- /// <inheritdoc />
- public void ConfigureHost(HostBuilderContext hostBuilderContext, IServiceCollection serviceCollection) =>
- serviceCollection
- .AddHostedService<LifetimeEventsHostedService>()
- .AddHostedService<TimedHostedService>();
-}
+}
diff --git a/samples/Dapplo.Hosting.Sample.PluginOriginalSample/TimedHostedService.cs b/samples/Dapplo.Hosting.Sample.PluginOriginalSample/TimedHostedService.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Dapplo and contributors. All rights reserved.
+// Copyright (c) Dapplo and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
@@ -10,7 +10,7 @@
 
 namespace Dapplo.Hosting.Sample.PluginOriginalSample;
 
-internal class TimedHostedService : IHostedService, IDisposable
+public class TimedHostedService : IHostedService, IDisposable
 {
  private readonly ILogger logger;
  private Timer timer;
@@ -46,4 +46,4 @@ public Task StopAsync(CancellationToken cancellationToken)
  }
 
  public void Dispose() => this.timer?.Dispose();
-}
+}
diff --git a/samples/Dapplo.Hosting.Sample.PluginWithDependency/MySampleBackgroundService.cs b/samples/Dapplo.Hosting.Sample.PluginWithDependency/MySampleBackgroundService.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Dapplo and contributors. All rights reserved.
+// Copyright (c) Dapplo and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
@@ -14,7 +14,7 @@ namespace Dapplo.Hosting.Sample.PluginWithDependency;
 /// <summary>
 /// Just some service to run in the background and use a dependency
 /// </summary>
-internal class MySampleBackgroundService : IHostedService, IDisposable
+public class MySampleBackgroundService : IHostedService, IDisposable
 {
  private readonly ILogger logger;
  private Timer timer;
@@ -66,4 +66,4 @@ public void Dispose()
  {
  this.timer?.Dispose();
  }
-}
+}
diff --git a/samples/Dapplo.Hosting.Sample.PluginWithDependency/Plugin.cs b/samples/Dapplo.Hosting.Sample.PluginWithDependency/Plugin.cs
@@ -2,17 +2,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Dapplo.Microsoft.Extensions.Hosting.Plugins;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace Dapplo.Hosting.Sample.PluginWithDependency;
 
 /// <summary>
 /// A simple plugin definition, registering the BackgroundService
 /// </summary>
 [PluginOrder(-1)]
-public class Plugin : IPlugin
+public class Plugin : PluginBase<MySampleBackgroundService>
 {
- /// <inheritdoc />
- public void ConfigureHost(HostBuilderContext hostBuilderContext, IServiceCollection serviceCollection) => serviceCollection.AddHostedService<MySampleBackgroundService>();
-}
+}
diff --git a/samples/Dapplo.Hosting.Sample.ReactiveDemo/Dapplo.Hosting.Sample.ReactiveDemo.csproj b/samples/Dapplo.Hosting.Sample.ReactiveDemo/Dapplo.Hosting.Sample.ReactiveDemo.csproj
@@ -13,15 +13,13 @@
  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  <PackageReference Include="NuGet.Protocol" Version="6.5.0" />
- <!--ReactiveUI only supports windows 10.0.17763 plus-->
- <PackageReference Include="ReactiveUI.WPF" Version="18.4.26" />
  <PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="14.6.8" />
  </ItemGroup>
 
  <ItemGroup>
  <ProjectReference Include="..\..\src\Dapplo.Microsoft.Extensions.Hosting.AppServices\Dapplo.Microsoft.Extensions.Hosting.AppServices.csproj" />
  <ProjectReference Include="..\..\src\Dapplo.Microsoft.Extensions.Hosting.Plugins\Dapplo.Microsoft.Extensions.Hosting.Plugins.csproj" />
- <ProjectReference Include="..\..\src\Dapplo.Microsoft.Extensions.Hosting.Wpf\Dapplo.Microsoft.Extensions.Hosting.Wpf.csproj" />
+ <ProjectReference Include="..\..\src\Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.Wpf\Dapplo.Microsoft.Extensions.Hosting.ReactiveUI.Wpf.csproj" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/samples/Dapplo.Hosting.Sample.ReactiveDemo/Program.cs b/samples/Dapplo.Hosting.Sample.ReactiveDemo/Program.cs
@@ -1,19 +1,20 @@
 // Copyright (c) Dapplo and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Dapplo.Microsoft.Extensions.Hosting.Plugins;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using System;
 using System.IO;
-using Dapplo.Microsoft.Extensions.Hosting.AppServices;
 using System.Threading.Tasks;
+using Dapplo.Microsoft.Extensions.Hosting.AppServices;
+using Dapplo.Microsoft.Extensions.Hosting.Plugins;
+using Dapplo.Microsoft.Extensions.Hosting.ReactiveUI;
+using Dapplo.Microsoft.Extensions.Hosting.Wpf;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using ReactiveUI;
-using Splat.Microsoft.Extensions.DependencyInjection;
 using Splat;
-using Dapplo.Microsoft.Extensions.Hosting.Wpf;
+using Splat.Microsoft.Extensions.DependencyInjection;
 
 namespace Dapplo.Hosting.Sample.ReactiveDemo;
 
@@ -27,6 +28,7 @@ public static Task Main(string[] args)
  {
  var executableLocation = Path.GetDirectoryName(typeof(Program).Assembly.Location) ?? throw new NotSupportedException("Can't start without location.");
  var host = new HostBuilder()
+ .ConfigureSplatForMicrosoftDependencyResolver()
  .ConfigureWpf(wpfBuilder => wpfBuilder.UseWindow<MainWindow>())
  .ConfigureLogging()
  .ConfigureConfiguration(args)