diff --git a/Avalonia.sln b/Avalonia.sln
index 1878d07234..67fc548fed 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -168,6 +168,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsInteropTest", "samples\interop\WindowsInteropTest\WindowsInteropTest.csproj", "{C7A69145-60B6-4882-97D6-A3921DD43978}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GtkInteropDemo", "samples\interop\GtkInteropDemo\GtkInteropDemo.csproj", "{BD7F352C-6DC1-4740-BAF2-2D34A038728C}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DotNetFrameworkRuntime", "src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj", "{4A1ABB09-9047-4BD5-A4AD-A055E52C5EE0}"
 EndProject
 Global
@@ -2252,7 +2253,6 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Ad-Hoc|x86.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -2262,7 +2262,6 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|Mono.ActiveCfg = Release|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|Mono.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|x86.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.AppStore|x86.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -2272,7 +2271,6 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|Mono.ActiveCfg = Debug|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|Mono.Build.0 = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Debug|x86.Build.0 = Debug|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -2282,7 +2280,6 @@ Global
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|Mono.ActiveCfg = Release|Any CPU
-		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|Mono.Build.0 = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|x86.ActiveCfg = Release|Any CPU
 		{C7A69145-60B6-4882-97D6-A3921DD43978}.Release|x86.Build.0 = Release|Any CPU
 		{BD7F352C-6DC1-4740-BAF2-2D34A038728C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj b/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj
index 9f69090ce5..0d87af8838 100644
--- a/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj
+++ b/samples/interop/GtkInteropDemo/GtkInteropDemo.csproj
@@ -92,6 +92,10 @@
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Avalonia.Diagnostics</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj">
+      <Project>{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}</Project>
+      <Name>Avalonia.DotNetFrameworkRuntime</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\src\Avalonia.Input\Avalonia.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Avalonia.Input</Name>
diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
index 24f090a545..827f73d7ae 100644
--- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
+++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
@@ -116,6 +116,10 @@
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Avalonia.Diagnostics</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Avalonia.DotNetFrameworkRuntime\Avalonia.DotNetFrameworkRuntime.csproj">
+      <Project>{4a1abb09-9047-4bd5-a4ad-a055e52c5ee0}</Project>
+      <Name>Avalonia.DotNetFrameworkRuntime</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\src\Avalonia.Input\Avalonia.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Avalonia.Input</Name>
diff --git a/src/Avalonia.Controls/AppBuilder.cs b/src/Avalonia.Controls/AppBuilderBase.cs
similarity index 79%
rename from src/Avalonia.Controls/AppBuilder.cs
rename to src/Avalonia.Controls/AppBuilderBase.cs
index 82698acde7..5afbb444ee 100644
--- a/src/Avalonia.Controls/AppBuilder.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -10,7 +10,8 @@ namespace Avalonia.Controls
     /// <summary>
     /// Initializes up platform-specific services for an <see cref="Application"/>.
     /// </summary>
-    public abstract class AppBuilderBase<AppBuilder> where AppBuilder : AppBuilderBase<AppBuilder>, new()
+    /// <typeparam name="TAppBuilder"></typeparam>
+    public abstract class AppBuilderBase<TAppBuilder> where TAppBuilder : AppBuilderBase<TAppBuilder>, new()
     {
         /// <summary>
         /// Gets or sets the <see cref="IRuntimePlatform"/> instance.
@@ -41,7 +42,7 @@ namespace Avalonia.Controls
         /// Gets or sets a method to call before <see cref="Start{TMainWindow}"/> is called on the
         /// <see cref="Application"/>.
         /// </summary>
-        public Action<AppBuilder> BeforeStartCallback { get; set; }
+        public Action<TAppBuilder> BeforeStartCallback { get; set; }
 
         protected AppBuilderBase(IRuntimePlatform platform, Action platformSevices)
         {
@@ -53,8 +54,8 @@ namespace Avalonia.Controls
         /// Begin configuring an <see cref="Application"/>.
         /// </summary>
         /// <typeparam name="TApp">The subclass of <see cref="Application"/> to configure.</typeparam>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public static AppBuilder Configure<TApp>()
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public static TAppBuilder Configure<TApp>()
             where TApp : Application, new()
         {
             return Configure(new TApp());
@@ -63,26 +64,26 @@ namespace Avalonia.Controls
         /// <summary>
         /// Begin configuring an <see cref="Application"/>.
         /// </summary>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public static AppBuilder Configure(Application app)
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public static TAppBuilder Configure(Application app)
         {
             AvaloniaLocator.CurrentMutable.BindToSelf(app);
 
-            return new AppBuilder()
+            return new TAppBuilder()
             {
                 Instance = app,
             };
         }
 
-        protected AppBuilder Self => (AppBuilder) this;
+        protected TAppBuilder Self => (TAppBuilder) this;
 
         /// <summary>
         /// Registers a callback to call before <see cref="Start{TMainWindow}"/> is called on the
         /// <see cref="Application"/>.
         /// </summary>
         /// <param name="callback">The callback.</param>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder BeforeStarting(Action<AppBuilder> callback)
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public TAppBuilder BeforeStarting(Action<TAppBuilder> callback)
         {
             BeforeStartCallback = callback;
             return Self;
@@ -107,7 +108,7 @@ namespace Avalonia.Controls
         /// Sets up the platform-specific services for the application, but does not run it.
         /// </summary>
         /// <returns></returns>
-        public AppBuilder SetupWithoutStarting()
+        public TAppBuilder SetupWithoutStarting()
         {
             Setup();
             return Self;
@@ -117,8 +118,8 @@ namespace Avalonia.Controls
         /// Specifies a windowing subsystem to use.
         /// </summary>
         /// <param name="initializer">The method to call to initialize the windowing subsystem.</param>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder UseWindowingSubsystem(Action initializer)
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public TAppBuilder UseWindowingSubsystem(Action initializer)
         {
             WindowingSubsystem = initializer;
             return Self;
@@ -128,15 +129,15 @@ namespace Avalonia.Controls
         /// Specifies a windowing subsystem to use.
         /// </summary>
         /// <param name="dll">The dll in which to look for subsystem.</param>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder UseWindowingSubsystem(string dll) => UseWindowingSubsystem(GetInitializer(dll));
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public TAppBuilder UseWindowingSubsystem(string dll) => UseWindowingSubsystem(GetInitializer(dll));
 
         /// <summary>
         /// Specifies a rendering subsystem to use.
         /// </summary>
         /// <param name="initializer">The method to call to initialize the rendering subsystem.</param>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder UseRenderingSubsystem(Action initializer)
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public TAppBuilder UseRenderingSubsystem(Action initializer)
         {
             RenderingSubsystem = initializer;
             return Self;
@@ -146,8 +147,8 @@ namespace Avalonia.Controls
         /// Specifies a rendering subsystem to use.
         /// </summary>
         /// <param name="dll">The dll in which to look for subsystem.</param>
-        /// <returns>An <see cref="AppBuilder"/> instance.</returns>
-        public AppBuilder UseRenderingSubsystem(string dll) => UseRenderingSubsystem(GetInitializer(dll));
+        /// <returns>An <typeparamref name="TAppBuilder"/> instance.</returns>
+        public TAppBuilder UseRenderingSubsystem(string dll) => UseRenderingSubsystem(GetInitializer(dll));
 
         static Action GetInitializer(string assemblyName) => () =>
         {
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 86c2fe2408..7a04e0747c 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -43,7 +43,7 @@
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="AppBuilder.cs" />
+    <Compile Include="AppBuilderBase.cs" />
     <Compile Include="Application.cs" />
     <Compile Include="Classes.cs" />
     <Compile Include="ContextMenu.cs" />