Skip to content

CONFIG: Upgrade ADotNet to 6.0.0 and update NuGet packages #108

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.

Sign up for GitHub

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

Merged
morgang-adappt merged 3 commits into from
Oct 12, 2026
Merged

CONFIG: Upgrade ADotNet to 6.0.0 and update NuGet packages #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb4fcdb
CONFIG: Update NuGet packages to latest stable
morgang-adappt Oct 9, 2026
f410ba4
CONFIG: Bump ADotNet from 5.1.0 to 6.0.0
morgang-adappt Oct 9, 2026
945e244
CODE RUB: Use TagJobV3 and NugetTrustedPublishingJob
morgang-adappt Oct 9, 2026
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: 12 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v5
with:
token: ${{ secrets.PAT_FOR_TAGGING }}
- name: Configure Git
run: >-
git config user.name "GitHub Action"
Expand Down Expand Up @@ -120,7 +118,9 @@ jobs:

${{ steps.extract_package_release_notes.outputs.package_release_notes }}
env:
GITHUB_TOKEN: ${{ secrets.PAT_FOR_TAGGING }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
publish:
runs-on: ubuntu-latest
needs:
Expand All @@ -139,5 +139,13 @@ jobs:
run: dotnet build --no-restore --configuration Release
- name: Pack NuGet Package
run: dotnet pack --configuration Release --include-symbols
- name: NuGet Login
id: nuget_login
uses: NuGet/login@v1
with:
user: ${{ secrets.NUGET_USER }}
- name: Push NuGet Package
run: dotnet nuget push **/bin/Release/**/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ACCESS }} --skip-duplicate
run: dotnet nuget push **/bin/Release/**/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ steps.nuget_login.outputs.NUGET_API_KEY }} --skip-duplicate
permissions:
id-token: write
contents: read
2 changes: 1 addition & 1 deletion NHSISL.LibPostalClient.Infrastructure/NHSISL.LibPostalClient.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ADotNet" Version="5.1.0" />
<PackageReference Include="ADotNet" Version="6.0.0" />
</ItemGroup>

</Project>
7 changes: 3 additions & 4 deletions NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,29 @@
},
{
"add_tag",
new TagJobV2(
new TagJobV3(
runsOn: BuildMachines.UbuntuLatest,
dependsOn: "build",
projectRelativePath: "NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj",
githubToken: "${{ secrets.PAT_FOR_TAGGING }}",
branchName: branchName)
},
{
"publish",
new PublishJobV4(
new NugetTrustedPublishingJob(
runsOn: BuildMachines.UbuntuLatest,
dependsOn: "add_tag",
nugetApiKey: "${{ secrets.NUGET_ACCESS }}",
nugetUser: "${{ secrets.NUGET_USER }}",
dotNetVersion: "10.0.100")
}
}
};

string buildScriptPath = "../../../../.github/workflows/build.yml";
string directoryPath = Path.GetDirectoryName(buildScriptPath);

Check warning on line 107 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Converting null literal or possible null value to non-nullable type.

Check warning on line 107 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Converting null literal or possible null value to non-nullable type.

if (!Directory.Exists(directoryPath))
{
Directory.CreateDirectory(directoryPath);

Check warning on line 111 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Possible null reference argument for parameter 'path' in 'DirectoryInfo Directory.CreateDirectory(string path)'.

Check warning on line 111 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Possible null reference argument for parameter 'path' in 'DirectoryInfo Directory.CreateDirectory(string path)'.
}

this.adotNetClient.SerializeAndWriteToFile(
Expand Down Expand Up @@ -145,11 +144,11 @@
};

string prLinterScriptPath = "../../../../.github/workflows/prLinter.yml";
string directoryPath = Path.GetDirectoryName(prLinterScriptPath);

Check warning on line 147 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Converting null literal or possible null value to non-nullable type.

Check warning on line 147 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Converting null literal or possible null value to non-nullable type.

if (!Directory.Exists(directoryPath))
{
Directory.CreateDirectory(directoryPath);

Check warning on line 151 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Possible null reference argument for parameter 'path' in 'DirectoryInfo Directory.CreateDirectory(string path)'.

Check warning on line 151 in NHSISL.LibPostalClient.Infrastructure/Services/ScriptGenerationService.cs

View workflow job for this annotation

GitHub Actions / Build 

Possible null reference argument for parameter 'path' in 'DirectoryInfo Directory.CreateDirectory(string path)'.
}

this.adotNetClient.SerializeAndWriteToFile(
Expand Down
8 changes: 4 additions & 4 deletions NHSISL.LibPostalClient.Tests.Acceptance/NHSISL.LibPostalClient.Tests.Acceptance.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<PackageReference Include="CompareNETObjects" Version="4.84.0" />
<PackageReference Include="DeepCloner" Version="0.10.4" />
<PackageReference Include="FluentAssertions" Version="[7.2.2]" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />

<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.10" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
<PackageReference Include="Moq" Version="4.21.0" />
<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.9" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.analyzers" Version="1.27.0">
Expand All @@ -33,7 +33,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="10.0.1">
<PackageReference Include="coverlet.collector" Version="10.1.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions NHSISL.LibPostalClient.Tests.Unit/NHSISL.LibPostalClient.Tests.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<PackageReference Include="CompareNETObjects" Version="4.84.0" />
<PackageReference Include="DeepCloner" Version="0.10.4" />
<PackageReference Include="FluentAssertions" Version="[7.2.2]" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.12" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.10" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
<PackageReference Include="Moq" Version="4.21.0" />
<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.9" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.analyzers" Version="1.27.0">
Expand All @@ -28,7 +28,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="10.0.1">
<PackageReference Include="coverlet.collector" Version="10.1.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.12" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Xeption" Version="2.9.0" />
</ItemGroup>
Expand Down
Loading