From 19c2cd3a913c2f716e88eb3b9a0e36095de518ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2026 09:56:17 +0000 Subject: [PATCH 1/4] Bump the nuget-dependencies group with 9 updates Bumps Microsoft.CodeAnalysis.NetAnalyzers from 10.0.302 to 10.0.400 Bumps Microsoft.Extensions.FileSystemGlobbing from 10.0.10 to 10.0.11 Bumps Microsoft.NET.Test.Sdk from 18.8.1 to 18.9.0 Bumps Microsoft.SourceLink.GitHub from 10.0.301 to 10.0.400 Bumps Polyfill from 11.0.2 to 11.2.0 Bumps SkiaSharp.NativeAssets.Linux.NoDependencies from 4.150.0 to 4.151.1 Bumps SonarAnalyzer.CSharp from 10.31.0.145097 to 10.32.0.713 Bumps xunit.runner.visualstudio from 3.1.5 to 4.0.0 Bumps xunit.v3 from 3.2.2 to 4.0.0 --- updated-dependencies: - dependency-name: Microsoft.CodeAnalysis.NetAnalyzers dependency-version: 10.0.400 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Microsoft.CodeAnalysis.NetAnalyzers dependency-version: 10.0.400 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Microsoft.CodeAnalysis.NetAnalyzers dependency-version: 10.0.400 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Microsoft.CodeAnalysis.NetAnalyzers dependency-version: 10.0.400 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Microsoft.Extensions.FileSystemGlobbing dependency-version: 10.0.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Microsoft.NET.Test.Sdk dependency-version: 18.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: Microsoft.NET.Test.Sdk dependency-version: 18.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: Microsoft.SourceLink.GitHub dependency-version: 10.0.400 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Microsoft.SourceLink.GitHub dependency-version: 10.0.400 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: Polyfill dependency-version: 11.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: Polyfill dependency-version: 11.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: SkiaSharp.NativeAssets.Linux.NoDependencies dependency-version: 4.151.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.32.0.713 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.32.0.713 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.32.0.713 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.32.0.713 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: xunit.runner.visualstudio dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget-dependencies - dependency-name: xunit.runner.visualstudio dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget-dependencies - dependency-name: xunit.v3 dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget-dependencies - dependency-name: xunit.v3 dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: nuget-dependencies ... Signed-off-by: dependabot[bot] --- .../DemaConsulting.SysML2Tools.Core.csproj | 8 ++++---- .../DemaConsulting.SysML2Tools.Language.csproj | 8 ++++---- .../DemaConsulting.SysML2Tools.Stdlib.csproj | 6 +++--- .../DemaConsulting.SysML2Tools.Tool.csproj | 8 ++++---- .../DemaConsulting.SysML2Tools.Tests.csproj | 12 ++++++------ .../DemaConsulting.SysML2Tools.Tool.Tests.csproj | 10 +++++----- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/DemaConsulting.SysML2Tools.Core/DemaConsulting.SysML2Tools.Core.csproj b/src/DemaConsulting.SysML2Tools.Core/DemaConsulting.SysML2Tools.Core.csproj index d7d1716..10a7d6a 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 a739a79..bcb0ef4 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 4d3f22d..246d93f 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 8e88a70..1100789 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 ebc754f..1a73570 100644 --- a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj @@ -31,9 +31,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -41,11 +41,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -63,7 +63,7 @@ - + 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 03e3e48..cdf2be4 100644 --- a/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj @@ -35,9 +35,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -50,11 +50,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 From b60bde72a95978d9004d4f1471ff52263c217426 Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Tue, 18 Aug 2026 15:33:56 -0400 Subject: [PATCH 2/4] Fix xunit.v3 4.0.0 / Microsoft.Testing.Platform migration issues - Add global.json to select the Microsoft.Testing.Platform test runner - Replace coverlet.collector (VSTest-only) with coverlet.MTP, and add Microsoft.Testing.Extensions.TrxReport for TRX reporting under MTP - Update CI workflow dotnet test invocation to use --coverlet, --coverlet-output-format opencover, and --report-trx instead of the removed --collect/--logger trx VSTest options Mirrors the fix applied in demaconsulting/VersionMark#107 for the same xunit.v3 4.0.0 dependency bump. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/build.yaml | 6 ++++-- global.json | 5 +++++ .../DemaConsulting.SysML2Tools.Tests.csproj | 11 +++++++++-- .../DemaConsulting.SysML2Tools.Tool.Tests.csproj | 11 +++++++---- 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c805182..008b2a9 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 0000000..3140116 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj index 1a73570..53a2bc6 100644 --- a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj @@ -27,11 +27,18 @@ - + + all - runtime; build; native; contentfiles; analyzers; buildtransitive + compile; runtime; build; native; contentfiles; analyzers; buildtransitive + all 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 cdf2be4..05d844d 100644 --- a/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tool.Tests/DemaConsulting.SysML2Tools.Tool.Tests.csproj @@ -27,15 +27,18 @@ - - + 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 From 7586241a75201116f7df9935a35eb5b6c1f5e044 Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Tue, 18 Aug 2026 20:02:53 -0400 Subject: [PATCH 3/4] Pin SkiaSharp.NativeAssets.Linux.NoDependencies to 4.150.0 Dependabot bumped the Linux native asset package alone to 4.151.1 while the managed SkiaSharp package (pulled in transitively via DemaConsulting.Rendering.Skia) remained pinned at 4.150.0. SkiaSharp enforces a matching native/managed version range at startup, so the mismatch threw: System.InvalidOperationException: The version of the native libSkiaSharp library (151.0) is incompatible with this version of SkiaSharp. Supported versions of the native libSkiaSharp library are in the range [150.0, 151.0). Pinning the Linux native asset back to 4.150.0 restores parity with the Windows/macOS native asset packages and the managed SkiaSharp version. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../DemaConsulting.SysML2Tools.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj index 53a2bc6..8107b31 100644 --- a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj @@ -70,7 +70,7 @@ - + From c9c42905793e52bc05c376a329009c653316dc9f Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Tue, 18 Aug 2026 20:08:16 -0400 Subject: [PATCH 4/4] Remove explicit SkiaSharp native asset references from test project DemaConsulting.Rendering.Skia already depends unconditionally on SkiaSharp.NativeAssets.Win32/Linux.NoDependencies/macOS, so the test project inherits matching, self-consistent native asset versions transitively - no explicit PackageReference is needed. Explicitly re-declaring these packages let Dependabot bump the Linux native asset independently of the version resolved transitively via Rendering.Skia's own SkiaSharp dependency, causing the native/managed version mismatch fixed in the previous commit. Removing the explicit references eliminates this whole class of bug going forward. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../DemaConsulting.SysML2Tools.Tests.csproj | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj index 8107b31..d064cd7 100644 --- a/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj +++ b/test/DemaConsulting.SysML2Tools.Tests/DemaConsulting.SysML2Tools.Tests.csproj @@ -67,11 +67,4 @@ - - - - - - -