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

Upgrade to .Net 8 #100

Merged
merged 1 commit into from
Apr 25, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Test and Deploy Library
env:
VERSION_NUMBER: 1.0.2
NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
DOTNET_MAJOR_VERSION: 8

on:
push:
Expand All @@ -22,7 +23,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: ${{ env.DOTNET_MAJOR_VERSION }}.0.x
- name: Install dependencies
run: dotnet restore
- name: Run tests
Expand All @@ -43,7 +44,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: ${{ env.DOTNET_MAJOR_VERSION }}.0.x
- name: Output Version Number
run: echo "Version-$VERSION_NUMBER.$GITHUB_RUN_NUMBER"
- name: Install dependencies
Expand Down
4 changes: 3 additions & 1 deletion .idea/.idea.NHSNumberGenerator/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions NHSNumberGenerator.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0E30007D-D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHSNumberGenerator.Test", "test\NHSNumberGenerator.Test\NHSNumberGenerator.Test.csproj", "{209FB13C-9BEE-4EFE-B88E-9A33246E743F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{296C7081-313C-4AEB-BFD5-1F378D0432D2}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitignore = .gitignore
.gitmessage = .gitmessage
LICENSE.txt = LICENSE.txt
README.md = README.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
4 changes: 2 additions & 2 deletions src/NHSNumberGenerator/Generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ private sealed class NhsNumber
private readonly Random _random = new();
private const int NhsNumberSegments = 9;
private List<NumberPart> _numberParts = null!;
private readonly int[] _weightings = {10,9,8,7,6,5,4,3,2};
private readonly int[] _weightings = [10,9,8,7,6,5,4,3,2];


internal NhsNumber()
Expand All @@ -30,7 +30,7 @@ internal NhsNumber()

private void InitialiseParts()
{
_numberParts = new List<NumberPart>();
_numberParts = [];
for (var position = 0; position < NhsNumberSegments; position++)
{
_numberParts.Add(new NumberPart
Expand Down
2 changes: 1 addition & 1 deletion src/NHSNumberGenerator/NHSNumberGenerator.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Authors>Simon Baynes</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/baynezy/NHSNumberGenerator</PackageProjectUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
6 changes: 2 additions & 4 deletions test/NHSNumberGenerator.Test/Steps/GeneratorFeatureSteps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace NHSNumberGenerator.Test.Steps;
[Binding]
public class GeneratorFeatureSteps
{
private readonly List<string> _generated = new();
private readonly List<string> _generated = [];

[Given(@"A single NHS Number")]
public void GivenASingleNhsNumber() => GivenNhsNumbers(1);
Expand Down Expand Up @@ -34,12 +34,10 @@ public void ThenNhsNumbersShouldBeDifferent()

_generated.ForEach(nhsNumber =>
{
if (duplicateChecker.ContainsKey(nhsNumber))
if (!duplicateChecker.TryAdd(nhsNumber, true))
{
throw new Exception($"Duplicate NHS Number found: {nhsNumber}");
}

duplicateChecker.Add(nhsNumber, true);
});
}

Expand Down
Loading