Skip to content

Upgrade to dotnet 10 #52

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
henrikwidlund merged 1 commit into from
Nov 14, 2025
Merged

Upgrade to dotnet 10 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Restore Dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x

- name: Cache NuGet packages
uses: actions/cache@v4
Expand Down
6 changes: 3 additions & 3 deletions src/Dns/Dns.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
Expand Down Expand Up @@ -34,14 +34,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.250">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.252">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.0" />
<EmbeddedResource Include="Resolving/RootHints" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Mdns/Mdns.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
Expand Down Expand Up @@ -34,15 +34,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.250">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.252">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.0" />
<ProjectReference Include="..\Dns\Dns.csproj" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Mdns/ServiceDiscovery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ private async Task OnAnswer(MessageEventArgs e)
{
var msg = e.Message;
if (_logger?.IsEnabled(LogLevel.Debug) is true)
_logger?.LogDebug("Answer from {RemoteEndPoint}", e.RemoteEndPoint);
_logger.LogDebug("Answer from {RemoteEndPoint}", e.RemoteEndPoint);

if (_logger?.IsEnabled(LogLevel.Trace) is true)
_logger.LogTrace("{@Message}", msg);
Expand Down
6 changes: 3 additions & 3 deletions tests/Dns.Tests/Dns.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<DebugType>full</DebugType>
<IsTestProject>true</IsTestProject>
<RootNamespace>DnsTests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.250">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.252">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" PrivateAssets="all" />
<PackageReference Include="coverlet.msbuild" Version="6.0.4" PrivateAssets="all" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="SimpleBase" Version="5.5.0" />
Expand Down
38 changes: 19 additions & 19 deletions tests/Dns.Tests/Resolving/CachedNameServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ public async Task Pruning()
query.Questions.Add(new Question { Name = "a.foo.org", Type = DnsType.A });
query.Questions.Add(new Question { Name = "b.foo.org", Type = DnsType.A });

var response = await cache.ResolveAsync(query);
response.Answers.Any(a => a.Name == "a.foo.org").ShouldBeTrue();
response.Answers.Any(a => a.Name == "b.foo.org").ShouldBeTrue();
var response = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);
response.Answers.Any(static a => a.Name == "a.foo.org").ShouldBeTrue();
response.Answers.Any(static a => a.Name == "b.foo.org").ShouldBeTrue();

cache.Prune(now);
response = await cache.ResolveAsync(query);
response.Answers.Any(a => a.Name == "a.foo.org").ShouldBeTrue();
response.Answers.Any(a => a.Name == "b.foo.org").ShouldBeTrue();
response = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);
response.Answers.Any(static a => a.Name == "a.foo.org").ShouldBeTrue();
response.Answers.Any(static a => a.Name == "b.foo.org").ShouldBeTrue();

cache.Prune(now + TimeSpan.FromSeconds(31));
response = await cache.ResolveAsync(query);
response.Answers.Any(a => a.Name == "a.foo.org").ShouldBeFalse();
response.Answers.Any(a => a.Name == "b.foo.org").ShouldBeTrue();
response = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);
response.Answers.Any(static a => a.Name == "a.foo.org").ShouldBeFalse();
response.Answers.Any(static a => a.Name == "b.foo.org").ShouldBeTrue();

cache.Prune(now + TimeSpan.FromSeconds(61));
response = await cache.ResolveAsync(query);
response.Answers.Any(a => a.Name == "a.foo.org").ShouldBeFalse();
response.Answers.Any(a => a.Name == "b.foo.org").ShouldBeFalse();
response = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);
response.Answers.Any(static a => a.Name == "a.foo.org").ShouldBeFalse();
response.Answers.Any(static a => a.Name == "b.foo.org").ShouldBeFalse();
}

[Fact]
Expand All @@ -64,10 +64,10 @@ public async Task AddingResponse()
}
};

var res = await cache.ResolveAsync(query);
var res = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);

res.Answers.Any(a => a.Name == "foo.org" && a.Type == DnsType.A).ShouldBeTrue();
res.Answers.Any(a => a.Name == "foo.org" && a.Type == DnsType.AAAA).ShouldBeTrue();
res.Answers.Any(static a => a.Name == "foo.org" && a.Type == DnsType.A).ShouldBeTrue();
res.Answers.Any(static a => a.Name == "foo.org" && a.Type == DnsType.AAAA).ShouldBeTrue();
}

[Fact]
Expand All @@ -91,10 +91,10 @@ public async Task AddingResponse_TTL0()
}
};

var res = await cache.ResolveAsync(query);
var res = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);

res.Answers.Any(a => a.Name == "foo.org" && a.Type == DnsType.A).ShouldBeFalse();
res.Answers.Any(a => a.Name == "foo.org" && a.Type == DnsType.AAAA).ShouldBeTrue();
res.Answers.Any(static a => a.Name == "foo.org" && a.Type == DnsType.A).ShouldBeFalse();
res.Answers.Any(static a => a.Name == "foo.org" && a.Type == DnsType.AAAA).ShouldBeTrue();
}

[Fact]
Expand All @@ -116,7 +116,7 @@ public async Task Pruning_Background()
}
};

var res = await cache.ResolveAsync(query);
var res = await cache.ResolveAsync(query, TestContext.Current.CancellationToken);
res.Answers.Count.ShouldBe(1);

var cts = cache.PruneContinuously(TimeSpan.FromMilliseconds(200));
Expand Down
Loading
Loading