net9pv7 passes static analysis

SteveGilham · Aug 15, 2024 · 2b16de0 · 2b16de0
1 parent 6a7f773
commit 2b16de0
Show file tree

Hide file tree

Showing 21 changed files with 246 additions and 260 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '9.0.100-preview.6.24328.19'
+        dotnet-version: '9.0.100-preview.7.24407.12'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -63,7 +63,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '9.0.100-preview.6.24328.19'
+        dotnet-version: '9.0.100-preview.7.24407.12'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

diff --git a/AltCover.Avalonia/MainWindow.fs b/AltCover.Avalonia/MainWindow.fs
@@ -841,7 +841,11 @@ type MainWindow() as this =
       "exit" ]
     |> Seq.iter (fun n ->
       let cap =
-        n.First().ToString().ToUpper() + n.Substring(1)
+        n
+          .First()
+          .ToString()
+          .ToUpper(CultureInfo.InvariantCulture)
+        + n.Substring(1)
 
       let raw =
         Resource.GetResourceString(n + "Button.Label")
@@ -1091,8 +1095,9 @@ type MainWindow() as this =
                 t.Text <- String.Empty
                 // clear format stashes -- TODO
 #if !AVALONIA11
-                t.FormattedText.Spans <- []
-                t.Tag <- t.FormattedText.Spans
+                let ft = t.FormattedText
+                ft.Spans <- []
+                t.Tag <- ft.Spans
 #endif
               )
 
@@ -1159,4 +1164,10 @@ type MainWindow() as this =
                             Target = "AltCover.MainWindow",
                             Justification = "God Object, alas")>]
 #endif
+[<assembly: SuppressMessage("Gendarme.Rules.Smells",
+                            "AvoidSwitchStatementsRule",
+                            Scope = "member", // MethodDefinition
+                            Target =
+                              "AltCover.MainWindow/tagByCoverage@422::Invoke(Avalonia.Controls.Presenters.TextPresenter,Microsoft.FSharp.Collections.FSharpList`1<Avalonia.Media.FormattedTextLine>,AltCover.GuiCommon/CodeTag)",
+                            Justification = "Wrong paradigm")>]
 ()
diff --git a/AltCover.Avalonia/Persistence.fs b/AltCover.Avalonia/Persistence.fs
@@ -1,6 +1,7 @@
 namespace AltCover
 
 open System
+open System.Diagnostics.CodeAnalysis
 
 open Avalonia
 open Avalonia.Controls

diff --git a/AltCover.DotNet/DotNet.fs b/AltCover.DotNet/DotNet.fs
@@ -226,14 +226,15 @@ module DotNet =
 [<assembly: SuppressMessage("Microsoft.Performance",
                             "CA1810:InitializeReferenceTypeStaticFieldsInline",
                             Scope = "member",
-                            Target = "<StartupCode$AltCover-DotNet>.$DotNet.#.cctor()",
+                            Target = "AltCover.DotNet.#.cctor()",
                             Justification = "Compiler generated")>]
 #else
-[<assembly: SuppressMessage("Microsoft.Performance",
-                            "CA1810:InitializeReferenceTypeStaticFieldsInline",
-                            Scope = "member",
-                            Target =
-                              "<StartupCode$AltCover-Fake-DotNet-Testing-AltCover>.$DotNet.#.cctor()",
-                            Justification = "Compiler generated")>]
+//[<assembly: SuppressMessage("Microsoft.Performance",
+//                            "CA1810:InitializeReferenceTypeStaticFieldsInline",
+//                            Scope = "member",
+//                            Target =
+//                              "<StartupCode$AltCover-Fake-DotNet-Testing-AltCover>.$DotNet.#.cctor()",
+//                            Justification = "Compiler generated")>]
+
 #endif
 ()