Skip to content

Adding support for .NET 10 #4586

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
merged 5 commits into from
Nov 19, 2025
+22 −16
Merged

Adding support for .NET 10 #4586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acc2255
Adding support for .NET 10
jbogard Nov 13, 2025
0f6a19d
Fixing the build
jbogard Nov 14, 2025
4ae77b6
Fixing tuple issue
jbogard Nov 17, 2025
5b3871c
Revert "Fixing tuple issue"
jbogard Nov 19, 2025
2222d53
Fixing compile errors
jbogard Nov 19, 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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Build and Test
run: ./Build.ps1
shell: pwsh
Expand All @@ -49,6 +50,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Build and Test
run: ./Build.ps1
shell: pwsh
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Build and Test
run: ./Build.ps1
shell: pwsh
Expand All @@ -40,6 +41,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Build and Test
run: ./Build.ps1
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions src/AutoMapper.DI.Tests/AutoMapper.DI.Tests.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>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>AutoMapper.Extensions.Microsoft.DependencyInjection.Tests</AssemblyName>
<PackageId>AutoMapper.Extensions.Microsoft.DependencyInjection.Tests</PackageId>
Expand All @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="xunit" Version="2.9.2" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/AutoMapper/AutoMapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<PropertyGroup>
<Summary>A convention-based object-object mapper.</Summary>
<Description>A convention-based object-object mapper.</Description>
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
<LangVersion>13.0</LangVersion>
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>14.0</LangVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>AutoMapper</AssemblyName>
<AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -44,8 +44,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, )"/>
<PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0, )"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[10.0.0, )"/>
<PackageReference Include="Microsoft.Extensions.Options" Version="[10.0.0, )"/>
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="[8.14.0, )"/>
<PackageReference Include="Microsoft.Bcl.HashCode" Version="[6.0.0, )" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net471'" />
<PackageReference Include="System.Reflection.Emit" Version="[4.7.0, )" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
Expand Down
2 changes: 1 addition & 1 deletion src/Benchmark/Benchmark.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>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/IntegrationTests/AutoMapper.IntegrationTests.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>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>
<NoWarn>$(NoWarn);618</NoWarn>
<AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -13,7 +13,7 @@
<PackageReference Include="Testcontainers.MsSql" Version="4.8.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/TestApp/TestApp.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>
<AssemblyName>TestApp</AssemblyName>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<ProjectReference Include="..\AutoMapper\AutoMapper.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/UnitTests/AutoMapper.UnitTests.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>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<NoWarn>$(NoWarn);649;618</NoWarn>
<AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -14,7 +14,7 @@

<ItemGroup>
<ProjectReference Include="..\AutoMapper\AutoMapper.csproj" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.6.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
Expand Down
8 changes: 5 additions & 3 deletions src/UnitTests/Bug/MultiThreadingIssues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace AutoMapper.UnitTests.Bug;
using System.Linq;

namespace AutoMapper.UnitTests.Bug;
public class MultiThreadingIssues
{
public class Type1
Expand Down Expand Up @@ -641,7 +643,7 @@ public async Task Should_work()
};
var tasks =
types
.Concat(types.Select(t => t.Reverse().ToArray()))
.Concat(types.Select(t => Enumerable.Reverse(t).ToArray()))
.Select(t=>(SourceType: sourceType.MakeGenericType(t[0]), DestinationType: destinationType.MakeGenericType(t[1])))
.ToArray()
.Select(s => Task.Factory.StartNew(() => c.ResolveTypeMap(s.SourceType, s.DestinationType)))
Expand Down Expand Up @@ -1173,7 +1175,7 @@ public async Task Should_work()
};
var tasks =
types
.Concat(types.Select(t => t.Reverse().ToArray()))
.Concat(types.Select(t => Enumerable.Reverse(t).ToArray()))
.Select(t=>(SourceType: sourceType.MakeGenericType(t[0]), DestinationType: destinationType.MakeGenericType(t[1])))
.ToArray()
.Select(s => Task.Factory.StartNew(() => mapper.Map(null, s.SourceType, s.DestinationType)))
Expand Down
Loading