update package and framework versions

Author: Bertk

.gitignore

@@ -318,3 +318,4 @@ FolderProfile.pubxml
 /NuGet.config
 nuget.config
 *.dmp
+/test/coverlet.core.coverage.tests/System.Private.CoreLib-version.png

CONTRIBUTING.md

@@ -4,9 +4,9 @@ Contributions are highly welcome, however, except for very small changes, kindly
 
 ## Requirements
 
-[.NET SDK 6.0](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
-[.NET SDK 7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
-[.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+STS version [.NET SDK 9.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) for development environment
+
+LTS version [.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) for runtime environment
 
 ## Building the Project
 

Directory.Packages.props

@@ -9,19 +9,19 @@
   </ItemGroup>
   <PropertyGroup>
     <MicrosoftBuildVersion>17.13.9</MicrosoftBuildVersion>
-    <MicrosoftCodeAnalysisVersion>4.12.0</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
     <!-- Test Platform, .NET Test SDK and Object Model  -->
     <MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
     <NugetPackageVersion>6.13.2</NugetPackageVersion>
-    <XunitV3Version>2.0.0</XunitV3Version>
-    <XunitRunnerVisualstudioVersion>3.0.2</XunitRunnerVisualstudioVersion>
+    <XunitV3Version>2.0.2</XunitV3Version>
+    <XunitRunnerVisualstudioVersion>3.1.0</XunitRunnerVisualstudioVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="DotNetConfig" Version="1.2.0" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-    <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.9.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />

Documentation/VSTestIntegration.md

@@ -43,10 +43,10 @@ or
 ```text
 dotnet publish
 ...
-  ... -> C:\project\bin\Debug\net6.0\testdll.dll
-  ... -> C:\project\bin\Debug\net6.0\publish\
+  ... -> C:\project\bin\Debug\net8.0\testdll.dll
+  ... -> C:\project\bin\Debug\net8.0\publish\
 ...
-dotnet vstest C:\project\bin\Debug\net6.0\publish\testdll.dll --collect:"XPlat Code Coverage"
+dotnet vstest C:\project\bin\Debug\net8.0\publish\testdll.dll --collect:"XPlat Code Coverage"
 ```
 
 As you can see in case of `vstest` verb you **must** publish project before.

src/coverlet.core/coverlet.core.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Mono.Cecil" />
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
@@ -25,7 +26,6 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
     <PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" />
   </ItemGroup>
 
 </Project>

test/coverlet.core.tests.samples.netstandard/coverlet.core.tests.samples.netstandard.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
   </ItemGroup>
 
 </Project>

test/coverlet.integration.tests/Msbuild.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Coverlet.Tests.Utils;
 using Xunit;
 
@@ -109,7 +110,7 @@ public void TestMsbuild_CoverletOutput_Folder_FileNameExtension()
     public void TestMsbuild_CoverletOutput_Folder_FileNameExtension_SpecifyFramework()
     {
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0" };
+      string[] targetFrameworks = new string[] { "net8.0" };
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       Assert.False(clonedTemplateProject.IsMultipleTargetFramework());
       string framework = clonedTemplateProject.GetTargetFrameworks().Single();
@@ -152,7 +153,8 @@ public void TestMsbuild_CoverletOutput_Folder_FileNameWithDoubleExtension()
     public void Test_MultipleTargetFrameworkReport_NoCoverletOutput()
     {
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
+      string[] targetFrameworks = new string[] { "net8.0" };
+      string fileToCheck = "";
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
       if (!string.IsNullOrEmpty(standardError))
@@ -168,17 +170,24 @@ public void Test_MultipleTargetFrameworkReport_NoCoverletOutput()
 
       foreach (string targetFramework in targetFrameworks)
       {
-        Assert.True(File.Exists(Path.Combine(clonedTemplateProject.ProjectRootPath, $"coverage.{targetFramework}.json")));
+        //if targetFrameworks has more than one framework
+        fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"coverage.{targetFramework}.json");
+        if (targetFrameworks.Length == 1)
+        {
+          fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"coverage.json");
+        }
+        Assert.True(File.Exists(fileToCheck), $"Expected file '{fileToCheck}'\nOutput:\n{standardOutput}");
       }
 
-      AssertCoverage(clonedTemplateProject, "coverage.*.json");
+      AssertCoverage(clonedTemplateProject, Path.GetFileName(fileToCheck));
     }
 
     [Fact]
     public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder()
     {
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
+      string[] targetFrameworks = new string[] { "net8.0" };
+      string fileToCheck = "";
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       int result = DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
       if (!string.IsNullOrEmpty(standardError))
@@ -195,18 +204,24 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder()
 
       foreach (string targetFramework in targetFrameworks)
       {
-        string fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"coverage.{targetFramework}.json");
+        //if targetFrameworks has more than one framework
+        fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"coverage.{targetFramework}.json");
+        if (targetFrameworks.Length == 1)
+        {
+          fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"coverage.json");
+        }
         Assert.True(File.Exists(fileToCheck), $"Expected file '{fileToCheck}'\nOutput:\n{standardOutput}");
       }
 
-      AssertCoverage(clonedTemplateProject, "coverage.*.json");
+      AssertCoverage(clonedTemplateProject, Path.GetFileName(fileToCheck));
     }
 
     [Fact]
     public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithoutExtension()
     {
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
+      string[] targetFrameworks = new string[] { "net8.0" };
+      string fileToCheck = "";
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
       if (!string.IsNullOrEmpty(standardError))
@@ -222,17 +237,24 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
 
       foreach (string targetFramework in targetFrameworks)
       {
-        Assert.True(File.Exists(Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.{targetFramework}.json")));
+        //if targetFrameworks has more than one framework
+        fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.{targetFramework}.json");
+        if (targetFrameworks.Length == 1)
+        {
+          fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.json");
+        }
+        Assert.True(File.Exists(fileToCheck), $"Expected file '{fileToCheck}'\nOutput:\n{standardOutput}");
       }
 
-      AssertCoverage(clonedTemplateProject, "file.*.json");
+      AssertCoverage(clonedTemplateProject, Path.GetFileName(fileToCheck));
     }
 
     [Fact]
     public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithExtension_SpecifyFramework()
     {
+      Assert.SkipUnless(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "Test requires Windows [net48]");
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
+      string[] targetFrameworks = new string[] { "net8.0", "net48" };
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       Assert.True(clonedTemplateProject.IsMultipleTargetFramework());
       string[] frameworks = clonedTemplateProject.GetTargetFrameworks();
@@ -261,15 +283,15 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
           Assert.False(File.Exists(Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.{targetFramework}.ext")));
         }
       }
-
       AssertCoverage(clonedTemplateProject, "file.*.ext");
     }
 
     [Fact]
     public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithExtension()
     {
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
+      string[] targetFrameworks = new string[] { "net8.0" };
+      string fileToCheck = "";
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file.ext", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
       if (!string.IsNullOrEmpty(standardError))
@@ -285,17 +307,24 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
 
       foreach (string targetFramework in targetFrameworks)
       {
-        Assert.True(File.Exists(Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.{targetFramework}.ext")));
+        //if targetFrameworks has more than one framework
+        fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.{targetFramework}.ext");
+        if (targetFrameworks.Length == 1)
+        {
+          fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.ext");
+        }
+        Assert.True(File.Exists(fileToCheck), $"Expected file '{fileToCheck}'\nOutput:\n{standardOutput}");
       }
 
-      AssertCoverage(clonedTemplateProject, "file.*.ext");
+      AssertCoverage(clonedTemplateProject, Path.GetFileName(fileToCheck));
     }
 
     [Fact]
     public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithDoubleExtension()
     {
       using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
-      string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
+      string[] targetFrameworks = new string[] { "net8.0" };
+      string fileToCheck = "";
       UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
       DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file.ext1.ext2", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
       if (!string.IsNullOrEmpty(standardError))
@@ -311,10 +340,16 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
 
       foreach (string targetFramework in targetFrameworks)
       {
-        Assert.True(File.Exists(Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.ext1.{targetFramework}.ext2")));
+        //if targetFrameworks has more than one framework
+        fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, $"file.ext1.{targetFramework}.ext2");
+        if (targetFrameworks.Length == 1)
+        {
+          fileToCheck = Path.Combine(clonedTemplateProject.ProjectRootPath, "file.ext1.ext2");
+        }
+        Assert.True(File.Exists(fileToCheck), $"Expected file '{fileToCheck}'\nOutput:\n{standardOutput}");
       }
 
-      AssertCoverage(clonedTemplateProject, "file.ext1.*.ext2");
+      AssertCoverage(clonedTemplateProject, Path.GetFileName(fileToCheck));
     }
   }
 }

test/coverlet.tests.projectsample.aspmvcrazor/coverlet.tests.projectsample.aspmvcrazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <IsTestProject>false</IsTestProject>