Remove unusedparameters and update WebView2 and ,Net

paul1956 · Jan 2, 2024 · 057a2f7 · 057a2f7
1 parent f05ae2c
commit 057a2f7
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/src/CareLink/CareLink.vbproj b/src/CareLink/CareLink.vbproj
@@ -60,7 +60,7 @@
     <PackageReference Include="ClosedXML" Version="0.102.1" />
     <PackageReference Include="DataGridViewDisableButtonColumnEx" Version="1.0.0.1" />
     <PackageReference Include="FreeSpire.PDF" Version="8.6.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2151.40" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
     <PackageReference Include="Octokit" Version="9.0.0" />
     <PackageReference Include="System.Speech" Version="8.0.0" />
     <PackageReference Include="TableLayputPanelTop" Version="1.0.0.3" />

diff --git a/src/CareLink/Forms/Form1.vb b/src/CareLink/Forms/Form1.vb
@@ -2298,9 +2298,8 @@ Public Class Form1
                 .ChartAreas(NameOf(ChartArea)).AxisY.Maximum = Math.Ceiling(maxActiveInsulin) + 1
                 .PlotSuspendArea(Me.ActiveInsulinSuspendSeries)
                 .PlotMarkers(Me.ActiveInsulinTimeChangeSeries,
-                             _summaryChartAbsoluteRectangle,
-                             s_activeInsulinMarkerInsulinDictionary,
-                             Nothing)
+                    s_activeInsulinMarkerInsulinDictionary,
+                    Nothing)
                 .PlotSgSeries(GetYMinValue(NativeMmolL))
                 .PlotHighLowLimitsAndTargetSg(True)
             End With
@@ -2322,9 +2321,8 @@ Public Class Form1
                 .Titles(0).Text = $"Status - {s_listOfManualBasal.GetSubTitle}"
                 .PlotSuspendArea(Me.SummarySuspendSeries)
                 .PlotMarkers(Me.SummaryTimeChangeSeries,
-                             _summaryChartAbsoluteRectangle,
-                             s_summaryMarkerInsulinDictionary,
-                             s_summaryMarkerMealDictionary)
+                    s_summaryMarkerInsulinDictionary,
+                    s_summaryMarkerMealDictionary)
                 .PlotSgSeries(GetYMinValue(NativeMmolL))
                 .PlotHighLowLimitsAndTargetSg(False)
                 Application.DoEvents()

diff --git a/src/CareLink/Helpers/Charting/PlotMarkers.vb b/src/CareLink/Helpers/Charting/PlotMarkers.vb
@@ -57,7 +57,7 @@ Friend Module PlotMarkers
     End Function
 
     <Extension>
-    Friend Sub PlotMarkers(pageChart As Chart, timeChangeSeries As Series, chartRelativePosition As RectangleF, markerInsulinDictionary As Dictionary(Of OADate, Single), markerMealDictionary As Dictionary(Of OADate, Single), <CallerMemberName> Optional memberName As String = Nothing, <CallerLineNumber()> Optional sourceLineNumber As Integer = 0)
+    Friend Sub PlotMarkers(pageChart As Chart, timeChangeSeries As Series, markerInsulinDictionary As Dictionary(Of OADate, Single), markerMealDictionary As Dictionary(Of OADate, Single))
         Dim lastTimeChangeRecord As TimeChangeRecord = Nothing
         markerInsulinDictionary.Clear()
         markerMealDictionary?.Clear()

diff --git a/src/CareLink/Helpers/Form1Helpers/Form1NotificationTabHelpers.vb b/src/CareLink/Helpers/Form1Helpers/Form1NotificationTabHelpers.vb
@@ -16,7 +16,7 @@ Friend Module Form1NotificationTabHelpers
             NameOf(ClearedNotificationsRecord.referenceGUID)
         }
 
-    Private Sub CreateNotificationTables(notificationDictionary As Dictionary(Of String, String), tableLevel1Blue As TableLayoutPanel, itemIndex As ItemIndexes, filterJsonData As Boolean)
+    Private Sub CreateNotificationTables(notificationDictionary As Dictionary(Of String, String), tableLevel1Blue As TableLayoutPanel)
         tableLevel1Blue.AutoScroll = True
         tableLevel1Blue.AutoSize = True
         tableLevel1Blue.BorderStyle = BorderStyle.FixedSingle
@@ -121,9 +121,7 @@ Friend Module Form1NotificationTabHelpers
             Next
             Form1.TableLayoutPanelNotificationHistory.Controls.Add(innerTableBlue, 0, 1)
             CreateNotificationTables(s_notificationHistoryValue,
-                                     innerTableBlue,
-                                     ItemIndexes.notificationHistory,
-                                     s_filterJsonData)
+                innerTableBlue)
         Catch ex As Exception
             Stop
             Throw

diff --git a/src/CareLink/obj/CareLink.vbproj.nuget.g.props b/src/CareLink/obj/CareLink.vbproj.nuget.g.props
@@ -44,6 +44,6 @@
     </Content>
   </ItemGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Web_WebView2 Condition=" '$(PkgMicrosoft_Web_WebView2)' == '' ">C:\Users\PaulM\.nuget\packages\microsoft.web.webview2\1.0.2151.40</PkgMicrosoft_Web_WebView2>
+    <PkgMicrosoft_Web_WebView2 Condition=" '$(PkgMicrosoft_Web_WebView2)' == '' ">C:\Users\PaulM\.nuget\packages\microsoft.web.webview2\1.0.2210.55</PkgMicrosoft_Web_WebView2>
   </PropertyGroup>
 </Project>
diff --git a/src/CareLink/obj/CareLink.vbproj.nuget.g.targets b/src/CareLink/obj/CareLink.vbproj.nuget.g.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.web.webview2\1.0.2151.40\build\Microsoft.Web.WebView2.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.web.webview2\1.0.2151.40\build\Microsoft.Web.WebView2.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.web.webview2\1.0.2210.55\build\Microsoft.Web.WebView2.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.web.webview2\1.0.2210.55\build\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
 </Project>
diff --git a/src/CareLink/obj/project.assets.json b/src/CareLink/obj/project.assets.json
@@ -210,7 +210,7 @@
           "lib/netstandard1.0/_._": {}
         }
       },
-      "Microsoft.Web.WebView2/1.0.2151.40": {
+      "Microsoft.Web.WebView2/1.0.2210.55": {
         "type": "package",
         "compile": {
           "lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll": {
@@ -2062,10 +2062,10 @@
         "runtime.json"
       ]
     },
-    "Microsoft.Web.WebView2/1.0.2151.40": {
-      "sha512": "OPWjZVJvYhDm4Jq+7QdsQfEgv2QHrkaqUkdk4i9FahatsOJ4cIaVLfnDHGsKjcxGqCVX+Lo4mi4Lqh5hcgfsdw==",
+    "Microsoft.Web.WebView2/1.0.2210.55": {
+      "sha512": "pb5kuzl8TQm+ztzOnOm/qX75DXXjOQMdKlcs2hyizbZobiGzJcMcIhpmMmgg1cTGYwof2fVhlC809YScvDbm3w==",
       "type": "package",
-      "path": "microsoft.web.webview2/1.0.2151.40",
+      "path": "microsoft.web.webview2/1.0.2210.55",
       "hasTools": true,
       "files": [
         ".nupkg.metadata",
@@ -2106,7 +2106,7 @@
         "lib/netcoreapp3.0/Microsoft.Web.WebView2.WinForms.xml",
         "lib/netcoreapp3.0/Microsoft.Web.WebView2.Wpf.dll",
         "lib/netcoreapp3.0/Microsoft.Web.WebView2.Wpf.xml",
-        "microsoft.web.webview2.1.0.2151.40.nupkg.sha512",
+        "microsoft.web.webview2.1.0.2210.55.nupkg.sha512",
         "microsoft.web.webview2.nuspec",
         "runtimes/win-arm64/native/WebView2Loader.dll",
         "runtimes/win-arm64/native_uap/Microsoft.Web.WebView2.Core.dll",
@@ -5689,7 +5689,7 @@
       "ClosedXML >= 0.102.1",
       "DataGridViewDisableButtonColumnEx >= 1.0.0.1",
       "FreeSpire.PDF >= 8.6.0",
-      "Microsoft.Web.WebView2 >= 1.0.2151.40",
+      "Microsoft.Web.WebView2 >= 1.0.2210.55",
       "Octokit >= 9.0.0",
       "System.Speech >= 8.0.0",
       "TableLayputPanelTop >= 1.0.0.3",
@@ -5731,6 +5731,11 @@
           "targetAlias": "net8.0-windows10.0.17763.0",
           "projectReferences": {}
         }
+      },
+      "restoreAuditProperties": {
+        "enableAudit": "true",
+        "auditLevel": "low",
+        "auditMode": "direct"
       }
     },
     "frameworks": {
@@ -5751,7 +5756,7 @@
           },
           "Microsoft.Web.WebView2": {
             "target": "Package",
-            "version": "[1.0.2151.40, )"
+            "version": "[1.0.2210.55, )"
           },
           "Octokit": {
             "target": "Package",