Skip to content

Commit 0423705

Browse files
felipesegadefelipesegade
authored
Add .NET 10 support (#50)
* Add support for .NET 10 * Update GitHub workflow * 📦 * Use CPM to manage solution dependencies * Update Aspire to fix vulnerability warnings * Replace xUnit v2 by v3
1 parent 1254be0 commit 0423705

22 files changed

Lines changed: 82 additions & 55 deletions

File tree

‎.github/workflows/build-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup dotnet
2525
uses: actions/setup-dotnet@v4
2626
with:
27-
dotnet-version: '9.x'
27+
dotnet-version: '10.x'
2828

2929
- name: Install Coverlet
3030
run: dotnet tool install --global coverlet.console

‎Directory.Packages.props‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Aspire.Hosting" Version="13.3.0" />
7+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.3.0" />
8+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
9+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
10+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
11+
<PackageVersion Include="Mediator.Abstractions" Version="3.0.2" />
12+
<PackageVersion Include="Mediator.SourceGenerator" Version="3.0.2" />
13+
<PackageVersion Include="MediatR" Version="14.1.0" />
14+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" Condition="'$(TargetFramework)' == 'net8.0'" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.15" Condition="'$(TargetFramework)' == 'net9.0'" />
18+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.7" Condition="'$(TargetFramework)' == 'net10.0'" />
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
20+
<PackageVersion Include="Moq" Version="4.20.72" />
21+
<PackageVersion Include="Scalar.AspNetCore" Version="2.14.11" />
22+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
23+
<PackageVersion Include="xunit.v3" Version="3.2.2" />
24+
</ItemGroup>
25+
</Project>

‎DispatchR.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
README.md = README.md
1616
.gitignore = .gitignore
1717
CHANGELOG.md = CHANGELOG.md
18+
Directory.Packages.props = Directory.Packages.props
1819
EndProjectSection
1920
EndProject
2021
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{0C407C1E-9E95-40A5-ABCA-52AACCC49C96}"

‎src/AspireModularExample/AspireModularSample.AppHost/AspireModularSample.AppHost.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net9.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
<ImplicitUsings>enable</ImplicitUsings>
99
<Nullable>enable</Nullable>
1010
<IsAspireHost>true</IsAspireHost>
1111
<UserSecretsId>0177c1f9-bc41-4a2b-9dd3-cdd0d2e2f842</UserSecretsId>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.1" />
15+
<PackageReference Include="Aspire.Hosting.AppHost" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/AspireModularExample/AspireModularSample.Modules/AspireModularSample.Modules.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎src/AspireModularExample/AspireModularSample.ServiceA/AspireModularSample.ServiceA.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
</ItemGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Aspire.Hosting" Version="9.3.2" />
9+
<PackageReference Include="Aspire.Hosting" />
1010
</ItemGroup>
1111

1212
<PropertyGroup>
13-
<TargetFramework>net9.0</TargetFramework>
13+
<TargetFramework>net10.0</TargetFramework>
1414
<Nullable>enable</Nullable>
1515
<ImplicitUsings>enable</ImplicitUsings>
1616
</PropertyGroup>

‎src/AspireModularExample/AspireModularSample.ServiceB/AspireModularSample.ServiceB.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
</ItemGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Aspire.Hosting" Version="9.3.2" />
9+
<PackageReference Include="Aspire.Hosting" />
1010
</ItemGroup>
1111

1212
<PropertyGroup>
13-
<TargetFramework>net9.0</TargetFramework>
13+
<TargetFramework>net10.0</TargetFramework>
1414
<Nullable>enable</Nullable>
1515
<ImplicitUsings>enable</ImplicitUsings>
1616
</PropertyGroup>

‎src/Benchmark/Benchmark.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<Optimize>true</Optimize>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
11+
<PackageReference Include="BenchmarkDotNet" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="MediatR" Version="12.5.0" />
15+
<PackageReference Include="MediatR" />
1616
<!-- <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" /> -->
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Mediator.Abstractions" Version="2.1.7" />
21-
<PackageReference Include="Mediator.SourceGenerator" Version="2.1.7">
20+
<PackageReference Include="Mediator.Abstractions" />
21+
<PackageReference Include="Mediator.SourceGenerator">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2424
</PackageReference>

‎src/Benchmark/Notification/NotificationBenchmarks.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Benchmark.Notification.SingleHandler;
44
using BenchmarkDotNet.Attributes;
55
using BenchmarkDotNet.Order;
6-
using DispatchR;
76
using DispatchR.Extensions;
87

98
namespace Benchmark.Notification;
@@ -43,6 +42,7 @@ public enum ScenarioType
4342
public void Setup()
4443
{
4544
var services = new ServiceCollection();
45+
services.AddLogging();
4646
services.AddMediator(opts =>
4747
{
4848
opts.ServiceLifetime = ServiceLifetime.Scoped;

‎src/Benchmark/SendRequest/MediatRVsDispatchRBenchmark.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class MediatRVsDispatchBenchmark
3131
public void Setup()
3232
{
3333
var withoutPipelineServices = new ServiceCollection();
34+
withoutPipelineServices.AddLogging();
3435
withoutPipelineServices.AddMediatR(cfg =>
3536
{
3637
cfg.Lifetime = ServiceLifetime.Scoped;

0 commit comments

Comments
 (0)