Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"test": {
"runner": "Microsoft.Testing.Platform"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@

<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.5" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.301" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.400" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.4.10" PrivateAssets="All" />
<PackageReference Include="DemaConsulting.Rendering.Layout" Version="0.1.0" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.11" />
</ItemGroup>

<!-- Language and Stdlib are independently packable NuGet packages of their own
Expand Down Expand Up @@ -82,11 +82,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. -->
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.400">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.31.0.145097">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<ItemGroup>
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.5" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.301" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.0.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.400" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.2.0" PrivateAssets="All" />
<!-- ApiMark: generate Markdown API reference docs from the XML doc comments (see
GenerateDocumentationFile above) and bundle them into this project's own NuGet
package (see ApiMarkPackDocs above). -->
Expand All @@ -82,11 +82,11 @@

<!-- Code Analysis Dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.400">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.31.0.145097">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@
<!-- Code Analysis Dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.5" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.301" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.400" PrivateAssets="All" />
<!-- ApiMark: generate Markdown API reference docs from the XML doc comments (see
GenerateDocumentationFile above) and bundle them into this project's own NuGet
package (see ApiMarkPackDocs above). -->
<PackageReference Include="DemaConsulting.ApiMark.MSBuild" Version="0.4.10" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.400">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.31.0.145097">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<!-- Build Tool Dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.5" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.301" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.0.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.400" PrivateAssets="All" />
<PackageReference Include="Polyfill" Version="11.2.0" PrivateAssets="All" />
</ItemGroup>

<!-- Code Analysis Dependencies -->
Expand All @@ -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. -->
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.400">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.31.0.145097">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,32 @@

<!-- Test Framework Dependencies -->
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="10.0.1">
<!-- coverlet.MTP is coverlet's native Microsoft.Testing.Platform extension (the VSTest-only
coverlet.collector no longer runs under the MTP 'dotnet test' mode required by xunit.v3 4.0.0).
Child-element form configures both PrivateAssets and IncludeAssets:
- PrivateAssets="all" keeps this test-coverage tool out of any consuming project's dependencies.
- IncludeAssets lists all asset types (including 'build' and 'buildtransitive') to ensure the
extension's MSBuild targets are activated so coverage is collected during test runs. -->
<PackageReference Include="coverlet.MTP" Version="10.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.3" />
<PackageReference Include="xunit.v3" Version="4.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<!-- Code Analysis Dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.400">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.31.0.145097">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -60,11 +67,4 @@
<PackageReference Include="DemaConsulting.Rendering.Skia" Version="0.1.0" />
</ItemGroup>

<!-- SkiaSharp Native Assets -->
<ItemGroup>
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="4.150.0" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="4.150.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="4.150.0" Condition="$([MSBuild]::IsOSPlatform('macOS'))" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,20 @@

<!-- Test Framework Dependencies -->
<ItemGroup>
<!-- coverlet.collector uses child-element form to configure both PrivateAssets and IncludeAssets:
<!-- coverlet.MTP is coverlet's native Microsoft.Testing.Platform extension (the VSTest-only
coverlet.collector no longer runs under the MTP 'dotnet test' mode required by xunit.v3 4.0.0).
Child-element form configures both PrivateAssets and IncludeAssets:
- PrivateAssets="all" keeps this test-coverage tool out of any consuming project's dependencies.
- IncludeAssets lists all asset types (including 'build' and 'buildtransitive') to ensure the
data collector MSBuild targets are activated so coverage is collected during test runs. -->
<PackageReference Include="coverlet.collector" Version="10.0.1">
extension's MSBuild targets are activated so coverage is collected during test runs. -->
<PackageReference Include="coverlet.MTP" Version="10.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.3" />
<PackageReference Include="xunit.v3" Version="4.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -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. -->
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.302">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.400">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.31.0.145097">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading