Skip to content

Upgrade to .NET 10 #2

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

Open
aspriddell wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade to .NET 10 #2

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
6f49ec0
add .net 10 support
aspriddell Dec 23, 2025
1c08003
use trusted publishing for nuget deployments
aspriddell Dec 23, 2025
e4e4386
update test procedure
aspriddell Dec 23, 2025
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
19 changes: 16 additions & 3 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
run: dotnet nuget push "*.nupkg" -k ${{ steps.login.outputs.NUGET_API_KEY }} --skip-duplicate -s https://api.nuget.org/v3/index.json
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
run: dotnet test -f net$({{ matrix.dotnet-version }}) --verbosity normal
25 changes: 19 additions & 6 deletions libloc.Access/libloc.Access.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,30 @@

<PropertyGroup>
<PackageId>libloc.Access</PackageId>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<Description>Automated database management for libloc library</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DragonFruit.Data" Version="4.1.1" />
<PackageReference Include="DragonFruit.Data.Roslyn" Version="4.1.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="DragonFruit.Data" Version="4.1.2" />
<PackageReference Include="DragonFruit.Data.Roslyn" Version="4.1.2" PrivateAssets="all" />
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2"/>
<PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="SharpCompress" Version="0.42.1" />
</ItemGroup>

<ItemGroup Label=".NET 6 Dependencies" Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
</ItemGroup>

<ItemGroup Label=".NET 8 Dependencies" Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"/>
</ItemGroup>

<ItemGroup Label=".NET 10 Dependencies" Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions libloc.Tests/libloc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions libloc/libloc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<PropertyGroup>
<PackageId>libloc</PackageId>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
<Description>A version of IPFire's libloc library rewritten for C#</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IPNetwork2" Version="3.0.667" />
<PackageReference Include="IPNetwork2" Version="3.4.832" />
</ItemGroup>

<Import Project="../Nuget.props"/>
Expand Down
Loading