Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
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
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
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
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
8 changes: 6 additions & 2 deletions src/UnitTests/AutoMapper.UnitTests.csproj
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,11 +14,15 @@

<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" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="[6.0.0, )" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net471'" />
<PackageReference Include="System.ValueTuple" Version="4.6.1" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net471'" />
<PackageReference Include="System.Reflection.Emit" Version="[4.7.0, )" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageReference Include="PolySharp" Version="1.15.0" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net471'" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
Expand Down
12 changes: 10 additions & 2 deletions src/UnitTests/Bug/MultiThreadingIssues.cs
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,12 @@
};
var tasks =
types
.Concat(types.Select(t => t.Reverse().ToArray()))

Check failure on line 644 in src/UnitTests/Bug/MultiThreadingIssues.cs

View workflow job for this annotation

GitHub Actions / build-windows

Operator '.' cannot be applied to operand of type 'void'
.Select(t=>(SourceType: sourceType.MakeGenericType(t[0]), DestinationType: destinationType.MakeGenericType(t[1])))
.Select(t=> new
{
SourceType = sourceType.MakeGenericType(t[0]),
DestinationType = destinationType.MakeGenericType(t[1])
})
.ToArray()
.Select(s => Task.Factory.StartNew(() => c.ResolveTypeMap(s.SourceType, s.DestinationType)))
.ToArray();
Expand Down Expand Up @@ -1173,8 +1177,12 @@
};
var tasks =
types
.Concat(types.Select(t => t.Reverse().ToArray()))

Check failure on line 1180 in src/UnitTests/Bug/MultiThreadingIssues.cs

View workflow job for this annotation

GitHub Actions / build-windows

Operator '.' cannot be applied to operand of type 'void'
.Select(t=>(SourceType: sourceType.MakeGenericType(t[0]), DestinationType: destinationType.MakeGenericType(t[1])))
.Select(t=> new
{
SourceType = sourceType.MakeGenericType(t[0]),
DestinationType = destinationType.MakeGenericType(t[1])
})
.ToArray()
.Select(s => Task.Factory.StartNew(() => mapper.Map(null, s.SourceType, s.DestinationType)))
.ToArray();
Expand Down
Loading