Use Avalonia-generated InitializeComponent

Directory.Build.props

@@ -19,6 +19,12 @@
   <PropertyGroup>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
+  <PropertyGroup>
+    <DockEnableGeneratedAppInitializeComponent>false</DockEnableGeneratedAppInitializeComponent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DockEnableGeneratedAppInitializeComponent)' == 'true'">
+    <DefineConstants>$(DefineConstants);DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT</DefineConstants>
+  </PropertyGroup>
   <ItemGroup Label="PackageIcon">
     <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="" Visible="false" />
     <None Include="$(MSBuildThisFileDirectory)build/Assets/Icon.png" Pack="true" PackagePath="" Visible="false" />

docfx/articles/dock-reactiveui-di.md

@@ -403,7 +403,6 @@ Follow these instructions to create a ReactiveUI application with dependency inj
 
        private static void ConfigureServices(IServiceCollection services)
        {
-           services.AddSingleton<App>();
            services.AddSingleton<IViewLocator, ViewLocator>();
 
            // Register data services
@@ -429,11 +428,17 @@ Follow these instructions to create a ReactiveUI application with dependency inj
        }
 
        public static AppBuilder BuildAvaloniaApp(IServiceProvider provider)
-           => AppBuilder.Configure(() => provider.GetRequiredService<App>())
+           => AppBuilder.Configure(() => CreateApp(provider))
                .UsePlatformDetect()
                .WithInterFont()
                .UseReactiveUI()
                .LogToTrace();
+
+       private static App CreateApp(IServiceProvider provider) => new()
+       {
+           ServiceProvider = provider,
+           ViewLocator = provider.GetRequiredService<IViewLocator>()
+       };
    }
    ```
 
@@ -454,40 +459,34 @@ Follow these instructions to create a ReactiveUI application with dependency inj
 
    public partial class App : Application
    {
-       public IServiceProvider? ServiceProvider { get; }
-       private readonly IViewLocator _viewLocator;
+       public IServiceProvider? ServiceProvider { get; init; }
+       public IViewLocator? ViewLocator { get; init; }
 
-       public App()
+       public override void Initialize()
        {
-       }
+           AvaloniaXamlLoader.Load(this);
 
-       public App(IServiceProvider? serviceProvider, IViewLocator viewLocator)
-       {
-           ServiceProvider = serviceProvider;
-           _viewLocator = viewLocator;
+           if (ViewLocator is not null)
+           {
+               DataTemplates.Insert(0, (IDataTemplate)ViewLocator);
+           }
        }
 
-   public override void Initialize()
-   {
-       AvaloniaXamlLoader.Load(this);
-       DataTemplates.Insert(0, (IDataTemplate)_viewLocator);
-   }
-
-   public override void OnFrameworkInitializationCompleted()
-   {
-       if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop && ServiceProvider != null)
+       public override void OnFrameworkInitializationCompleted()
        {
-           var viewModel = ServiceProvider.GetRequiredService<MainWindowViewModel>();
-           var view = ServiceProvider.GetRequiredService<IViewFor<MainWindowViewModel>>();
-           view.ViewModel = viewModel;
-           if (view is Window window)
+           if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop && ServiceProvider != null)
            {
-               desktop.MainWindow = window;
+               var viewModel = ServiceProvider.GetRequiredService<MainWindowViewModel>();
+               var view = ServiceProvider.GetRequiredService<IViewFor<MainWindowViewModel>>();
+               view.ViewModel = viewModel;
+               if (view is Window window)
+               {
+                   desktop.MainWindow = window;
+               }
            }
-       }
 
-       base.OnFrameworkInitializationCompleted();
-   }
+           base.OnFrameworkInitializationCompleted();
+       }
    }
    ```
 

samples/BrowserTabTheme/App.axaml.cs

@@ -12,7 +12,11 @@ public partial class App : Application
 {
     public override void Initialize()
     {
+#if DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT
+        InitializeComponent();
+#else
         AvaloniaXamlLoader.Load(this);
+#endif
     }
 
     public override void OnFrameworkInitializationCompleted()

samples/BrowserTabTheme/BrowserTabTheme.csproj

@@ -6,7 +6,8 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
-    <AvaloniaNameGeneratorBehavior>OnlyProperties</AvaloniaNameGeneratorBehavior>
+    <AvaloniaNameGeneratorBehavior>InitializeComponent</AvaloniaNameGeneratorBehavior>
+    <DockEnableGeneratedAppInitializeComponent>true</DockEnableGeneratedAppInitializeComponent>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>

samples/BrowserTabTheme/MainWindow.axaml.cs

@@ -6,6 +6,6 @@ public partial class MainWindow : Avalonia.Controls.Window
 {
     public MainWindow()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockControlPanelsSample/App.axaml.cs

@@ -8,7 +8,11 @@ public partial class App : Application
 {
     public override void Initialize()
     {
+#if DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT
+        InitializeComponent();
+#else
         AvaloniaXamlLoader.Load(this);
+#endif
     }
 
     public override void OnFrameworkInitializationCompleted()
@@ -20,4 +24,4 @@ public override void OnFrameworkInitializationCompleted()
 
         base.OnFrameworkInitializationCompleted();
     }
-}
+}

samples/DockControlPanelsSample/DockControlPanelsSample.csproj

@@ -6,7 +6,7 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
-    <AvaloniaNameGeneratorBehavior>OnlyProperties</AvaloniaNameGeneratorBehavior>
+    <AvaloniaNameGeneratorBehavior>InitializeComponent</AvaloniaNameGeneratorBehavior>
   </PropertyGroup>
 
   <Import Project="..\..\build\AOT.props" />

samples/DockControlPanelsSample/MainView.axaml.cs

@@ -9,9 +9,4 @@ public MainView()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }

samples/DockControlPanelsSample/MainWindow.axaml.cs

@@ -9,9 +9,4 @@ public MainWindow()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }

samples/DockExternalTabStripsSample/App.axaml.cs

@@ -8,7 +8,11 @@ public partial class App : Application
 {
     public override void Initialize()
     {
+#if DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT
+        InitializeComponent();
+#else
         AvaloniaXamlLoader.Load(this);
+#endif
     }
 
     public override void OnFrameworkInitializationCompleted()

samples/DockExternalTabStripsSample/DockExternalTabStripsSample.csproj

@@ -6,7 +6,7 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <IsPackable>False</IsPackable>
     <Nullable>enable</Nullable>
-    <AvaloniaNameGeneratorBehavior>OnlyProperties</AvaloniaNameGeneratorBehavior>
+    <AvaloniaNameGeneratorBehavior>InitializeComponent</AvaloniaNameGeneratorBehavior>
   </PropertyGroup>
 
   <Import Project="..\..\build\AOT.props" />

samples/DockExternalTabStripsSample/MainView.axaml.cs

@@ -41,13 +41,7 @@ protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e
         UnregisterExternalSurfaces();
         base.OnDetachedFromVisualTree(e);
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
-    private void RegisterExternalSurfaces()
+private void RegisterExternalSurfaces()
     {
         if (_surfacesRegistered)
         {

samples/DockExternalTabStripsSample/MainWindow.axaml.cs

@@ -9,9 +9,4 @@ public MainWindow()
     {
         InitializeComponent();
     }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
 }

samples/DockFigmaSample/App.axaml.cs

@@ -12,11 +12,15 @@
 
 namespace DockFigmaSample;
 
-public class App : Application
+public partial class App : Application
 {
     public override void Initialize()
     {
+#if DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT
+        InitializeComponent();
+#else
         AvaloniaXamlLoader.Load(this);
+#endif
         RegisterViews();
     }
 

samples/DockFigmaSample/DockFigmaSample.csproj

@@ -5,7 +5,8 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
-    <AvaloniaNameGeneratorBehavior>OnlyProperties</AvaloniaNameGeneratorBehavior>
+    <AvaloniaNameGeneratorBehavior>InitializeComponent</AvaloniaNameGeneratorBehavior>
+    <DockEnableGeneratedAppInitializeComponent>true</DockEnableGeneratedAppInitializeComponent>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>

samples/DockFigmaSample/Views/Documents/CanvasDocumentView.axaml.cs

@@ -8,6 +8,6 @@ public partial class CanvasDocumentView : ReactiveUserControl<CanvasDocumentView
 {
     public CanvasDocumentView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Documents/DesignCanvasView.axaml.cs

@@ -8,6 +8,6 @@ public partial class DesignCanvasView : ReactiveUserControl<DesignCanvasViewMode
 {
     public DesignCanvasView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Documents/InspectCanvasView.axaml.cs

@@ -8,6 +8,6 @@ public partial class InspectCanvasView : ReactiveUserControl<InspectCanvasViewMo
 {
     public InspectCanvasView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Documents/PrototypeCanvasView.axaml.cs

@@ -8,6 +8,6 @@ public partial class PrototypeCanvasView : ReactiveUserControl<PrototypeCanvasVi
 {
     public PrototypeCanvasView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/HomeView.axaml.cs

@@ -8,6 +8,6 @@ public partial class HomeView : ReactiveUserControl<HomeViewModel>
 {
     public HomeView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/MainWindow.axaml.cs

@@ -8,6 +8,6 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
 {
     public MainWindow()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/AssetsToolView.axaml.cs

@@ -8,6 +8,6 @@ public partial class AssetsToolView : ReactiveUserControl<AssetsToolViewModel>
 {
     public AssetsToolView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/CommentsToolView.axaml.cs

@@ -8,6 +8,6 @@ public partial class CommentsToolView : ReactiveUserControl<CommentsToolViewMode
 {
     public CommentsToolView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/InspectorDesignView.axaml.cs

@@ -8,6 +8,6 @@ public partial class InspectorDesignView : ReactiveUserControl<InspectorDesignVi
 {
     public InspectorDesignView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/InspectorInspectView.axaml.cs

@@ -8,6 +8,6 @@ public partial class InspectorInspectView : ReactiveUserControl<InspectorInspect
 {
     public InspectorInspectView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/InspectorPrototypeView.axaml.cs

@@ -8,6 +8,6 @@ public partial class InspectorPrototypeView : ReactiveUserControl<InspectorProto
 {
     public InspectorPrototypeView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/InspectorToolView.axaml.cs

@@ -8,6 +8,6 @@ public partial class InspectorToolView : ReactiveUserControl<InspectorToolViewMo
 {
     public InspectorToolView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/LayersToolView.axaml.cs

@@ -8,6 +8,6 @@ public partial class LayersToolView : ReactiveUserControl<LayersToolViewModel>
 {
     public LayersToolView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/Tools/ToolbarToolView.axaml.cs

@@ -8,6 +8,6 @@ public partial class ToolbarToolView : ReactiveUserControl<ToolbarToolViewModel>
 {
     public ToolbarToolView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockFigmaSample/Views/WorkspaceView.axaml.cs

@@ -8,6 +8,6 @@ public partial class WorkspaceView : ReactiveUserControl<WorkspaceViewModel>
 {
     public WorkspaceView()
     {
-        AvaloniaXamlLoader.Load(this);
+        InitializeComponent();
     }
 }

samples/DockInpcSample/App.axaml.cs

@@ -11,15 +11,18 @@
 
 namespace DockInpcSample;
 
-public class App : Application
+public partial class App : Application
 {
     public static IThemeManager? ThemeManager;
 
     public override void Initialize()
     {
         ThemeManager = new FluentThemeManager();
-
+#if DOCK_USE_GENERATED_APP_INITIALIZE_COMPONENT
+        InitializeComponent();
+#else
         AvaloniaXamlLoader.Load(this);
+#endif
     }
 
     public override void OnFrameworkInitializationCompleted()