Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Readd netstandard2.1, net7, net48 and net47. #114

Merged
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
13 changes: 7 additions & 6 deletions .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ on:
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet: [ '9.0.x' ]
name: Test dotnet ${{ matrix.dotnet-versions }}
name: Test dotnet
steps:
- uses: actions/checkout@v4
- name: Set up dotnet.
- name: Set up dotnet 7.
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet }}
dotnet-version: '7.0.x'
- name: Set up dotnet 9.
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
- name: Build
run: dotnet build
- name: Run test suite
Expand Down
3 changes: 2 additions & 1 deletion Personnummer.Tests/CoordinationNumberTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public void TestParseInvalidCn(PersonnummerData ssn)
}));
}

#if NET8_0_OR_GREATER
[Theory]
[ClassData(typeof(ValidCnDataProvider))]
public void TestAgeCn(PersonnummerData ssn)
Expand All @@ -117,7 +118,7 @@ public void TestAgeCn(PersonnummerData ssn)
// Du to age not being possible to fetch from >100 year short format without separator, we aught to check this here.
Assert.Equal(years > 99 ? years - 100 : years, Personnummer.Parse(ssn.ShortFormat, new Personnummer.Options { AllowCoordinationNumber = true, TimeProvider = timeProvider }).Age);
}

#endif

[Theory]
[ClassData(typeof(ValidCnDataProvider))]
Expand Down
4 changes: 1 addition & 3 deletions Personnummer.Tests/Personnummer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@

<LangVersion>latestmajor</LangVersion>

<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net9.0;net7.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.core" Version="2.9.3" />
<PackageReference Include="xunit.runner.utility" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 2 additions & 0 deletions Personnummer.Tests/PersonnummerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public void TestParseInvalid(PersonnummerData ssn)
}


#if NET8_0_OR_GREATER // Requires TimeProvider.
[Theory]
[ClassData(typeof(ValidSsnDataProvider))]
public void TestAge(PersonnummerData ssn)
Expand All @@ -90,6 +91,7 @@ public void TestAge(PersonnummerData ssn)
// Du to age not being possible to fetch from >100 year short format without separator, we aught to check this here.
Assert.Equal(years > 99 ? years - 100 : years, Personnummer.Parse(ssn.ShortFormat, new Personnummer.Options { AllowCoordinationNumber = false, TimeProvider = timeProvider }).Age);
}
#endif

[Theory]
[ClassData(typeof(ValidSsnDataProvider))]
Expand Down
16 changes: 11 additions & 5 deletions Personnummer.Tests/TestTimeProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,25 @@

namespace Personnummer.Tests;

#if NET8_0_OR_GREATER

/// <summary>
/// TimeProvider which always returns the same date: 2025 01 01 00:00:01 with UTC timezone on local time.
/// </summary>
public class TestTimeProvider : TimeProvider
{
internal DateTimeOffset Now { get; set; } = new(
new DateOnly(2025, 1, 5),
new TimeOnly(0, 0, 0, 1),
TimeSpan.Zero
);

public override DateTimeOffset GetUtcNow()
{
return new DateTimeOffset(
new DateOnly(2025, 1, 1),
new TimeOnly(0,0,0, 1),
TimeSpan.Zero
);
return Now;
}

public override TimeZoneInfo LocalTimeZone { get; } = TimeZoneInfo.Utc;
}

#endif
14 changes: 10 additions & 4 deletions Personnummer/Personnummer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,20 @@ public Options()

public bool AllowInterimNumber { get; set; } = false;

#if (NET8_0_OR_GREATER)
/// <summary>
/// TimeProvider to use in calculations which are time dependent.<br/>
/// Uses `GetLocalNow` method.
/// <remarks>
/// Defaults to System provider.
/// </remarks>
/// </summary>
public TimeProvider TimeProvider { get; set; } = TimeProvider.System;
public TimeProvider TimeProvider { private get; init; } = TimeProvider.System;

internal DateTimeOffset DateTimeNow => TimeProvider.GetLocalNow();
#else
internal DateTimeOffset DateTimeNow => DateTimeOffset.Now;
#endif
}

#region Fields and Properties
Expand All @@ -37,10 +43,10 @@ public int Age
{
get
{
var now = _options.TimeProvider.GetLocalNow();
var now = _options.DateTimeNow;
var age = now.Year - Date.Year;

if (now.Month >= Date.Month && now.Day > Date.Day)
if (now.Month >= Date.Month && now.Day >= Date.Day)
{
age--;
}
Expand Down Expand Up @@ -124,7 +130,7 @@ public Personnummer(string ssn, Options? options = null)
}
else
{
int born = TimeProvider.System.GetLocalNow().Year - int.Parse(decade);
int born = _options.DateTimeNow.Year - int.Parse(decade);
if (groups["separator"].Value.Length != 0 && groups["separator"].Value == "+")
{
born -= 100;
Expand Down
2 changes: 1 addition & 1 deletion Personnummer/Personnummer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net7.0;net8.0;net9.0;netstandard2.1;net47;net48</TargetFrameworks>
<Company>Personnummer</Company>
<Authors>Johannes Tegnér, Personnummer Contributors</Authors>
<Description>Verify Swedish personal identity numbers.</Description>
Expand Down
Loading