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
16 changes: 8 additions & 8 deletions .github/workflows/build-status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:
- name: Run tests for all target frameworks (Windows)
if: matrix.os == 'windows-latest'
run: |
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test --project tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test --project tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build

- name: Run Benchmatks (Windows)
if: matrix.os == 'windows-latest'
Expand All @@ -53,9 +53,9 @@ jobs:
- name: Run tests for all target frameworks (Non-Windows)
if: matrix.os != 'windows-latest'
run: |
dotnet test tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --collect:"XPlat Code Coverage" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --collect:"XPlat Code Coverage" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests/NHapi.NUnit/NHapi.NUnit.csproj --collect:"XPlat Code Coverage" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --results-directory TestResults --results-directory-layout per-module --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests/NHapi.NUnit/NHapi.NUnit.csproj --results-directory TestResults --results-directory-layout per-module --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml -c Release -f net10.0 --no-restore --no-build

- name: Upload Benchmark Results
if: always() && matrix.os == 'windows-latest'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/receive-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
- name: Run tests for all target frameworks (Windows)
if: matrix.os == 'windows-latest'
run: |
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --logger "trx;LogFilePrefix=TestResults" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test tests\NHapi.NUnit\NHapi.NUnit.csproj --logger "trx;LogFilePrefix=TestResults" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --report-trx --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test --project tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --report-trx --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --report-trx --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests\NHapi.NUnit\NHapi.NUnit.csproj --report-trx --results-directory TestResults -c Release -f net462 --no-restore --no-build
dotnet test --project tests\NHapi.NUnit\NHapi.NUnit.csproj --report-trx --results-directory TestResults -c Release -f net10.0 --no-restore --no-build

- name: Run Benchmatks (Windows)
if: matrix.os == 'windows-latest'
Expand All @@ -51,9 +51,9 @@ jobs:
- name: Run tests for all target frameworks (Non-Windows)
if: matrix.os != 'windows-latest'
run: |
dotnet test tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --collect:"XPlat Code Coverage" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --collect:"XPlat Code Coverage" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test tests/NHapi.NUnit/NHapi.NUnit.csproj --collect:"XPlat Code Coverage" --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj --results-directory TestResults --results-directory-layout per-module --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests/NHapi.NUnit.SourceGeneration/NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build
dotnet test --project tests/NHapi.NUnit/NHapi.NUnit.csproj --results-directory TestResults --results-directory-layout per-module --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml -c Release -f net10.0 --no-restore --no-build

- name: Upload Unit Test Results
if: always() && matrix.os == 'windows-latest'
Expand Down
10 changes: 5 additions & 5 deletions build/default.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ task Test {

# TODO: Move to using dotnet test to execute the unit tests
# the below works however the output format needs to be tweeked.
exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
exec { dotnet test ..\tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build }
exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build }
exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build }
exec { dotnet test --project ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
exec { dotnet test --project ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
exec { dotnet test --project ..\tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build }
exec { dotnet test --project ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build }
exec { dotnet test --project ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net10.0 --no-restore --no-build }
}

Task Package -depends Build {
Expand Down
5 changes: 4 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"version": "10.0.404",
"rollForward": "latestFeature"
},
"projects": []
"projects": [],
"test": {
"runner": "Microsoft.Testing.Platform"
}
}
13 changes: 13 additions & 0 deletions tests/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project>
<!-- Run NUnit tests on Microsoft.Testing.Platform (MTP). The benchmarks project is not a test project. -->
<PropertyGroup Condition=" '$(MSBuildProjectName)' != 'NHapi.Benchmarks' ">
<OutputType>Exe</OutputType>
<EnableNUnitRunner>true</EnableNUnitRunner>
</PropertyGroup>

<!-- Verify maintenance fee: nHapi is a non-revenue open source project. Renew annually. -->
<PropertyGroup>
<Verify_SponsorshipExemption>OpenSource</Verify_SponsorshipExemption>
<Verify_SponsorshipExemptionUntil>2027-10</Verify_SponsorshipExemptionUntil>
</PropertyGroup>
</Project>
7 changes: 2 additions & 5 deletions tests/NHapi.Base.NUnit/NHapi.Base.NUnit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="5.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="6.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.12.0" />
<PackageReference Include="TimeZoneConverter" Version="8.0.1" />

<PackageReference Include="coverlet.collector" Version="10.1.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.3.180">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<!-- Verify maintenance fee: nHapi is a non-revenue open source project. Renew annually. -->
<Verify_SponsorshipExemption>OpenSource</Verify_SponsorshipExemption>
<Verify_SponsorshipExemptionUntil>2027-10</Verify_SponsorshipExemptionUntil>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand All @@ -20,11 +17,8 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="5.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="6.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.12.0" />
<PackageReference Include="coverlet.collector" Version="10.1.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.3.180">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
7 changes: 2 additions & 5 deletions tests/NHapi.NUnit/NHapi.NUnit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="5.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="6.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.12.0" />
<PackageReference Include="coverlet.collector" Version="10.1.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.12.0" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.5.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.3.180">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Loading