New app model

ShortDevelopment · ShortDevelopment · commit 522ce8014526 · 2022-08-02T11:52:56.000+02:00
diff --git a/VBAudioRouter.Host/Program.cs b/VBAudioRouter.Host/Program.cs
@@ -2,14 +2,16 @@
 using System;
 using System.Runtime;
 using System.Runtime.InteropServices;
+using System.Threading;
 
 namespace VBAudioRouter.Host
 {
     static class Program
     {
-        [STAThread]
+        [MTAThread]
         static void Main(string[] args)
         {
+            GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;
             using (SentrySdk.Init(o =>
             {
                 o.Dsn = "https://ba91eccb16f94401895d04e20e0db0f0@o646413.ingest.sentry.io/6409713";
@@ -22,7 +24,6 @@ static void Main(string[] args)
             {
                 try
                 {
-                    GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;
                     VBAudioRouter.Program.WinMain(args);
                 }
                 catch (Exception ex)
diff --git a/VBAudioRouter.UWP/App.xaml.vb b/VBAudioRouter.UWP/App.xaml.vb
@@ -1,13 +1,25 @@
-﻿Imports VBAudioRouter.Dialogs
+﻿Imports ShortDev.Uwp.FullTrust.Xaml
+Imports VBAudioRouter.Dialogs
 Imports VBAudioRouter.Utils
 Imports Windows.UI
 Imports Windows.UI.Core.Preview
 
 Public NotInheritable Class App
 
     Public Sub New()
-        'Initialize()
         InitializeComponent()
+
+        Threading.Thread.CurrentThread.Priority = Threading.ThreadPriority.AboveNormal
+    End Sub
+
+    Private Shared Async Sub Program_CloseRequested(ByVal sender As Object, ByVal e As Navigation.XamlWindowCloseRequestedEventArgs)
+        Dim deferral = e.GetDeferral()
+        e.Handled = Await HandleCloseRequest()
+        deferral.Complete()
+    End Sub
+
+    Protected Overrides Sub OnWindowCreated(args As WindowCreatedEventArgs)
+        MyBase.OnWindowCreated(args)
     End Sub
 
     Protected Overrides Async Sub OnLaunched(e As LaunchActivatedEventArgs)
@@ -42,14 +54,20 @@ Public NotInheritable Class App
 #End Region
 
 #Region "Close confirm"
-        AddHandler SystemNavigationManagerPreview.GetForCurrentView().CloseRequested, Async Sub(sender As Object, ev As SystemNavigationCloseRequestedPreviewEventArgs)
-                                                                                          Dim deferral As Deferral = ev.GetDeferral()
-                                                                                          Try
-                                                                                              ev.Handled = Await HandleCloseRequest()
-                                                                                          Finally
-                                                                                              deferral.Complete()
-                                                                                          End Try
-                                                                                      End Sub
+        If Not WinUI.Interop.RuntimeInformation.IsAppContainer Then
+            Dim subclass = XamlWindowSubclass.GetForCurrentView()
+            subclass.UseDarkMode = True
+            AddHandler Window.Current.GetSubclass().CloseRequested, AddressOf Program_CloseRequested
+        Else
+            AddHandler SystemNavigationManagerPreview.GetForCurrentView().CloseRequested, Async Sub(sender As Object, ev As SystemNavigationCloseRequestedPreviewEventArgs)
+                                                                                              Dim deferral As Deferral = ev.GetDeferral()
+                                                                                              Try
+                                                                                                  ev.Handled = Await HandleCloseRequest()
+                                                                                              Finally
+                                                                                                  deferral.Complete()
+                                                                                              End Try
+                                                                                          End Sub
+        End If
 #End Region
 
 #Region "Exception handling"
@@ -73,9 +91,9 @@ Public NotInheritable Class App
 
             AddHandler rootFrame.NavigationFailed, AddressOf OnNavigationFailed
 
-            If args.PreviousExecutionState = ApplicationExecutionState.Terminated Then
-                ' TODO: Zustand von zuvor angehaltener Anwendung laden
-            End If
+            'If args.PreviousExecutionState = ApplicationExecutionState.Terminated Then
+            '    ' TODO: Zustand von zuvor angehaltener Anwendung laden
+            'End If
             Window.Current.Content = rootFrame
         End If
 
diff --git a/VBAudioRouter.UWP/Program.vb b/VBAudioRouter.UWP/Program.vb
@@ -1,19 +1,12 @@
-﻿Imports ShortDev.Uwp.FullTrust.Core.Xaml
+﻿Partial Public Class Program
 
-Partial Public Class Program
-
-    Public Shared Sub WinMain(args As String())
-        XamlApplicationWrapper.Run(Of App, WelcomePage)(Sub()
-                                                            Dim subclass = XamlWindowSubclass.ForCurrentWindow()
-                                                            subclass.UseDarkMode = True
-                                                            AddHandler Window.Current.GetSubclass().CloseRequested, AddressOf Program_CloseRequested
-                                                        End Sub)
+    <MTAThread()>
+    Shared Sub Main(ByVal args() As String)
+        Application.Start(Function(p) New App())
     End Sub
 
-    Private Shared Async Sub Program_CloseRequested(ByVal sender As Object, ByVal e As Navigation.XamlWindowCloseRequestedEventArgs)
-        Dim deferral = e.GetDeferral()
-        e.Handled = Await App.HandleCloseRequest()
-        deferral.Complete()
+    Public Shared Sub WinMain(args As String())
+        FullTrustApplication.Start(Function(p) New App())
     End Sub
 
 End Class
diff --git a/VBAudioRouter.UWP/VBAudioRouter.UWP.vbproj b/VBAudioRouter.UWP/VBAudioRouter.UWP.vbproj
@@ -63,7 +63,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE,WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN,NETFX_CORE,WINDOWS_UWP,CODE_ANALYSIS</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -382,7 +382,7 @@
       <Version>7.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.0-prerelease.220413001</Version>
+      <Version>2.8.0-prerelease.220712001</Version>
     </PackageReference>
     <PackageReference Include="NAudio.Core">
       <Version>2.1.0</Version>
@@ -394,13 +394,13 @@
       <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="ShortDev.Uwp.FullTrust">
-      <Version>0.1.3</Version>
+      <Version>0.1.6</Version>
     </PackageReference>
     <PackageReference Include="UWPAudioVisualizer">
       <Version>1.0.38</Version>
     </PackageReference>
     <PackageReference Include="WinUI.Interop">
-      <Version>0.2.4</Version>
+      <Version>0.2.6</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/VBAudioRouter.UWP/WelcomePage.xaml.vb b/VBAudioRouter.UWP/WelcomePage.xaml.vb
@@ -1,8 +1,13 @@
-﻿Imports Windows.System
+﻿Imports System.Runtime.InteropServices
+Imports Windows.System
 
 Public NotInheritable Class WelcomePage
     Inherits Page
 
+    Public Sub New()
+        InitializeComponent()
+    End Sub
+
     Private Sub NavigationView_SelectionChanged(sender As Microsoft.UI.Xaml.Controls.NavigationView, args As Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs)
         Dim navOptions As New FrameNavigationOptions()
         navOptions.TransitionInfoOverride = args.RecommendedNavigationTransitionInfo

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,16 @@`
`2`	`2`	`using System;`
`3`	`3`	`using System.Runtime;`
`4`	`4`	`using System.Runtime.InteropServices;`
	`5`	`+using System.Threading;`
`5`	`6`
`6`	`7`	`namespace VBAudioRouter.Host`
`7`	`8`	`{`
`8`	`9`	`static class Program`
`9`	`10`	`{`
`10`		`- [STAThread]`
	`11`	`+ [MTAThread]`
`11`	`12`	`static void Main(string[] args)`
`12`	`13`	`{`
	`14`	`+ GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;`
`13`	`15`	`using (SentrySdk.Init(o =>`
`14`	`16`	`{`
`15`	`17`	`o.Dsn = "https://[email protected]/6409713";`
`@@ -22,7 +24,6 @@ static void Main(string[] args)`
`22`	`24`	`{`
`23`	`25`	`try`
`24`	`26`	`{`
`25`		`- GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;`
`26`	`27`	`VBAudioRouter.Program.WinMain(args);`
`27`	`28`	`}`
`28`	`29`	`catch (Exception ex)`