Merge pull request #100 from jakubch1/main

Better navigation + upgrade packages
microsoft · Feb 14, 2024 · 6946725 · 6946725
2 parents 71919b6 + 16fe697
commit 6946725
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 40 deletions.
diff --git a/.github/workflows/Calculator_Scenario10.yml b/.github/workflows/Calculator_Scenario10.yml
@@ -28,9 +28,9 @@ jobs:
     - name: Install dotnet-coverage
       run: dotnet tool install -g dotnet-coverage
     - name: Instrument Calculator.Core.dll
-      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Core.dll"
+      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Core.dll"
     - name: Instrument Calculator.Console.dll
-      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Console.dll"
+      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Console.dll"
     - name: Start code coverage collection session
       run: dotnet-coverage collect --session-id TagScenario10 --server-mode --background -f cobertura -o $GITHUB_WORKSPACE/report.cobertura.xml
     - name: Run (add)

diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ Code coverage results: output.coverage.
 
 For existing projects to get latest features and best performance please keep up to date below references:
 ```xml
-<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-<PackageReference Include="Microsoft.CodeCoverage" Version="17.8.0" />
+<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+<PackageReference Include="Microsoft.CodeCoverage" Version="17.9.0" />
 ```
 
 If your solution doesn't contain any C++ code it is recommended to disable native code coverage by adding into configuration below flags:
@@ -67,6 +67,12 @@ Check other configuration options [here](docs/configuration.md).
 * [Configuration](docs/configuration.md)
 * [Performance data](/docs/performance/README.md)
 
+## Samples
+
+* [Unit tests, E2E, console applications, merging, exclusions, static instrumentation](samples/Calculator/README.md)
+* [MSTest Runner, Native AOT](samples/Algorithms/README.md)
+* [Visual Studio](samples/VisualStudio/README.md)
+
 ## Contributing
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

diff --git a/samples/Algorithms/src/Algorithms.Console/Algorithms.Console.csproj b/samples/Algorithms/src/Algorithms.Console/Algorithms.Console.csproj
@@ -13,6 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.10.1" />
+    <PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.10.3" />
   </ItemGroup>
 </Project>
diff --git a/samples/Algorithms/tests/Algorithms.Core.Tests/Algorithms.Core.Tests.csproj b/samples/Algorithms/tests/Algorithms.Core.Tests/Algorithms.Core.Tests.csproj
@@ -13,10 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="3.2.0" />
-    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.10.1" />
-    <PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.10.1" />
+    <PackageReference Include="MSTest" Version="3.2.1" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.0.1" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.10.3" />
+    <PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.10.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Calculator/scenarios/scenario10/README.md b/samples/Calculator/scenarios/scenario10/README.md
@@ -9,8 +9,8 @@ git clone https://github.com/microsoft/codecoverage.git
 cd codecoverage/samples/Calculator/src/Calculator.Console/
 dotnet build
 dotnet tool install -g dotnet-coverage
-dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Core.dll"
-dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Console.dll"
+dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Core.dll"
+dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Console.dll"
 dotnet-coverage collect --session-id TagScenario10 --server-mode --background -f cobertura
 dotnet run --no-build add 10 24
 dotnet run --no-build multiply 10 24
@@ -35,9 +35,9 @@ You can also use [run.ps1](run.ps1) to execute this scenario.
     - name: Install dotnet-coverage
       run: dotnet tool install -g dotnet-coverage
     - name: Instrument Calculator.Core.dll
-      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Core.dll"
+      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Core.dll"
     - name: Instrument Calculator.Console.dll
-      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Console.dll"
+      run: dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Console.dll"
     - name: Start code coverage collection session
       run: dotnet-coverage collect --session-id TagScenario10 --server-mode --background -f cobertura -o $GITHUB_WORKSPACE/report.cobertura.xml
     - name: Run (add)
@@ -92,13 +92,13 @@ steps:
 - task: Bash@3
   inputs:
     targetType: 'inline'
-    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net7.0/Calculator.Core.dll"'
+    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net8.0/Calculator.Core.dll"'
   displayName: 'Instrument Calculator.Core.dll'
 
 - task: Bash@3
   inputs:
     targetType: 'inline'
-    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net7.0/Calculator.Console.dll"'
+    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net8.0/Calculator.Console.dll"'
   displayName: 'Instrument Calculator.Console.dll'
 
 - task: Bash@3

diff --git a/samples/Calculator/scenarios/scenario10/azure-pipelines.yml b/samples/Calculator/scenarios/scenario10/azure-pipelines.yml
@@ -31,13 +31,13 @@ steps:
 - task: Bash@3
   inputs:
     targetType: 'inline'
-    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net7.0/Calculator.Core.dll"'
+    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net8.0/Calculator.Core.dll"'
   displayName: 'Instrument Calculator.Core.dll'
 
 - task: Bash@3
   inputs:
     targetType: 'inline'
-    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net7.0/Calculator.Console.dll"'
+    script: 'dotnet-coverage instrument --session-id TagScenario10 "$(Build.SourcesDirectory)/samples/Calculator/src/Calculator.Console/bin/Debug/net8.0/Calculator.Console.dll"'
   displayName: 'Instrument Calculator.Console.dll'
 
 - task: Bash@3

diff --git a/samples/Calculator/scenarios/scenario10/run.ps1 b/samples/Calculator/scenarios/scenario10/run.ps1
@@ -1,8 +1,8 @@
 cd $PSScriptRoot/../../src/Calculator.Console
 dotnet build
 dotnet tool install -g dotnet-coverage
-dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Core.dll"
-dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net7.0/Calculator.Console.dll"
+dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Core.dll"
+dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calculator.Console.dll"
 dotnet-coverage collect --session-id TagScenario10 --server-mode --background -f cobertura
 dotnet run --no-build add 10 24
 dotnet run --no-build multiply 10 24

diff --git a/samples/Calculator/src/Calculator.Console/Calculator.Console.csproj b/samples/Calculator/src/Calculator.Console/Calculator.Console.csproj
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UseAppHost>true</UseAppHost>

diff --git a/samples/Calculator/src/Calculator.Core/Calculator.Core.csproj b/samples/Calculator/src/Calculator.Core/Calculator.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/Calculator/src/Calculator.Server/Calculator.Server.csproj b/samples/Calculator/src/Calculator.Server/Calculator.Server.csproj
@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/samples/Calculator/tests/Calculator.Console.Tests/Calculator.Console.Tests.csproj b/samples/Calculator/tests/Calculator.Console.Tests/Calculator.Console.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/samples/Calculator/tests/Calculator.Console.Tests/ConsoleTests.cs b/samples/Calculator/tests/Calculator.Console.Tests/ConsoleTests.cs
@@ -44,7 +44,7 @@ private double Execute(string arguments)
         Process process = new Process();
         process.StartInfo = new ProcessStartInfo()
         {
-            FileName = Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "..", "src", "Calculator.Console", "bin", Configuration, "net7.0", fileName),
+            FileName = Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "..", "src", "Calculator.Console", "bin", Configuration, "net8.0", fileName),
             Arguments = arguments,
             UseShellExecute = false,
             CreateNoWindow = true,

diff --git a/samples/Calculator/tests/Calculator.Core.Tests/Calculator.Core.Tests.csproj b/samples/Calculator/tests/Calculator.Core.Tests/Calculator.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...ulator/tests/Calculator.Server.IntegrationTests/Calculator.Server.IntegrationTests.csproj b/...ulator/tests/Calculator.Server.IntegrationTests/Calculator.Server.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Calculator/tests/Calculator.Server.Tests/Calculator.Server.Tests.csproj b/samples/Calculator/tests/Calculator.Server.Tests/Calculator.Server.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.13" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>