Try Microsoft testing platform integration

.github/workflows/dotnet.yml

@@ -0,0 +1,217 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  BuildConfiguration: debug
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    timeout-minutes: 30
+    permissions:
+      pull-requests: write
+      contents: read
+      checks: write
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+          fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+
+    - name: Setup .NET 9.0
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.0.x
+#        source-url: https://pkgs.dev.azure.com/tonerdo/coverlet/_packaging/coverlet-nightly/nuget/v3/index.json
+#      env:
+#         NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_TOKEN }}
+
+    - name: Setup .NET 8.0
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+#        source-url: https://pkgs.dev.azure.com/tonerdo/coverlet/_packaging/coverlet-nightly/nuget/v3/index.json
+#      env:
+#          NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_TOKEN }}
+
+    - name: Restore dependencies
+      run: dotnet restore coverlet.sln
+
+    - name: Build
+      run: |
+        dotnet build coverlet.sln --no-restore -bl:build.binlog -c ${{env.BuildConfiguration}}
+        dotnet build coverlet.sln --no-restore -bl:build.binlog -c release
+        dotnet pack -c ${{env.BuildConfiguration}}
+        dotnet pack -c release
+
+    # - name: Archive production artifacts
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: dist-bin-and-packages
+    #     retention-days: 5
+    #     path: |
+    #       artifacts/bin
+    #       artifacts/package
+    #       artifacts/publish
+    #       artifacts/log
+    #       *.binlog
+
+  # Fail if there are any failed tests
+  #
+  # We support all current LTS versions of .NET and Windows, Mac and Linux.
+  #
+  # To check for failing tests locally run `dotnet test`.
+
+  # test:
+  #     name: Tests for .net core ${{ matrix.framework }} on ${{ matrix.os }}
+  #     needs: build
+  #     runs-on: ${{ matrix.os }}
+  #     strategy:
+  #       matrix:
+  #         os: [ubuntu-latest, windows-latest, macos-latest]
+  #         framework: ['net9.0', 'net8.0']
+  #     timeout-minutes: 30
+  #     permissions:
+  #       pull-requests: write
+  #     steps:
+  #       - name: Checkout
+  #         uses: actions/checkout@v4
+  #         with:
+  #           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+
+  #       - name: Setup .NET 9.0
+  #         uses: actions/setup-dotnet@v4
+  #         with:
+  #           dotnet-version: 9.0.x
+
+  #       - name: Setup dotnet 8.0
+  #         uses: actions/setup-dotnet@v4
+  #         with:
+  #           dotnet-version: '8.0.x'
+
+  #       - name: Download packages and artifacts
+  #         uses: actions/download-artifact@v4
+  #         with:
+  #           name: dist-bin-and-packages
+
+    - run: |
+        echo "Test using script"
+        dotnet build-server shutdown
+        dotnet test ./test/coverlet.core.tests/coverlet.core.tests.csproj -c ${{env.BuildConfiguration}} --no-build  -bl:test.core.binlog /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.projectsample]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" -- --results-directory "./artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.core.tests.trx" --diagnostic --diagnostic-output-directory "./artifacts/log/${{env.BuildConfiguration}}" --diagnostic-output-fileprefix "coverlet.core.tests"
+        dotnet build-server shutdown
+        dotnet test ./test/coverlet.msbuild.tasks.tests/coverlet.msbuild.tasks.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.msbuild.binlog --results-directory:"./artifacts/reports" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.xunit.extensions]*%2c[coverlet.tests.projectsample]*%2c[testgen_]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" --diag:"./artifacts/log/${{env.BuildConfiguration}}/coverlet.msbuild.test.diag.log;tracelevel=verbose"
+        dotnet build-server shutdown
+        dotnet test ./test/coverlet.collector.tests/coverlet.collector.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.collector.binlog /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.projectsample]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" --diag:"./artifacts/log/${{env.BuildConfiguration}}/coverlet.collector.test.diag.log;tracelevel=verbose"
+        dotnet build-server shutdown
+        dotnet test ./test/coverlet.integration.tests/coverlet.integration.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.integration.binlog -- --results-directory "./artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "./artifacts/log/${{env.BuildConfiguration}}" --diagnostic-output-fileprefix "coverlet.integration.tests"
+      name: Run unit tests with coverage
+      env:
+        MSBUILDDISABLENODEREUSE: 1
+
+    # - run: |
+    #     echo "Test using script"
+    #     dotnet build-server shutdown
+    #     dotnet test ./test/coverlet.core.coverage.tests/coverlet.core.coverage.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.core.coverage.binlog /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.projectsample]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" -- --results-directory "./artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.core.coverage.tests.trx" --diagnostic --diagnostic-output-directory "./artifacts/log/${{env.BuildConfiguration}}" --diagnostic-output-fileprefix "coverlet.core.coverage.tests"
+    #   name: Run unit test coverlet.core.coverage.tests
+    #   if: success() && matrix.os  == 'windows-latest'
+    #   env:
+    #     MSBUILDDISABLENODEREUSE: 1
+
+    - name: ReportGenerator
+      uses: danielpalme/ReportGenerator-GitHub-Action@5
+      if: success() && matrix.os  == 'windows-latest'
+      with:
+        reports: ./artifacts/reports/**/*.cobertura.xml
+        assemblyfilters: -xunit*
+        targetdir: ./artifacts/reports
+        reporttypes: HtmlInline;Cobertura;MarkdownSummaryGithub;lcov
+
+    - name: Add Coverage PR Comment
+      uses: marocchino/sticky-pull-request-comment@v2
+      if: success() && matrix.os  == 'windows-latest' && github.event_name == 'pull_request'
+      with:
+        recreate: true
+        path: ./artifacts/reports/SummaryGithub.md
+
+    - name: Write to Job Summary
+      if: matrix.os  == 'windows-latest'
+      run: cat ./artifacts/reports/SummaryGithub.md >> $GITHUB_STEP_SUMMARY
+      shell: bash
+
+    - name: Upload Test Result Files
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: test-results-${{ matrix.os }}
+        path: ${{ github.workspace }}/artifacts/reports/**/*
+        retention-days: 5
+
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action/linux@v2
+      if: ${{ !cancelled() && matrix.os == 'ubuntu-latest' }}
+      with:
+        files: |
+             ${{ github.workspace }}/artifacts/reports/**/*.trx
+             ${{ github.workspace }}/test/**/*.trx
+        check_name: "Unit Tests ${{ matrix.os }}"
+        comment_mode: failures
+        compare_to_earlier_commit: false
+
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action/macos@v2
+      if: ${{ !cancelled() && matrix.os == 'macos-latest' }}
+      with:
+        files: |
+             ${{ github.workspace }}/artifacts/reports/**/*.trx
+             ${{ github.workspace }}/test/**/*.trx
+        check_name: "Unit Tests ${{ matrix.os }}"
+        comment_mode: failures
+        compare_to_earlier_commit: false
+
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action/windows@v2
+      if: ${{ !cancelled() && matrix.os  == 'windows-latest' }}
+      with:
+        files: |
+             ${{ github.workspace }}/artifacts/reports/**/*.trx
+             ${{ github.workspace }}/test/**/*.trx
+        check_name: "Unit Tests ${{ matrix.os }}"
+        comment_mode: failures
+        compare_to_earlier_commit: false
+
+    # - uses: bibipkins/[email protected]
+    #   with:
+    #     github-token: ${{ secrets.GITHUB_TOKEN }}
+    #     comment-title: 'Unit Test Results ${{ matrix.os }}'
+    #     results-path: |
+    #       ./artifacts/reports/**/*.trx
+    #       ./test/**/*.trx
+    #     coverage-path: |
+    #       ./artifacts/bin/**/*.cobertura.xml
+    #       ./artifacts/reports/**/*.cobertura.xml
+    #       ./test/**/*.cobertura.xml
+    #     coverage-threshold: 80
+    #     coverage-type: cobertura
+    #     show-failed-tests-only: true
+    #     show-test-output: true
+
+    # - name: Upload coverage report artifact
+    #   if: success() && matrix.os  == 'windows-latest'
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: CoverageReport.${{matrix.os}}.${{matrix.framework}} # Artifact name
+    #     path: ./artifacts/CoverageReport # Directory containing files to upload
+    #     overwrite: true

.gitignore

@@ -318,3 +318,4 @@ FolderProfile.pubxml
 /NuGet.config
 nuget.config
 *.dmp
+Playground*/

BannedSymbols.txt

@@ -0,0 +1,10 @@
+T:System.ArgumentNullException; Use 'Guard' instead
+P:System.DateTime.Now; Use 'IClock' instead
+P:System.DateTime.UtcNow; Use 'IClock' instead
+M:System.Threading.Tasks.Task.Run(System.Action); Use 'ITask' instead
+M:System.Threading.Tasks.Task.WhenAll(System.Threading.Tasks.Task[]); Use 'ITask' instead
+M:System.Threading.Tasks.Task.WhenAll(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task}); Use 'ITask' instead
+M:System.String.IsNullOrEmpty(System.String); Use 'RoslynString.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'RoslynString.IsNullOrWhiteSpace' instead
+M:System.Diagnostics.Debug.Assert(System.Boolean); Use 'RoslynDebug.Assert' instead
+M:System.Diagnostics.Debug.Assert(System.Boolean,System.String); Use 'RoslynDebug.Assert' instead

Directory.Build.props

@@ -2,6 +2,9 @@
 <Project>
   <PropertyGroup>
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+    <NetCurrent>net9.0</NetCurrent>
+    <NetMinimum>net8.0</NetMinimum>
+    <FullFrameworkTFM>net472</FullFrameworkTFM>
     <!-- enforce CamelCase case string-->
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <!-- SourceLink Setup -->
@@ -39,12 +42,12 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <VSTestResultsDirectory>$(RepoRoot)artifacts/testresults/$(Configuration.ToLowerInvariant())</VSTestResultsDirectory>
+    <VSTestResultsDirectory>$(RepoRoot)artifacts/reports/$(Configuration.ToLowerInvariant())</VSTestResultsDirectory>
     <VSTestLogger>@(VSTestLogger)</VSTestLogger>
   </PropertyGroup>
 
     <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <VSTestResultsDirectory>$(RepoRoot)artifacts\testresults\$(Configuration.ToLowerInvariant())</VSTestResultsDirectory>
+    <VSTestResultsDirectory>$(RepoRoot)artifacts\reports\$(Configuration.ToLowerInvariant())</VSTestResultsDirectory>
     <VSTestLogger>@(VSTestLogger)</VSTestLogger>
   </PropertyGroup>
 
@@ -79,4 +82,14 @@
     -->
   </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+    <!-- This should be enabled in another PR -->
+    <!-- <ItemGroup>
+        <AdditionalFiles Include="$(MSBuildThisFileDirectory)/BannedSymbols.txt" />
+    </ItemGroup> -->
 </Project>

Directory.Packages.props

@@ -4,42 +4,49 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <!--<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />-->
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
   </ItemGroup>
   <PropertyGroup>
-    <MicrosoftBuildVersion>17.13.9</MicrosoftBuildVersion>
-    <MicrosoftCodeAnalysisVersion>4.12.0</MicrosoftCodeAnalysisVersion>
+    <MicrosoftBuildVersion>17.11.4</MicrosoftBuildVersion>
+    <MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
     <!-- Test Platform, .NET Test SDK and Object Model  -->
     <MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
+    <MicrosoftTestingPlatformVersion>1.7.1</MicrosoftTestingPlatformVersion>
     <NugetPackageVersion>6.13.2</NugetPackageVersion>
     <XunitV3Version>2.0.0</XunitV3Version>
     <XunitRunnerVisualstudioVersion>3.0.2</XunitRunnerVisualstudioVersion>
+    <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
+    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
+    <MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
   </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.CodeAnalysis.BannedApiAnalyzers" Version="5.0.0-1.25277.114" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
     <!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
-    <!-- Microsoft.TestPlatform.ObjectModel has a dependency to NuGet.Frameworks with specific version -->
-    <!-- https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L36-->
-    <!-- wrong configuration will create "build\coverlet.msbuild.targets(72,5): error : Unable to read beyond the end of the stream."  -->
-    <!--
-         vstest 17.5 version /scripts/build/TestPlatform.Dependencies.props
-         https://github.com/microsoft/vstest/blob/81f87947b316a4faf2bcb5b8c8fa1591baafcc39/scripts/build/TestPlatform.Dependencies.props#L57
-         vstest 17.8 version
-         NuGetFrameworksVersion is defined here https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/eng/Versions.props#L94C1-L94C1
-    -->
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <!--<PackageVersion Include="MSTest.TestFramework" Version="3.9.1" />-->
+    <!-- Microsoft Testing Platform-->
+    <PackageVersion Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" />
+    <!--<PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Platform.MSTest" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Platform.MSTest.Extensions" Version="$(MicrosoftTestingPlatformVersion)" />-->
+    <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="MSTest" Version="3.9.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.9.1" />
+    <!-- Nuget -->
     <PackageVersion Include="NuGet.Frameworks" Version="$(NugetPackageVersion)" />
     <PackageVersion Include="NuGet.Packaging" Version="$(NugetPackageVersion)" />
     <PackageVersion Include="NuGet.Versioning" Version="$(NugetPackageVersion)" />
@@ -49,23 +56,33 @@
     <!--For test issue 809 https://github.com/coverlet-coverage/coverlet/issues/809-->
     <PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.8" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <!--<PackageVersion Include="TUnit" Version="0.23.0" />-->
     <!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
     <!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
     <PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
+    <!-- <PackageVersion Include="xunit" Version="2.9.3" /> -->
     <PackageVersion Include="xunit.v3" Version="$(XunitV3Version)" />
+    <PackageVersion Include="xunit.v3.runner.msbuild" Version="$(XunitV3Version)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)" />
-    <PackageVersion Include="System.Buffers" Version="4.6.0" />
+    <PackageVersion Include="System.Buffers" Version="4.6.1" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Memory" Version="4.6.0" />
+    <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
-    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
-    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
+    <!-- Could be removed - just used in Playground -->
+    <PackageVersion Include="Microsoft.Testing.Extensions.Telemetry" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageVersion Include="MSTest.Analyzers" Version="3.9.1" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.20.20" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.9.1" />
+    <PackageVersion Include="Microsoft.TestPlatform" Version="17.14.1" />
+    <PackageVersion Include="System.Collections.Concurrent" Version="4.3.0" />
   </ItemGroup>
-</Project>
+</Project>

Documentation/Coverlet.MTP.Integration.md

@@ -0,0 +1 @@
+### ToDo Description