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
33 changes: 24 additions & 9 deletions .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,35 @@ on:
pull_request:

jobs:
test:
test-fx:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v6
- name: Set up dotnet ${{ matrix.version }}.
uses: actions/setup-dotnet@v5
with:
dotnet-version: "10.0.x"
- name: Build
run: dotnet build --framework net48
- name: Run test suite
run: dotnet test --framework net48
test-net:
strategy:
matrix:
version:
- "8.0"
- "9.0"
- "10.0"
runs-on: ubuntu-latest
name: Test dotnet
steps:
- uses: actions/checkout@v6
- name: Set up dotnet 8.
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
- name: Set up dotnet 10.
- name: Set up dotnet ${{ matrix.version }}.
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.x'
dotnet-version: "${{ matrix.version }}.x"
- name: Build
run: dotnet build
run: dotnet build --framework net${{ matrix.version }}
- name: Run test suite
run: dotnet test
run: dotnet test --framework net${{ matrix.version }}
4 changes: 2 additions & 2 deletions Personnummer.Tests/CoordinationNumberTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public void TestMaleFemale(PersonnummerData ssn)
[ClassData(typeof(ValidCnDataProvider))]
public void TestSeparator(PersonnummerData ssn)
{
string sep = ssn.SeparatedFormat.Contains('+') ? "+" : "-";
string sep = ssn.SeparatedFormat.Contains("+") ? "+" : "-";
Assert.Equal(sep, Personnummer.Parse(ssn.LongFormat, new Personnummer.Options { AllowCoordinationNumber = true }).Separator);
Assert.Equal(sep, Personnummer.Parse(ssn.SeparatedLong, new Personnummer.Options { AllowCoordinationNumber = true }).Separator);
Assert.Equal(sep, Personnummer.Parse(ssn.SeparatedFormat, new Personnummer.Options { AllowCoordinationNumber = true }).Separator);
Expand Down Expand Up @@ -227,7 +227,7 @@ public void TestIgnoreSeparatorWhenFormatting(PersonnummerData ssn)
[ClassData(typeof(ValidCnDataProvider))]
public void TestDateCn(PersonnummerData data)
{
var expect = data.LongFormat[..4];
var expect = data.LongFormat.Substring(0, 4);
expect += data.LongFormat.Substring(4, 2);
expect += (int.Parse(data.LongFormat.Substring(6, 2)) - 60).ToString("00");

Expand Down
7 changes: 6 additions & 1 deletion Personnummer.Tests/Personnummer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<LangVersion>latestmajor</LangVersion>

<TargetFrameworks>net10.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,6 +18,11 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.Json" Version="10.0.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Personnummer\Personnummer.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Personnummer.Tests/PersonnummerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public void TestMaleFemale(PersonnummerData ssn)
[ClassData(typeof(ValidSsnDataProvider))]
public void TestSeparator(PersonnummerData ssn)
{
string sep = ssn.SeparatedFormat.Contains('+') ? "+" : "-";
string sep = ssn.SeparatedFormat.Contains("+") ? "+" : "-";
Assert.Equal(sep, Personnummer.Parse(ssn.LongFormat, new Personnummer.Options { AllowCoordinationNumber = true }).Separator);
Assert.Equal(sep, Personnummer.Parse(ssn.SeparatedLong, new Personnummer.Options { AllowCoordinationNumber = true }).Separator);
Assert.Equal(sep, Personnummer.Parse(ssn.SeparatedFormat, new Personnummer.Options { AllowCoordinationNumber = true }).Separator);
Expand Down
4 changes: 2 additions & 2 deletions Personnummer.Tests/TestTimeProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ namespace Personnummer.Tests;
public class TestTimeProvider : TimeProvider
{
internal DateTimeOffset Now { get; set; } = new(
new DateOnly(2025, 1, 1),
new TimeOnly(0, 0, 0, 1),
2025, 1, 1,
0, 0, 0, 1,
TimeSpan.Zero
);

Expand Down
Loading