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
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ updates:
interval: "weekly"
day: "monday"
open-pull-requests-limit: 10
groups:
github-actions-dependencies:
patterns:
- "*"
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
echo "✓ Tool versions captured"

- name: Upload version capture
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: version-capture-quality
path: versionmark-quality.json
Expand Down Expand Up @@ -155,19 +155,19 @@ jobs:
echo "✓ Tool versions captured"

- name: Upload version capture
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: version-capture-${{ matrix.os }}
path: versionmark-build-*.json

- name: Upload Test Results
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: test-results-${{ matrix.os }}
path: test-results/*.trx

- name: Upload Artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: artifacts-${{ matrix.os }}
path: |
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
upload: false

- name: Upload CodeQL SARIF
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: codeql-sarif
path: sarif-results/csharp.sarif
Expand Down Expand Up @@ -502,7 +502,7 @@ jobs:
# Downstream projects: Add any additional artifact uploads here.

- name: Upload documentation
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: documents
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ jobs:
10.x

- name: Download package artifacts
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: artifacts-ubuntu-latest
path: artifacts

- name: Download documents artifact
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: documents
path: artifacts
Expand Down
4 changes: 2 additions & 2 deletions requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ sections:
Supporting this target framework ensures the library can be integrated into a broader
range of .NET projects, including those targeting .NET Framework and older .NET Core versions.
tests:
- net462@TrxSerializer_Serialize_BasicTestResults_ProducesValidTrxXml
- net462@JUnitSerializer_Serialize_PassedTest_ProducesValidJUnitXml
- net481@TrxSerializer_Serialize_BasicTestResults_ProducesValidTrxXml
- net481@JUnitSerializer_Serialize_PassedTest_ProducesValidJUnitXml

- id: REQ-FUNC-008
title: The library shall support .NET 10 runtime.
Expand Down
14 changes: 12 additions & 2 deletions src/DemaConsulting.TestResults/DemaConsulting.TestResults.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>12</LangVersion>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down Expand Up @@ -43,14 +43,24 @@
<SBOMPackageSupplier>Organization: $(Company)</SBOMPackageSupplier>
</PropertyGroup>

<!-- Build Tool Dependencies -->
<ItemGroup>
<PackageReference Include="Microsoft.Sbom.Targets" Version="4.1.5" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
</ItemGroup>

<!-- Code Analysis Dependencies -->
<ItemGroup>
<!-- Analyzer packages use child-element form to configure both PrivateAssets and IncludeAssets:
- PrivateAssets="all" prevents these build-time analyzers from becoming transitive dependencies
in packages that consume this library.
- 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.103">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.19.0.132793">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.20.0.135146">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net462;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net481;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('Windows'))">net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>12</LangVersion>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -24,19 +24,33 @@
<EmbeddedResource Include="IO\Examples\example2.trx" />
</ItemGroup>

<!-- Test Framework Dependencies -->
<ItemGroup>
<!-- coverlet.collector uses child-element form to configure 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="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
</ItemGroup>

<!-- Code Analysis Dependencies -->
<ItemGroup>
<!-- Analyzer packages use child-element form to configure both PrivateAssets and IncludeAssets:
- PrivateAssets="all" prevents these build-time analyzers from becoming transitive dependencies
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.103">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.19.0.132793">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.20.0.135146">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down