Merge pull request #318 from dotnetcore/dev/develop

合并

Author: gmf520

build/version.props

@@ -3,7 +3,7 @@
     <VersionMain>9.0</VersionMain>
     <VersionPrefix>0</VersionPrefix>
     <VersionSuffix>-preview.</VersionSuffix>
-    <VersionSuffixVersion>906</VersionSuffixVersion>
+    <VersionSuffixVersion>907</VersionSuffixVersion>
     <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
     <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
     <!--<Version>$(VersionMain).$(VersionPrefix)</Version>

src/OSharp.Wpf/Stylet/ServiceProviderBootstrapper.cs

@@ -9,7 +9,7 @@
 
 namespace OSharp.Wpf.Stylet;
 
-public class ServiceProviderBootstrapper<TRootViewModel> : BootstrapperBase where TRootViewModel : class
+public abstract class ServiceProviderBootstrapper<TRootViewModel> : BootstrapperBase where TRootViewModel : class
 {
     private object _rootViewModel;
 
@@ -44,10 +44,14 @@ protected virtual void DefaultConfigureIoC(IServiceCollection services)
             ViewFactory = this.GetInstance,
             ViewAssemblies = new List<Assembly>() { GetType().Assembly }
         };
-        services.AddSingleton<IViewManager>(new ViewManager(viewManagerConfig));
 
+        services.AddSingleton<ViewManagerConfig>(viewManagerConfig);
+        services.AddSingleton<IViewManager, ViewManager>();
         services.AddSingleton<IWindowManagerConfig>(this);
-        services.AddSingleton<IWindowManager>(p => new WindowManager(p.GetService<IViewManager>(), p.GetService<IMessageBoxViewModel>, this));
+        services.AddSingleton<IWindowManager>(p => new WindowManager(
+            p.GetRequiredService<IViewManager>(),
+            p.GetRequiredService<IMessageBoxViewModel>,
+            p.GetRequiredService<IWindowManagerConfig>()));
         services.AddSingleton<IEventAggregator, EventAggregator>();
         services.AddTransient<IMessageBoxViewModel, MessageBoxViewModel>();
         services.AddTransient<MessageBoxView>();