Skip to content

Commit 9f8950d

Browse files
VNNCCVNNCC
authored
Merge pull request #4 from snowberry-software/develop
feat: .NET 10.0
2 parents b2ac472 + 7b709d6 commit 9f8950d

File tree

10 files changed

+48
-51
lines changed

10 files changed

+48
-51
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ jobs:
1717
uses: actions/setup-dotnet@v3
1818
with:
1919
dotnet-version: |
20-
7.x
21-
8.x
2220
9.x
21+
10.x
2322
- name: Build
2423
run: ./build.sh Compile
2524
- name: Test
@@ -38,8 +37,7 @@ jobs:
3837
uses: actions/setup-dotnet@v3
3938
with:
4039
dotnet-version: |
41-
7.x
42-
8.x
4340
9.x
41+
10.x
4442
- name: Deploy
4543
run: ./build.sh DeployNuGet -Configuration Release -NuGetPackageFilter Snowberry.Mediator.*.nupkg

‎src/NuGetPackage.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Platforms>AnyCPU;x64;x86</Platforms>
55

66
<Authors>Snowberry Software</Authors>
7-
<AssemblyVersion>1.0.3.0</AssemblyVersion>
7+
<AssemblyVersion>1.0.4.0</AssemblyVersion>
88
<VersionPrefix>$(AssemblyVersion)</VersionPrefix>
99
<VersionSuffix>alpha</VersionSuffix>
1010

@@ -15,7 +15,7 @@
1515

1616
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1717
<IncludeBuildOutput>true</IncludeBuildOutput>
18-
<Copyright>Copyright © 2025 Snowberry Software</Copyright>
18+
<Copyright>Copyright © $([System.DateTime]::Now.Year) Snowberry Software</Copyright>
1919
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
2020
<PackageProjectUrl>https://github.com/snowberry-software/Snowberry.Mediator</PackageProjectUrl>
2121

‎src/Snowberry.Mediator.Abstractions/Snowberry.Mediator.Abstractions.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;netstandard2.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>latest</LangVersion>
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
1515
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
16-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
16+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
1717
</ItemGroup>
1818

1919
<Import Project="../NuGetPackage.props" />

‎src/Snowberry.Mediator.DependencyInjection.Shared/Snowberry.Mediator.DependencyInjection.Shared.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+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAotCompatible>true</IsAotCompatible>

‎src/Snowberry.Mediator.DependencyInjection/ServiceCollectionExtensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Diagnostics.CodeAnalysis;
22
using Snowberry.DependencyInjection.Abstractions;
3-
using Snowberry.DependencyInjection.Abstractions.Extensions;
43
using Snowberry.DependencyInjection.Abstractions.Interfaces;
54
using Snowberry.Mediator.DependencyInjection.Shared;
65

‎src/Snowberry.Mediator.DependencyInjection/Snowberry.Mediator.DependencyInjection.csproj‎

Lines changed: 2 additions & 2 deletions
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+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAotCompatible>true</IsAotCompatible>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Snowberry.DependencyInjection" Version="5.0.0.2" />
14+
<PackageReference Include="Snowberry.DependencyInjection" Version="5.1.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Snowberry.Mediator.Extensions.DependencyInjection/Snowberry.Mediator.Extensions.DependencyInjection.csproj‎

Lines changed: 2 additions & 2 deletions
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+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAotCompatible>true</IsAotCompatible>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Snowberry.Mediator.Tests.Common/Snowberry.Mediator.Tests.Common.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<ProjectReference Include="..\Snowberry.Mediator\Snowberry.Mediator.csproj" />
11-
</ItemGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="..\Snowberry.Mediator\Snowberry.Mediator.csproj" />
11+
</ItemGroup>
1212

1313
</Project>

‎src/Snowberry.Mediator.Tests/Snowberry.Mediator.Tests.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<PackageReference Include="coverlet.collector" Version="6.0.4">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
17-
<PackageReference Include="xunit" Version="2.9.3" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="coverlet.collector" Version="6.0.4">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageReference>
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
17+
<PackageReference Include="xunit" Version="2.9.3" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
</ItemGroup>
2323

24-
<ItemGroup>
25-
<ProjectReference Include="..\Snowberry.Mediator.DependencyInjection\Snowberry.Mediator.DependencyInjection.csproj" />
26-
<ProjectReference Include="..\Snowberry.Mediator.Extensions.DependencyInjection\Snowberry.Mediator.Extensions.DependencyInjection.csproj" />
27-
<ProjectReference Include="..\Snowberry.Mediator.Tests.Common\Snowberry.Mediator.Tests.Common.csproj" />
28-
</ItemGroup>
24+
<ItemGroup>
25+
<ProjectReference Include="..\Snowberry.Mediator.DependencyInjection\Snowberry.Mediator.DependencyInjection.csproj" />
26+
<ProjectReference Include="..\Snowberry.Mediator.Extensions.DependencyInjection\Snowberry.Mediator.Extensions.DependencyInjection.csproj" />
27+
<ProjectReference Include="..\Snowberry.Mediator.Tests.Common\Snowberry.Mediator.Tests.Common.csproj" />
28+
</ItemGroup>
2929

30-
<ItemGroup>
31-
<Using Include="Xunit" />
32-
</ItemGroup>
30+
<ItemGroup>
31+
<Using Include="Xunit" />
32+
</ItemGroup>
3333

3434
</Project>

‎src/Snowberry.Mediator/Snowberry.Mediator.csproj‎

Lines changed: 2 additions & 2 deletions
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+
<TargetFrameworks>net10.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAotCompatible>true</IsAotCompatible>
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="ZLinq" Version="1.5.3" />
23+
<PackageReference Include="ZLinq" Version="1.5.4" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

0 commit comments

Comments
 (0)