Merge pull request #112 from ChristianGalla/105-add-wildcards-to-the-ignore-list

105 add wildcards to the ignore list

Author: ChristianGalla

AutoStartConfirm/App.xaml.cs

@@ -1,31 +1,19 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using AutoStartConfirm.Connectors;
-using AutoStartConfirm.Notifications;
+using AutoStartConfirm.Business;
+using AutoStartConfirm.GUI;
+using AutoStartConfirm.Helpers;
 using AutoStartConfirm.Models;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using H.NotifyIcon;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.UI.Xaml;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
-using System.Diagnostics;
-using Windows.Foundation.Collections;
-using AutoStartConfirm.GUI;
-using AutoStartConfirm.Properties;
-using AutoStartConfirm.Update;
 using System.Xml.Serialization;
-using Microsoft.Extensions.Logging;
-using H.NotifyIcon;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.ViewManagement;
-using Microsoft.Toolkit.Uwp.Notifications;
-using Microsoft.UI.Dispatching;
-using AutoStartConfirm.Helpers;
-using AutoStartConfirm.Business;
+using Windows.Foundation.Collections;
 
 namespace AutoStartConfirm
 {
@@ -237,17 +225,12 @@ private void ExitClicked(object sender, EventArgs e)
         }
 
         #region Event handlers
-        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             NotifyIcon.Exit += ExitHandler;
             NotifyIcon.ToggleMainWindow += ToggleMainWindowHandler;
-            // disabled until https://github.com/HavenDV/H.NotifyIcon/issues/186 is fixed
-            //TrayIcon = (TaskbarIcon)NotifyIcon["TrayIcon"];
-            //TrayIcon.ForceCreate();
-            DispatchService.TryEnqueue(() =>
-            {
-                Window?.Show();
-            });
+            TrayIcon = (TaskbarIcon)NotifyIcon["TrayIcon"];
+            TrayIcon.ForceCreate();
 
             // Listen to notification activation
             ToastNotificationManagerCompat.OnActivated += toastArgs =>
@@ -260,7 +243,8 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
                 ValueSet userInput = toastArgs.UserInput;
 
                 // Need to dispatch to UI thread if performing UI operations
-                DispatchService.TryEnqueue(() => {
+                DispatchService.TryEnqueue(() =>
+                {
                     Logger.LogTrace("Handling action {Arguments} {UserInput}", toastArgs.Argument, userInput);
                     if (args.TryGetValue("action", out string? action))
                     {

AutoStartConfirm/AutoStartConfirm.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0-windows10.0.22000.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x64</Platforms>

AutoStartConfirm/Program.cs

@@ -1,28 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Storage;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using AutoStartConfirm.Business;
 using AutoStartConfirm.Connectors;
 using AutoStartConfirm.GUI;
+using AutoStartConfirm.Helpers;
 using AutoStartConfirm.Models;
 using AutoStartConfirm.Notifications;
 using AutoStartConfirm.Properties;
 using AutoStartConfirm.Update;
-using NLog.Web;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
-using System.IO;
 using Microsoft.Windows.AppLifecycle;
-using Windows.ApplicationModel.Activation;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using AutoStartConfirm.Helpers;
-using NLog.Config;
 using NLog;
+using NLog.Web;
 using Octokit;
-using AutoStartConfirm.Business;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.Activation;
+using Windows.Storage;
 
 namespace AutoStartConfirm
 {
@@ -87,7 +86,7 @@ static int Main(string[] args)
 
         private static void ConfigureServices(ServiceCollection services)
         {
-            
+
             services
                 .AddLogging(loggingBuilder =>
                 {
@@ -97,7 +96,7 @@ private static void ConfigureServices(ServiceCollection services)
                     loggingBuilder.AddNLogWeb((IServiceProvider serviceProvider) =>
                     {
                         var nlogPath = Path.Combine(System.IO.Directory.GetCurrentDirectory(), "nlog.config");
-                        var logFactory = new NLog.LogFactory();
+                        var logFactory = new LogFactory();
                         logFactory.Setup().LoadConfigurationFromFile(nlogPath);
                         logFactory.ServiceRepository.RegisterService(typeof(IJsonConverter), new JsonNetSerializer());
                         return logFactory;
@@ -114,7 +113,8 @@ private static void ConfigureServices(ServiceCollection services)
                 .AddSingleton<IMessageService, MessageService>()
                 .AddSingleton<ISettingsService, SettingsService>()
                 .AddSingleton<IUpdateService, UpdateService>()
-                .AddSingleton<IGitHubClient>(ServiceProvider => {
+                .AddSingleton<IGitHubClient>(ServiceProvider =>
+                {
                     return new GitHubClient(new ProductHeaderValue("AutoStartConfirm"));
                 });
             AutoStartConnectorService.ConfigureServices(services);

AutoStartConfirm/Properties/Settings.cs

@@ -9,22 +9,26 @@ namespace AutoStartConfirm.Properties
     //  The PropertyChanged event is raised after a setting's value is changed.
     //  The SettingsLoaded event is raised after the setting values are loaded.
     //  The SettingsSaving event is raised before the setting values are saved.
-    internal sealed partial class Settings {
-        
-        public Settings() {
+    internal sealed partial class Settings
+    {
+
+        public Settings()
+        {
             // // To add event handlers for saving and changing settings, uncomment the lines below:
             //
             // this.SettingChanging += this.SettingChangingEventHandler;
             //
             // this.SettingsSaving += this.SettingsSavingEventHandler;
             //
         }
-        
-        private void SettingChangingEventHandler(object sender, SettingChangingEventArgs e) {
+
+        private void SettingChangingEventHandler(object sender, SettingChangingEventArgs e)
+        {
             // Add code to handle the SettingChangingEvent event here.
         }
-        
-        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e)
+        {
             // Add code to handle the SettingsSaving event here.
         }
     }

AutoStartConfirm/Properties/SettingsService.cs

@@ -1,13 +1,13 @@
-using AutoStartConfirm.Notifications;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Configuration;
 
 namespace AutoStartConfirm.Properties
 {
-    public class SettingsService : ISettingsService, IDisposable {
+    public class SettingsService : ISettingsService, IDisposable
+    {
 
         private readonly ILogger<SettingsService> Logger;
 
@@ -16,9 +16,11 @@ public class SettingsService : ISettingsService, IDisposable {
         /// <summary>
         /// Ensures a valid configuration exists and upgrades configuration from a previous version if needed
         /// </summary>
-        private void EnsureConfiguration() {
+        private void EnsureConfiguration()
+        {
             Logger.LogDebug("Ensuring configuration");
-            if (Settings.Default.UpgradeRequired) {
+            if (Settings.Default.UpgradeRequired)
+            {
                 Logger.LogInformation("Upgrading configuration");
                 Settings.Default.Upgrade();
                 Settings.Default.UpgradeRequired = false;
@@ -58,7 +60,8 @@ public bool CheckForUpdatesOnStart
             }
         }
 
-        public string LastNotifiedNewVersion {
+        public string LastNotifiedNewVersion
+        {
             get
             {
                 return Settings.Default.LastNotifiedNewVersion;
@@ -96,7 +99,8 @@ public string LastNotifiedNewVersion {
         /// </summary>
         public void Save() => Settings.Default.Save();
 
-        public SettingsService(ILogger<SettingsService> logger) {
+        public SettingsService(ILogger<SettingsService> logger)
+        {
             Logger = logger;
             EnsureConfiguration();
             Settings.Default.SettingChanging += SettingChangingHandler;
@@ -105,15 +109,18 @@ public SettingsService(ILogger<SettingsService> logger) {
             Settings.Default.SettingsLoaded += SettingsLoadedHandler;
         }
 
-        private void SettingChangingHandler(object sender, SettingChangingEventArgs e) {
+        private void SettingChangingHandler(object sender, SettingChangingEventArgs e)
+        {
             SettingChanging?.Invoke(sender, e);
         }
 
-        private void PropertyChangedHandler(object? sender, PropertyChangedEventArgs e) {
+        private void PropertyChangedHandler(object? sender, PropertyChangedEventArgs e)
+        {
             PropertyChanged?.Invoke(sender, e);
         }
 
-        private void SettingsSavingHandler(object sender, CancelEventArgs e) {
+        private void SettingsSavingHandler(object sender, CancelEventArgs e)
+        {
             Logger.LogInformation("Settings saving");
             SettingsSaving?.Invoke(sender, e);
         }
@@ -124,9 +131,12 @@ private void SettingsLoadedHandler(object sender, SettingsLoadedEventArgs e)
             SettingsLoaded?.Invoke(sender, e);
         }
 
-        protected virtual void Dispose(bool disposing) {
-            if (!disposedValue) {
-                if (disposing) {
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
                     Settings.Default.SettingChanging -= SettingChangingHandler;
                     Settings.Default.PropertyChanged -= PropertyChangedHandler;
                     Settings.Default.SettingsSaving -= SettingsSavingHandler;
@@ -136,7 +146,8 @@ protected virtual void Dispose(bool disposing) {
             }
         }
 
-        public void Dispose() {
+        public void Dispose()
+        {
             Dispose(disposing: true);
             GC.SuppressFinalize(this);
         }