Skip to content

Commit c62119d

Browse files
andreravandrerav
authored
Merge pull request #744 from SonnyRR/chore/bump-tfm-to-net9
Introduce support for .NET 9 TFM
2 parents d462da3 + eeaf355 commit c62119d

File tree

24 files changed

+103
-98
lines changed

24 files changed

+103
-98
lines changed

‎.github/workflows/dotnet-buildandtest.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Setup .NET
17-
uses: actions/setup-dotnet@v3
17+
uses: actions/setup-dotnet@v4
1818
with:
19-
dotnet-version: 8.0.x
19+
dotnet-version: |
20+
8.x
21+
9.x
2022
- name: Show dotnet version
2123
run: |
2224
dotnet --list-sdks
2325
dotnet --list-runtimes
2426
- name: Build with dotnet
2527
run: dotnet build ./src/Mapster.sln
26-
- name: Run tests on .NET 8.0
28+
- name: Run tests on .NET 9.0
2729
run: dotnet test --verbosity normal ./src/Mapster.sln

‎src/Benchmark/Benchmark.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<CopyLocalLockFileAssemblies Condition=" '$(Configuration)'=='Debug' ">true</CopyLocalLockFileAssemblies>
77
<DefaultItemExcludes>**/*.g.cs</DefaultItemExcludes>
88
</PropertyGroup>
@@ -19,11 +19,11 @@
1919
</Compile>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
22+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
2323
<PackageReference Include="ExpressionDebugger" Version="2.2.1" />
2424
<PackageReference Include="ExpressionTranslator" Version="2.5.0" />
25-
<PackageReference Include="AutoMapper" Version="10.1.1" />
26-
<PackageReference Include="FastExpressionCompiler" Version="3.2.1" />
25+
<PackageReference Include="AutoMapper" Version="13.0.1" />
26+
<PackageReference Include="FastExpressionCompiler" Version="5.0.0" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />

‎src/ExpressionDebugger/ExpressionDebugger.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>net6.0;net7.0;net8.0;</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<Authors>Chaowlert Chaisrichalermpol</Authors>
77
<Description>Step into debugging from linq expressions</Description>
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/ExpressionTranslator/ExpressionTranslator.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>net6.0;net7.0;net8.0;</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<Authors>Chaowlert Chaisrichalermpol</Authors>
77
<Description>Translate from linq expressions to C# code</Description>
@@ -26,6 +26,6 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="System.Runtime.Experimental" Version="6.0.0" />
29+
<PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
3030
</ItemGroup>
3131
</Project>

‎src/Mapster.Async.Tests/Mapster.Async.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
12-
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
13-
<PackageReference Include="Shouldly" Version="4.0.3" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
12+
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
13+
<PackageReference Include="Shouldly" Version="4.2.1" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Mapster.Async/Mapster.Async.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55
<Description>Async supports for Mapster</Description>
66
<IsPackable>true</IsPackable>
77
<PackageTags>Mapster;Async</PackageTags>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>Mapster.Async.snk</AssemblyOriginatorKeyFile>
10-
<Version>2.0.2-pre01</Version>
10+
<Version>2.0.3-pre01</Version>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎src/Mapster.Core/Mapster.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Lightweight library for Mapster and Mapster CodeGen</Description>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55
<AssemblyName>Mapster.Core</AssemblyName>
66
<PackageTags>mapster</PackageTags>
7-
<Version>1.2.2-pre01</Version>
7+
<Version>1.2.3-pre01</Version>
88
<Nullable>enable</Nullable>
99
<IsPackable>true</IsPackable>
1010
<SignAssembly>true</SignAssembly>

‎src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
13-
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
14-
<PackageReference Include="Shouldly" Version="4.0.3" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
13+
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
14+
<PackageReference Include="Shouldly" Version="4.2.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55
<Description>Dependency Injection supports for Mapster</Description>
66
<IsPackable>true</IsPackable>
77
<PackageTags>Mapster;DependencyInjection</PackageTags>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>Mapster.DependencyInjection.snk</AssemblyOriginatorKeyFile>
10-
<Version>1.0.2-pre01</Version>
10+
<Version>1.0.3-pre01</Version>
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<None Include="icon.png" Pack="true" PackagePath="\" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\Mapster\Mapster.csproj" />

‎src/Mapster.EF6/Mapster.EF6.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
55
<Description>EF6 plugin for Mapster</Description>
66
<IsPackable>true</IsPackable>
77
<PackageTags>Mapster;EF6</PackageTags>
88
<SignAssembly>True</SignAssembly>
99
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1010
<AssemblyOriginatorKeyFile>Mapster.EF6.snk</AssemblyOriginatorKeyFile>
11-
<Version>2.0.2-pre01</Version>
11+
<Version>2.0.3-pre01</Version>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="EntityFramework" Version="6.4.4" />
14+
<PackageReference Include="EntityFramework" Version="6.5.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)