diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c805182c..008b2a9a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -188,8 +188,10 @@ jobs: --no-build --configuration Release --property:Version=${{ inputs.version }} - --collect "XPlat Code Coverage;Format=opencover" - --logger "trx;LogFilePrefix=${{ matrix.os }}" + --coverlet + --coverlet-output-format opencover + --report-trx + --report-trx-filename "${{ matrix.os }}_{asm}_{tfm}_{arch}.trx" --results-directory artifacts - name: End Sonar Scanner diff --git a/global.json b/global.json new file mode 100644 index 00000000..3140116d --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/src/DemaConsulting.SysML2Tools.Core/DemaConsulting.SysML2Tools.Core.csproj b/src/DemaConsulting.SysML2Tools.Core/DemaConsulting.SysML2Tools.Core.csproj index d7d17161..10a7d6ad 100644 --- a/src/DemaConsulting.SysML2Tools.Core/DemaConsulting.SysML2Tools.Core.csproj +++ b/src/DemaConsulting.SysML2Tools.Core/DemaConsulting.SysML2Tools.Core.csproj @@ -51,10 +51,10 @@ - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/DemaConsulting.SysML2Tools.Language/DemaConsulting.SysML2Tools.Language.csproj b/src/DemaConsulting.SysML2Tools.Language/DemaConsulting.SysML2Tools.Language.csproj index a739a798..bcb0ef40 100644 --- a/src/DemaConsulting.SysML2Tools.Language/DemaConsulting.SysML2Tools.Language.csproj +++ b/src/DemaConsulting.SysML2Tools.Language/DemaConsulting.SysML2Tools.Language.csproj @@ -61,8 +61,8 @@ - - + + @@ -82,11 +82,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/DemaConsulting.SysML2Tools.Stdlib/DemaConsulting.SysML2Tools.Stdlib.csproj b/src/DemaConsulting.SysML2Tools.Stdlib/DemaConsulting.SysML2Tools.Stdlib.csproj index 4d3f22d0..246d93f7 100644 --- a/src/DemaConsulting.SysML2Tools.Stdlib/DemaConsulting.SysML2Tools.Stdlib.csproj +++ b/src/DemaConsulting.SysML2Tools.Stdlib/DemaConsulting.SysML2Tools.Stdlib.csproj @@ -87,16 +87,16 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/DemaConsulting.SysML2Tools.Tool/DemaConsulting.SysML2Tools.Tool.csproj b/src/DemaConsulting.SysML2Tools.Tool/DemaConsulting.SysML2Tools.Tool.csproj index 8e88a704..1100789b 100644 --- a/src/DemaConsulting.SysML2Tools.Tool/DemaConsulting.SysML2Tools.Tool.csproj +++ b/src/DemaConsulting.SysML2Tools.Tool/DemaConsulting.SysML2Tools.Tool.csproj @@ -66,8 +66,8 @@ - - + + @@ -77,11 +77,11 @@ in packages that consume this tool. - IncludeAssets lists all asset types (including 'analyzers' and 'buildtransitive') to ensure Roslyn analyzers and MSBuild targets are fully activated during the build. --> - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj index ebc754f4..d064cd7b 100644 --- a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj @@ -27,13 +27,20 @@ - + + all - runtime; build; native; contentfiles; analyzers; buildtransitive + compile; runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -41,11 +48,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -60,11 +67,4 @@ - - - - - - - diff --git a/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj b/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj index 03e3e48f..05d844d5 100644 --- a/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj @@ -27,17 +27,20 @@ - - + extension's MSBuild targets are activated so coverage is collected during test runs. --> + all - runtime; build; native; contentfiles; analyzers; buildtransitive + compile; runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -50,11 +53,11 @@ in any project that references this test project. - IncludeAssets lists all asset types (including 'analyzers' and 'buildtransitive') to ensure Roslyn analyzers and MSBuild targets are fully activated during the build. --> - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive