Update DiffEngineTray to net10 (#660)

Author: SimonCropp

src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj

@@ -1,7 +1,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <NoWarn>CA1416</NoWarn>
   </PropertyGroup>
   <ItemGroup>

src/DiffEngineTray/DiffEngineTray.csproj

@@ -2,13 +2,12 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PackAsTool>True</PackAsTool>
     <Description>A utility that runs in the windows tray and handles the results of file differences.</Description>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <NoWarn>NETSDK1137;WFAC010;NU5119</NoWarn>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>

src/DiffEngineTray/Program.cs

@@ -5,6 +5,9 @@ static class Program
     static async Task Main()
     {
         Logging.Init();
+        Application.EnableVisualStyles();
+        Application.SetCompatibleTextRenderingDefault(false);
+        Application.SetHighDpiMode(HighDpiMode.SystemAware);
 
         try
         {

src/DiffEngineTray/Settings/HotKeyControl.cs

@@ -7,6 +7,7 @@ public HotKeyControl()
         keyCombo.Items.AddRange(GetAlphabet().ToArray());
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public HotKey? HotKey
     {
         get
@@ -39,12 +40,14 @@ public HotKey? HotKey
         }
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string Label
     {
         get => hotKeyEnabled.Text;
         set => hotKeyEnabled.Text = value;
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string? Help
     {
         get => (string?) helpLabel.Text;

src/DiffEngineTray/Settings/OptionsFormLauncher.cs

@@ -2,12 +2,6 @@ static class OptionsFormLauncher
 {
     static OptionsForm? instance;
 
-    static EventHandler formOnClosed = (_, _) =>
-    {
-        instance!.Closed -= formOnClosed;
-        instance = null;
-    };
-
     public static async Task Launch(KeyRegister keyRegister, Tracker tracker)
     {
         if (instance != null)
@@ -21,8 +15,8 @@ public static async Task Launch(KeyRegister keyRegister, Tracker tracker)
             settings,
             newSettings => Save(keyRegister, tracker, newSettings));
         instance = form;
-        form.Closed += formOnClosed;
-        form.ShowDialog();
+        await form.ShowDialogAsync();
+        instance = null;
     }
 
     static async Task<IReadOnlyCollection<string>> Save(KeyRegister keyRegister, Tracker tracker, Settings settings)