Merge branch 'develop/maintenance' into release/Habu

# Conflicts:
#	appveyor.yml

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.0.4",
+      "version": "5.1.9",
       "commands": [
         "reportgenerator"
       ]
@@ -21,13 +21,13 @@
       ]
     },
     "altcode.gendarme-tool": {
-      "version": "2022.2.17.8350",
+      "version": "2022.5.17.8260",
       "commands": [
         "gendarme"
       ]
     },
     "dotnet-fsharplint": {
-      "version": "0.21.1",
+      "version": "0.21.2",
       "commands": [
         "dotnet-fsharplint"
       ]

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 2
     - uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '6.0.200'
+        dotnet-version: '6.0.301'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -28,11 +28,11 @@ jobs:
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       run: dotnet fake run ./Build/build.fsx
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
           name: nupkgs
           path: _Packagin*/*.nupkg
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: failure()
       with:
           name: reports.windows
@@ -47,14 +47,14 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '6.0.200'
+        dotnet-version: '6.0.301'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
       run: dotnet fake run ./Build/setup.fsx
     - name: Build
       run: dotnet fake run ./Build/build.fsx  
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: failure()
       with:
           name: reports.linux

.gitignore

@@ -83,3 +83,6 @@ CoverageReport-*
 Samples/Sample29/Debug/
 Samples/Sample29/SimpleMix/Debug/
 ThirdParty/*.nupkg
+ThirdParty/gtk-sharp2/atk/
+InternalTrace.*.log
+nunit-agent_*.log

AltCover.Api.Tests/AltCover.Api.Tests.fsproj

@@ -65,8 +65,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="YoloDev.Expecto.TestSdk" Version="1.0.0" Condition="'$(TargetFramework)' != 'net472'" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
   </ItemGroup>
@@ -87,7 +87,7 @@
 
   <ItemGroup>
     <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
-    <PackageReference Update="FSharp.Core" Version="6.0.3">
+    <PackageReference Update="FSharp.Core" Version="6.0.5">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />

AltCover.Api.Tests/FSApiTests.fs

@@ -1301,11 +1301,13 @@ module FSApiTests =
       |> AltCover.AltCover.CollectOptions.Primitive
 
     let prep2 =
-      { pprep with Verbosity = TraceLevel.Error }
+      { pprep with
+          Verbosity = TraceLevel.Error
+          Dependencies = [ "nonesuch.dll" ] }
       |> AltCover.AltCover.PrepareOptions.Primitive
 
     test
-      <@ DotNet.ToTestArguments prep2 coll2 combined = "/p:AltCover=\"true\" /p:AltCoverReportFormat=\"OpenCover\" /p:AltCoverShowStatic=\"-\" /p:AltCoverVerbosity=\"Error\" /p:AltCoverShowSummary=\"R\" /p:AltCoverForce=\"true\" /p:AltCoverFailFast=\"true\"" @>
+      <@ DotNet.ToTestArguments prep2 coll2 combined = "/p:AltCover=\"true\" /p:AltCoverDependencyList=\"nonesuch.dll|\" /p:AltCoverReportFormat=\"OpenCover\" /p:AltCoverShowStatic=\"-\" /p:AltCoverVerbosity=\"Error\" /p:AltCoverShowSummary=\"R\" /p:AltCoverForce=\"true\" /p:AltCoverFailFast=\"true\"" @>
 
   [<Test>]
   let MergeRejectsNonCoverage () =