From 6f49ec0e1af261e5f2e1187ab6027e07e904b2e2 Mon Sep 17 00:00:00 2001 From: Albie Spriddell Date: Tue, 23 Dec 2025 15:18:05 +0000 Subject: [PATCH 1/3] add .net 10 support --- libloc.Access/libloc.Access.csproj | 25 +++++++++++++++++++------ libloc.Tests/libloc.Tests.csproj | 16 ++++++++-------- libloc/libloc.csproj | 4 ++-- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/libloc.Access/libloc.Access.csproj b/libloc.Access/libloc.Access.csproj index e978ca9..75790ea 100644 --- a/libloc.Access/libloc.Access.csproj +++ b/libloc.Access/libloc.Access.csproj @@ -2,17 +2,30 @@ libloc.Access - net6.0;net8.0 + net6.0;net8.0;net10.0 Automated database management for libloc library - - - - + + - + + + + + + + + + + + + + + + + diff --git a/libloc.Tests/libloc.Tests.csproj b/libloc.Tests/libloc.Tests.csproj index d254d97..3b4a8ef 100644 --- a/libloc.Tests/libloc.Tests.csproj +++ b/libloc.Tests/libloc.Tests.csproj @@ -1,22 +1,22 @@ - net6.0;net8.0 + net10.0 true false - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/libloc/libloc.csproj b/libloc/libloc.csproj index 07e8b65..d9ab37e 100644 --- a/libloc/libloc.csproj +++ b/libloc/libloc.csproj @@ -3,12 +3,12 @@ libloc true - net6.0;net8.0 + net6.0;net8.0;net10.0 A version of IPFire's libloc library rewritten for C# - + From 1c080033c42cf5e6ca3b13a9d78f55409065ff71 Mon Sep 17 00:00:00 2001 From: Albie Spriddell Date: Tue, 23 Dec 2025 15:18:18 +0000 Subject: [PATCH 2/3] use trusted publishing for nuget deployments --- .github/workflows/publish.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7058181..b5fa354 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,13 +7,26 @@ on: jobs: publish: runs-on: ubuntu-latest + environment: nuget + + permissions: + id-token: write steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: "6.0.x" - + dotnet-version: | + 6.0.x + 8.0.x + 10.0.x + + - name: NuGet login + uses: NuGet/login@v1 + id: login + with: + user: ${{ vars.NUGET_USER }} + - name: Restore run: dotnet restore @@ -29,4 +42,4 @@ jobs: if: "!github.event.release.prerelease" - name: Publish - run: dotnet nuget push "*.nupkg" -k ${{ secrets.NUGET_KEY }} --skip-duplicate -s https://api.nuget.org/v3/index.json \ No newline at end of file + run: dotnet nuget push "*.nupkg" -k ${{ steps.login.outputs.NUGET_API_KEY }} --skip-duplicate -s https://api.nuget.org/v3/index.json From e4e4386a18410019e303ecd5d905171c04e4dd6e Mon Sep 17 00:00:00 2001 From: Albie Spriddell Date: Tue, 23 Dec 2025 15:20:34 +0000 Subject: [PATCH 3/3] update test procedure --- .github/workflows/test.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e4c95fe..448a731 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,15 +5,19 @@ on: [ pull_request ] jobs: test: runs-on: ubuntu-latest + + strategy: + matrix: + dotnet-version: [6.0, 8.0, 10.0] steps: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: "6.0.x" - - - name: Build - run: dotnet build -c Debug + dotnet-version: | + 6.0.x + 8.0.x + 10.0.x - name: Test - run: dotnet test \ No newline at end of file + run: dotnet test -f net$({{ matrix.dotnet-version }}) --verbosity normal