Migration to latest PoeShared and .NET6

Author: iXab3r

Sources/MicSwitch.Tests/MicSwitch.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFramework>net5-windows7</TargetFramework>
+    <TargetFramework>net6-windows7</TargetFramework>
     <LangVersion>7</LangVersion>
     <AssemblyTitle>MicSwitch.Tests</AssemblyTitle>
     <Product>MicSwitch.Tests</Product>

Sources/MicSwitch/App.xaml

@@ -13,7 +13,6 @@
                 <eye:SharedResourceDictionary Source="Themes/Converters.xaml" />
                 <eye:SharedResourceDictionary Source="MainWindow/Views/HotkeyEditorView.xaml" />
                 <eye:SharedResourceDictionary Source="MainWindow/Views/MicSwitchOverlayView.xaml" />
-                <eye:SharedResourceDictionary Source="ErrorReporting/ErrorMonitorView.xaml" />
             </eye:SharedResourceDictionary.MergedDictionaries>
         </eye:SharedResourceDictionary>
     </Application.Resources>

Sources/MicSwitch/App.xaml.cs

@@ -9,9 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Threading;
-using log4net;
-using MicSwitch.ErrorReporting;
 using MicSwitch.MainWindow.Models;
 using MicSwitch.MainWindow.ViewModels;
 using MicSwitch.Modularity;
@@ -42,7 +39,6 @@ namespace MicSwitch
     public partial class App : ApplicationBase
     {
         public readonly TimeSpan StartupTimeout = TimeSpan.FromSeconds(10);
-        private static ILog Log => SharedLog.Instance.Log;
 
         private void InitializeContainer()
         {
@@ -54,7 +50,6 @@ private void InitializeContainer()
                      .RegisterSingleton<IComplexHotkeyTracker, ComplexHotkeyTracker>()
                      .RegisterSingleton<IMicrophoneControllerViewModel, MicrophoneControllerViewModel>()
                      .RegisterSingleton<IMainWindowViewModel, MainWindowViewModel>()
-                     .RegisterSingleton<IErrorMonitorViewModel, ErrorMonitorViewModel>()
                      .RegisterSingleton<IImageProvider, ImageProvider>()
                      .RegisterSingleton<IConfigProvider, ConfigProviderFromFile>();
         }
@@ -112,6 +107,25 @@ private void SingleInstanceValidationRoutine(bool retryIfAbandoned)
             }
         }
 
+        private void ShowShutdownWarning()
+        {
+            var assemblyName = Assembly.GetExecutingAssembly().GetName();
+            var window = MainWindow;
+            var title = $"{assemblyName.Name} v{assemblyName.Version}";
+            var message = "Application is already running !";
+            if (window != null)
+            {
+                MessageBox.Show(window, message, title, MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+            else
+            {
+                MessageBox.Show(message, title, MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+
+            Log.Warn("Shutting down...");
+            Environment.Exit(0);
+        }
+
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
@@ -121,9 +135,10 @@ protected override void OnStartup(StartupEventArgs e)
             using var sw = new BenchmarkTimer("MainWindow initialization routine", Log);
             Log.Info($"Application startup detected, PID: {Process.GetCurrentProcess().Id}");
 
-            Log.Debug("Initializing updater to handle initial events");
-            using var updateModel = Container.Resolve<IApplicationUpdaterModel>();
-            updateModel.HandleSquirrelEvents();
+            
+            Log.Debug("Resolving squirrel events handler");
+            var squirrelEventsHandler = Container.Resolve<ISquirrelEventsHandler>();
+            Log.Debug(() => $"Resolved squirrel events handler: {squirrelEventsHandler}");
             InitializeUpdateSettings();
 
             SingleInstanceValidationRoutine(true);
@@ -137,11 +152,7 @@ protected override void OnStartup(StartupEventArgs e)
             ActualizeConfig(configProvider);
 
             sw.Step("Registering overlay");
-            var micSwitchOverlayDependencyName = "MicSwitchOverlayAllWindows";
-            Container.RegisterOverlayController(micSwitchOverlayDependencyName, micSwitchOverlayDependencyName);
-            var matcher = new RegexStringMatcher().AddToWhitelist(".*");
-            Container.RegisterWindowTracker(micSwitchOverlayDependencyName, matcher);
-            var overlayController = Container.Resolve<IOverlayWindowController>(micSwitchOverlayDependencyName);
+            var overlayController = Container.Resolve<IOverlayWindowController>(WellKnownWindows.AllWindows);
             var overlayViewModelFactory = Container.Resolve<IFactory<IMicSwitchOverlayViewModel, IOverlayWindowController>>();
             var overlayViewModel = overlayViewModelFactory.Create(overlayController).AddTo(Anchors);
 
@@ -160,33 +171,6 @@ protected override void OnStartup(StartupEventArgs e)
             sw.Step($"Main window shown");
         }
 
-        protected override void OnExit(ExitEventArgs e)
-        {
-            base.OnExit(e);
-            Log.Info($"Application exit detected, PID: {Process.GetCurrentProcess().Id}");
-        }
-
-        private void ShowShutdownWarning()
-        {
-            var assemblyName = Assembly.GetExecutingAssembly().GetName();
-            var window = MainWindow;
-            var title = $"{assemblyName.Name} v{assemblyName.Version}";
-            var message = "Application is already running !";
-            Log.Warn($"Showing shutdown warning for process {Process.GetCurrentProcess().Id}");
-
-            if (window != null)
-            {
-                MessageBox.Show(window, message, title, MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-            else
-            {
-                MessageBox.Show(message, title, MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-
-            Log.Warn("Shutting down...");
-            Environment.Exit(0);
-        }
-
         private static void ActualizeConfig(IConfigProvider<MicSwitchConfig> mainConfigProvider)
         {
             Log.Debug($"Actualizing configuration format of {mainConfigProvider}");

Sources/MicSwitch/ErrorReporting/ErrorMonitorView.xaml

@@ -12,7 +12,6 @@
 using MaterialDesignColors;
 using MaterialDesignThemes.Wpf;
 using Microsoft.Win32;
-using MicSwitch.ErrorReporting;
 using MicSwitch.MainWindow.Models;
 using MicSwitch.Modularity;
 using PoeShared;
@@ -25,6 +24,7 @@
 using PoeShared.Scaffolding.WPF;
 using PoeShared.Services;
 using PoeShared.Squirrel.Updater;
+using PoeShared.UI;
 using ReactiveUI;
 using Unity;
 using Application = System.Windows.Application;

Sources/MicSwitch/ErrorReporting/ErrorMonitorViewModel.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5-windows7</TargetFramework>
+    <TargetFramework>net6-windows7</TargetFramework>
     <LangVersion>9</LangVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>MicSwitch</AssemblyName>