Remove warning sample

samples/BindingDemo/App.xaml.cs

@@ -1,6 +1,5 @@
-using System;
 using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 
@@ -13,13 +12,20 @@ namespace BindingDemo
             AvaloniaXamlLoader.Load(this);
         }
 
-        private static void Main()
+        public override void OnFrameworkInitializationCompleted()
         {
-            AppBuilder.Configure<App>()
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .UseReactiveUI()
-                .LogToDebug()
-                .Start<MainWindow>();
-        }
+                .LogToDebug();
     }
 }

samples/ControlCatalog.Desktop/Program.cs

@@ -10,12 +10,8 @@ namespace ControlCatalog
     internal class Program
     {
         [STAThread]
-        static void Main(string[] args)
-        {
-            // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
-            // again.
-            BuildAvaloniaApp().Start<MainWindow>();
-        }
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
 
         /// <summary>
         /// This method is needed for IDE previewer infrastructure

samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj

@@ -11,7 +11,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
     <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
   </ItemGroup>

samples/Previewer/App.xaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace Previewer
@@ -9,6 +10,13 @@ namespace Previewer
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 
-}
+}

samples/Previewer/Program.cs

@@ -1,13 +1,14 @@
-using System;
-using Avalonia;
+using Avalonia;
 
 namespace Previewer
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>().UsePlatformDetect().Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>()
+                .UsePlatformDetect();
+
+        public static int Main(string[] args)
+          => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
-}
+}

samples/RenderDemo/App.xaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 
@@ -11,9 +12,17 @@ namespace RenderDemo
             AvaloniaXamlLoader.Load(this);
         }
 
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
+
         // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
         // again.
-        static void Main(string[] args) => BuildAvaloniaApp().Start<MainWindow>();
+        static void Main(string[] args) 
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
 
         // App configuration, used by the entry point and previewer
         static AppBuilder BuildAvaloniaApp()

samples/RenderDemo/Pages/GlyphRunPage.xaml

@@ -6,9 +6,9 @@
              x:Class="RenderDemo.Pages.GlyphRunPage">
   <Border
     Background="White">
-    <DrawingPresenter
-      x:Name="drawingPresenter"
+    <Image
+      x:Name="imageControl"
       Stretch="None">
-    </DrawingPresenter>
+    </Image>
   </Border>
 </UserControl>

samples/RenderDemo/Pages/GlyphRunPage.xaml.cs

@@ -9,7 +9,7 @@ namespace RenderDemo.Pages
 {
     public class GlyphRunPage : UserControl
     {
-        private DrawingPresenter _drawingPresenter;
+        private Image _imageControl;
         private GlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
         private readonly Random _rand = new Random();
         private ushort[] _glyphIndices = new ushort[1];
@@ -25,7 +25,8 @@ namespace RenderDemo.Pages
         {
             AvaloniaXamlLoader.Load(this);
 
-            _drawingPresenter = this.FindControl<DrawingPresenter>("drawingPresenter");
+            _imageControl = this.FindControl<Image>("imageControl");
+            _imageControl.Source = new DrawingImage();
 
             DispatcherTimer.Run(() =>
             {
@@ -73,7 +74,7 @@ namespace RenderDemo.Pages
 
             drawingGroup.Children.Add(geometryDrawing);
 
-            _drawingPresenter.Drawing = drawingGroup;
+            (_imageControl.Source as DrawingImage).Drawing = drawingGroup;
         }
     }
 }

samples/VirtualizationDemo/App.xaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace VirtualizationDemo
@@ -9,5 +10,12 @@ namespace VirtualizationDemo
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 }

samples/VirtualizationDemo/Program.cs

@@ -1,19 +1,17 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia;
 using Avalonia.ReactiveUI;
 
 namespace VirtualizationDemo
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>()
-               .UsePlatformDetect()
-               .UseReactiveUI()
-               .LogToDebug()
-               .Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .UseReactiveUI()
+                .LogToDebug();
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 }

samples/interop/Direct3DInteropSample/App.paml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
 namespace Direct3DInteropSample
@@ -9,5 +10,12 @@ namespace Direct3DInteropSample
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
     }
 }

samples/interop/Direct3DInteropSample/Program.cs

@@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia;
+using Avalonia;
 
 namespace Direct3DInteropSample
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>()
-                .With(new Win32PlatformOptions {UseDeferredRendering = false})
-                .UseWin32().UseDirect2D1().Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .With(new Win32PlatformOptions { UseDeferredRendering = false })
+                .UseWin32()
+                .UseDirect2D1();
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 }

samples/interop/NativeEmbedSample/NativeEmbedSample.csproj

@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
-    <ProjectReference Include="..\..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
     <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
     <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
     <ProjectReference Include="..\..\..\src\Avalonia.X11\Avalonia.X11.csproj" />