Remove form.Closing and replace with FormClosing

paul1956 · Jul 22, 2024 · c2b48b6 · c2b48b6
1 parent b5858f9
commit c2b48b6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -30,9 +30,13 @@ A directory MyDocuments/CareLink/Settings contains a Settings File which is init
 - Lastly is an area where you can enter your Carb Ratio by time.
 
 ## Updated
-05/01/2024
+07/22/2024
 
 ## What's New
+ New in 4.0.1.5
+  - Update NuGet packages
+  - Remove form.Closing and replace with FormClosing
+
  New in 4.0.1.3
  - Fix another login issue after EU Server Update #59
  - Update NuGet Packages

diff --git a/src/CareLink/CareLink.vbproj b/src/CareLink/CareLink.vbproj
@@ -22,9 +22,9 @@
     <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
     <RepositoryUrl>https://github.com/paul1956/CareLink</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>4.0.1.4</Version>
-    <AssemblyVersion>4.0.1.4</AssemblyVersion>
-    <FileVersion>4.0.1.4</FileVersion>
+    <Version>4.0.1.5</Version>
+    <AssemblyVersion>4.0.1.5</AssemblyVersion>
+    <FileVersion>4.0.1.5</FileVersion>
     <PackageIcon>IconImage.png</PackageIcon>
     <PackageIconUrl />
     <PackageProjectUrl>https://github.com/paul1956/CareLink</PackageProjectUrl>
@@ -62,7 +62,7 @@
     <PackageReference Include="DataGridViewDisableButtonColumnEx" Version="1.0.0.1" />
     <PackageReference Include="FreeSpire.PDF" Version="10.2.0" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
-    <PackageReference Include="Octokit" Version="12.0.0" />
+    <PackageReference Include="Octokit" Version="13.0.1" />
     <PackageReference Include="System.Speech" Version="9.0.0-preview.2.24128.5" />
     <PackageReference Include="TableLayputPanelTop" Version="1.0.0.3" />
     <PackageReference Include="ToolStripComboBoxEx" Version="1.0.0.2" />

diff --git a/src/CareLink/Forms/Form1.vb b/src/CareLink/Forms/Form1.vb
@@ -76,7 +76,7 @@ Public Class Form1
     '' Overloaded System Windows Handler.
     '' </summary>
     '' <param name="m">Message <see cref="Message"/> structure</param>
-    <System.Diagnostics.DebuggerNonUserCode()>
+    <DebuggerNonUserCode()>
     Protected Overrides Sub WndProc(ByRef m As Message)
         Select Case m.Msg
             Case WM_POWERBROADCAST
@@ -1023,7 +1023,7 @@ Public Class Form1
         ControlPaint.DrawBorder(e.Graphics, e.ClipRectangle, Color.LimeGreen, ButtonBorderStyle.Solid)
     End Sub
 
-    Private Sub Form1_Closing(sender As Object, e As CancelEventArgs) Handles MyBase.Closing
+    Private Sub Form1_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
         Me.CleanUpNotificationIcon()
         If _webViewProcessId > 0 Then
             Dim webViewProcess As Process = Process.GetProcessById(_webViewProcessId)
@@ -1041,10 +1041,6 @@ Public Class Form1
         End If
     End Sub
 
-    Private Sub Form1_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
-        Me.CleanUpNotificationIcon()
-    End Sub
-
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         If My.Settings.UpgradeRequired Then
             My.Settings.Upgrade()

diff --git a/src/CareLink/Forms/SgMiniForm.vb b/src/CareLink/Forms/SgMiniForm.vb
@@ -83,7 +83,7 @@ Public Class SgMiniForm
 
     End Sub
 
-    Private Sub SgMiniWindow_Closing(sender As Object, e As CancelEventArgs) Handles MyBase.Closing
+    Private Sub SgMiniForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
         _form1.Visible = True
     End Sub
 

diff --git a/src/CareLink/obj/project.assets.json b/src/CareLink/obj/project.assets.json
@@ -316,7 +316,7 @@
           }
         }
       },
-      "Octokit/12.0.0": {
+      "Octokit/13.0.1": {
         "type": "package",
         "compile": {
           "lib/netstandard2.0/Octokit.dll": {
@@ -1827,16 +1827,16 @@
         "microsoft.web.webview2.devtoolsprotocolextension.nuspec"
       ]
     },
-    "Octokit/12.0.0": {
-      "sha512": "7LAFFcirR/IaC84Uy+L1L+yqlYHxaMjHPt5GeLkB/GG0ujl7IgWWcL3VHMwMB3Y76Spsz0lMnPKub4EeosSljg==",
+    "Octokit/13.0.1": {
+      "sha512": "tjXTa2FXzbd3n17VWpi8UXe05EIJqHcWJW8C2kukftIve00duWiZL8x4i1vlZQ0zQ4RbRANbRc7J5K7Co/1spQ==",
       "type": "package",
-      "path": "octokit/12.0.0",
+      "path": "octokit/13.0.1",
       "files": [
         ".nupkg.metadata",
         ".signature.p7s",
         "lib/netstandard2.0/Octokit.dll",
         "lib/netstandard2.0/Octokit.xml",
-        "octokit.12.0.0.nupkg.sha512",
+        "octokit.13.0.1.nupkg.sha512",
         "octokit.nuspec",
         "octokit.png"
       ]
@@ -4394,7 +4394,7 @@
       "DataGridViewDisableButtonColumnEx >= 1.0.0.1",
       "FreeSpire.PDF >= 10.2.0",
       "Microsoft.Web.WebView2 >= 1.0.2592.51",
-      "Octokit >= 12.0.0",
+      "Octokit >= 13.0.1",
       "System.Speech >= 9.0.0-preview.2.24128.5",
       "TableLayputPanelTop >= 1.0.0.3",
       "ToolStripComboBoxEx >= 1.0.0.2",
@@ -4407,7 +4407,7 @@
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
   },
   "project": {
-    "version": "4.0.1.4",
+    "version": "4.0.1.5",
     "restore": {
       "projectUniqueName": "C:\\Users\\PaulM\\Source\\Repos\\CareLink\\src\\CareLink\\CareLink.vbproj",
       "projectName": "CareLink",
@@ -4439,7 +4439,7 @@
       "restoreAuditProperties": {
         "enableAudit": "true",
         "auditLevel": "low",
-        "auditMode": "direct"
+        "auditMode": "all"
       }
     },
     "frameworks": {
@@ -4464,7 +4464,7 @@
           },
           "Octokit": {
             "target": "Package",
-            "version": "[12.0.0, )"
+            "version": "[13.0.1, )"
           },
           "System.Speech": {
             "target": "Package",