Basic net9rc2

SteveGilham · Oct 9, 2024 · 2e32f8a · 2e32f8a
1 parent 03a84f0
commit 2e32f8a
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 11 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.8",
+      "version": "5.3.10",
       "commands": [
         "reportgenerator"
       ],
@@ -38,7 +38,7 @@
       "rollForward": false
     },
     "nbgv": {
-      "version": "3.6.141",
+      "version": "3.6.143",
       "commands": [
         "nbgv"
       ],

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-rc.1.24452.12'
+        dotnet-version: '9.0.100-rc.2.24474.11'
     - 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-rc.1.24452.12'
+        dotnet-version: '9.0.100-rc.2.24474.11'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

diff --git a/AltCover.DotNet/AssemblyInfo.fs b/AltCover.DotNet/AssemblyInfo.fs
@@ -10,5 +10,9 @@ open System.Diagnostics.CodeAnalysis
                             Target =
                               "System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute",
                             Justification = "Injected type")>]
-
+[<assembly: SuppressMessage("Microsoft.Performance",
+                            "CA1810:InitializeReferenceTypeStaticFieldsInline",
+                            Scope = "member",
+                            Target = "<StartupCode$AltCover-DotNet>.$DotNet.#.cctor()",
+                            Justification = "F# Compiler did this")>]
 do ()
diff --git a/AltCover.Engine/Main.fs b/AltCover.Engine/Main.fs
@@ -434,9 +434,11 @@ module internal Main =
         tidy (x)
 
     let internal matchType =
-      let os = System.Environment.GetEnvironmentVariable("OS")
-               |> Option.ofObj
-               |> Option.defaultValue String.Empty
+      let os =
+        System.Environment.GetEnvironmentVariable("OS")
+        |> Option.ofObj
+        |> Option.defaultValue String.Empty
+
       Maybe
         (os.Equals("Windows_NT", StringComparison.Ordinal))
         StringComparison.OrdinalIgnoreCase

diff --git a/AltCover.Toolkit/AssemblyInfo.fs b/AltCover.Toolkit/AssemblyInfo.fs
@@ -10,4 +10,9 @@ open System.Diagnostics.CodeAnalysis
                             Target =
                               "System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute",
                             Justification = "Injected type")>]
+[<assembly: SuppressMessage("Microsoft.Performance",
+                            "CA1810:InitializeReferenceTypeStaticFieldsInline",
+                            Scope = "member",
+                            Target = "<StartupCode$AltCover-Toolkit>.$OpenCover.#.cctor()",
+                            Justification = "F# Compiler did this")>]
 do ()
diff --git a/AltCover.UICommon/AssemblyInfo.fs b/AltCover.UICommon/AssemblyInfo.fs
@@ -16,4 +16,11 @@ open System.Runtime.InteropServices
                             Target =
                               "System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute",
                             Justification = "Injected type")>]
+
+[<assembly: SuppressMessage("Microsoft.Performance",
+                            "CA1810:InitializeReferenceTypeStaticFieldsInline",
+                            Scope = "member",
+                            Target =
+                              "<StartupCode$AltCover-UICommon>.$NativeJson.#.cctor()",
+                            Justification = "F# Compiler did this")>]
 ()
diff --git a/Build/DriveApi.fsproj b/Build/DriveApi.fsproj
@@ -16,6 +16,7 @@
     <PackageReference Include="AltCover.Fake" VersionOverride="8.6.14" />
     <PackageReference Include="Fake.Core.Target" />
     <PackageReference Include="Fake.DotNet.Cli" />
+    <PackageReference Include="System.Collections.Immutable" VersionOverride="8.0.0" />
     <PackageReference Include="Unquote" />
   </ItemGroup>
 </Project>
diff --git a/Build/targets.fs b/Build/targets.fs
@@ -1078,8 +1078,8 @@ module Targets =
           |> not)
         !! "./Build/*.fsx" |> Seq.map Path.GetFullPath ]
       |> Seq.concat
-//      |> Seq.map (fun f -> printfn "Linting %A" f
-//                           (doLint f).ExitCode)
+      //      |> Seq.map (fun f -> printfn "Linting %A" f
+      //                           (doLint f).ExitCode)
       |> Seq.map doLintAsync
       |> throttle
       |> Async.RunSynchronously

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.100-rc.2.24474.11",
     "rollForward": "latestMinor"
   }
 }