From ea8bde211b57bfdfabfdd0ddf7452f6e3ce52c4c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 29 Nov 2018 11:31:07 +0300
Subject: [PATCH] Additional `Start` method overload

---
 samples/ControlCatalog.NetCore/Program.cs | 10 ++++++++--
 src/Avalonia.Controls/AppBuilderBase.cs   |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index 1f53dedc14..57c8b700df 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -23,6 +23,7 @@ namespace ControlCatalog.NetCore
                         break;
                 }
             }
+
             if (args.Contains("--fbdev"))
                 AppBuilder.Configure<App>().InitializeWithLinuxFramebuffer(tl =>
                 {
@@ -30,7 +31,12 @@ namespace ControlCatalog.NetCore
                     System.Threading.ThreadPool.QueueUserWorkItem(_ => ConsoleSilencer());
                 });
             else
-                BuildAvaloniaApp().Start<MainWindow>();
+                BuildAvaloniaApp().Start(AppMain, args);
+        }
+
+        static void AppMain(Application app, string[] args)
+        {
+            app.Run(new MainWindow());
         }
 
         /// <summary>
@@ -46,4 +52,4 @@ namespace ControlCatalog.NetCore
                 Console.ReadKey(true);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index 376714b20b..c5dd072d8a 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -145,6 +145,15 @@ namespace Avalonia.Controls
             Instance.Run(mainWindow);
         }
 
+        public delegate void AppMainDelegate(Application app, string[] args);
+
+        public void Start(AppMainDelegate main, string[] args)
+        {
+            Setup();
+            BeforeStartCallback(Self);
+            main(Instance, args);
+        }
+        
         /// <summary>
         /// Sets up the platform-specific services for the application, but does not run it.
         /// </summary>