Get coverage working in VS Code.

Author: tillig

.vscode/settings.json

@@ -6,16 +6,15 @@
     "diagnosers",
     "inheritdoc",
     "langword",
-    "netcoreapp",
     "paramref",
     "seealso",
     "typeparam",
     "unmanaged",
     "xunit"
   ],
-  "coverage-gutters.coverageBaseDir": "artifacts/coverage",
+  "coverage-gutters.coverageBaseDir": "artifacts/logs",
   "coverage-gutters.coverageFileNames": [
-    "coverage.net6.0.info"
+    "**/coverage.cobertura.xml"
   ],
   "dotnet.defaultSolution": "Autofac.Extensions.DependencyInjection.sln",
   "dotnet.preferRuntimeFromSDK": true,
@@ -33,6 +32,10 @@
       "searchNuGetOrgSymbolServer": true
     }
   },
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.patterns": {
+    "*.resx": "$(capture).*.resx, $(capture).designer.cs, $(capture).designer.vb"
+  },
   "files.watcherExclude": {
     "**/target": true
   }

.vscode/tasks.json

@@ -1,5 +1,32 @@
 {
+  "linux": {
+    "options": {
+      "shell": {
+        "args": [
+          "-NoProfile",
+          "-Command"
+        ],
+        "executable": "pwsh"
+      }
+    }
+  },
+  "osx": {
+    "options": {
+      "shell": {
+        "args": [
+          "-NoProfile",
+          "-Command"
+        ],
+        "executable": "/usr/local/bin/pwsh"
+      }
+    }
+  },
   "tasks": [
+    {
+      "command": "If (Test-Path ${workspaceFolder}/artifacts/logs) { Remove-Item ${workspaceFolder}/artifacts/logs -Recurse -Force }; New-Item -Path ${workspaceFolder}/artifacts/logs -ItemType Directory -Force | Out-Null",
+      "label": "create log directory",
+      "type": "shell"
+    },
     {
       "args": [
         "build",
@@ -23,17 +50,17 @@
         "/property:GenerateFullPaths=true",
         "/consoleloggerparameters:NoSummary",
         "--results-directory",
-        "\"artifacts/coverage\"",
+        "\"artifacts/logs\"",
         "--logger:trx",
+        "--collect:\"XPlat Code Coverage\"",
+        "--settings:build/Coverage.runsettings",
         "--filter",
-        "FullyQualifiedName!~Bench",
-        "/p:CoverletOutput=\"${workspaceFolder}/artifacts/coverage/\"",
-        "/p:CollectCoverage=true",
-        "/p:CoverletOutputFormat=lcov",
-        "/p:Exclude=\"[System.*]*\"",
-        "-m:1"
+        "FullyQualifiedName!~Bench"
       ],
       "command": "dotnet",
+      "dependsOn": [
+        "create log directory"
+      ],
       "group": {
         "isDefault": true,
         "kind": "test"
@@ -43,5 +70,18 @@
       "type": "process"
     }
   ],
-  "version": "2.0.0"
+  "version": "2.0.0",
+  "windows": {
+    "options": {
+      "shell": {
+        "args": [
+          "-NoProfile",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command"
+        ],
+        "executable": "pwsh.exe"
+      }
+    }
+  }
 }

test/Autofac.Extensions.DependencyInjection.Integration.Test/Autofac.Extensions.DependencyInjection.Integration.Test.csproj

@@ -11,8 +11,7 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
-    <!-- Implicit usings for web projects don't work in netcoreapp3.1 -->
-    <ImplicitUsings>disable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,13 +33,13 @@
     <ProjectReference Include="..\Integration.Net8\Integration.Net8.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

test/Autofac.Extensions.DependencyInjection.Test/Autofac.Extensions.DependencyInjection.Test.csproj

@@ -27,20 +27,16 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>