Skip to content

Automapper 15 support #83

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
jbogard merged 1 commit into from
Nov 3, 2025
Merged

Automapper 15 support #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 19 additions & 18 deletions AutoMapper.Data.Tests/DataReaderMappingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace AutoMapper.Data.Tests
{
using Microsoft.Extensions.Logging.Abstractions;
using System;
using System.Collections.Generic;
using System.Data;
Expand All @@ -18,7 +19,7 @@ public When_mapping_a_data_reader_to_a_dto()

cfg.CreateMap<IDataRecord, DTOObject>()
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
});
}, new NullLoggerFactory());

Mapper = new Mapper(configuration);
DataReader = new DataBuilder().BuildDataReader();
Expand Down Expand Up @@ -122,14 +123,14 @@ public class When_mapping_a_data_reader_to_matching_dtos
{
public When_mapping_a_data_reader_to_matching_dtos()
{
MapperConfiguration configuration = new MapperConfiguration(cfg =>{
cfg.AddDataReaderMapping();
MapperConfiguration configuration = new MapperConfiguration(cfg => {
cfg.AddDataReaderMapping();

cfg.CreateMap<IDataRecord, DTOObject>()
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
cfg.CreateMap<IDataRecord, DerivedDTOObject>()
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
});
cfg.CreateMap<IDataRecord, DTOObject>()
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
cfg.CreateMap<IDataRecord, DerivedDTOObject>()
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
}, new NullLoggerFactory());

_mapper = new Mapper(configuration);
_mapper.Map<IDataReader, IEnumerable<DTOObject>>(new DataBuilder().BuildDataReader()).ToArray();
Expand All @@ -155,7 +156,7 @@ public void Should_have_valid_mapping()
/// </summary>
public class When_mapping_a_data_reader_to_a_dto_twice : When_mapping_a_data_reader_to_a_dto
{
public When_mapping_a_data_reader_to_a_dto_twice()
public When_mapping_a_data_reader_to_a_dto_twice()
{
DataReader = new DataBuilder().BuildDataReader();
Results = Mapper.Map<IDataReader, IEnumerable<DTOObject>>(DataReader);
Expand Down Expand Up @@ -187,8 +188,8 @@ public class When_mapping_a_data_reader_to_a_dto_and_the_map_does_not_exist
{
public When_mapping_a_data_reader_to_a_dto_and_the_map_does_not_exist()
{
MapperConfiguration configuration =
new MapperConfiguration(cfg => cfg.Internal().Mappers.Insert(0, new DataReaderMapper()));
MapperConfiguration configuration =
new MapperConfiguration(cfg => cfg.Internal().Mappers.Insert(0, new DataReaderMapper()), new NullLoggerFactory());

_mapper = new Mapper(configuration);
_dataReader = new DataBuilder().BuildDataReader();
Expand Down Expand Up @@ -224,7 +225,7 @@ public When_mapping_a_single_data_record_to_a_dto()

cfg.CreateMap<IDataRecord, DTOObject>()
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(src.GetOrdinal(FieldName.Something))));
});
}, new NullLoggerFactory());

_mapper = new Mapper(configuration);
_dataRecord = new DataBuilder().BuildDataRecord();
Expand Down Expand Up @@ -345,7 +346,7 @@ public When_mapping_a_data_reader_to_a_dto_with_nullable_field()
cfg.AddDataReaderMapping();

cfg.CreateMap<IDataReader, DtoWithSingleNullableField>();
});
}, new NullLoggerFactory());
_mapper = new Mapper(configuration);

_dataReader = new DataBuilder().BuildDataReaderWithNullableField();
Expand Down Expand Up @@ -426,7 +427,7 @@ public When_mapping_a_data_reader_to_a_dto_with_nullable_enum()
cfg.AddDataReaderMapping();

cfg.CreateMap<IDataReader, DtoWithSingleNullableField>();
});
}, new NullLoggerFactory());
_mapper = new Mapper(configuration);

_dataReader = new DataBuilder().BuildDataReaderWithNullableField();
Expand Down Expand Up @@ -524,7 +525,7 @@ public When_mapping_a_data_reader_to_a_dto_with_nested_dto()
cfg.AddDataReaderMapping();

cfg.CreateMap<IDataRecord, DtoWithNestedClass>();
});
}, new NullLoggerFactory());

_mapper = new Mapper(configuration);
_dataReader = new DataBuilder().BuildDataReaderWithNestedClass();
Expand Down Expand Up @@ -593,7 +594,7 @@ public When_mapping_a_data_reader_to_a_dto_with_missing_columns_in_data_reader()
cfg.AddDataReaderMapping();

cfg.CreateMap<IDataRecord, DtoWithMoreColumnsThanDataReader>();
});
}, new NullLoggerFactory());

_mapper = new Mapper(configuration);
_dataReader = new DataBuilder().BuildDataReaderWithMissingColumns();
Expand All @@ -618,7 +619,7 @@ public void Then_results_should_be_as_expected()
private IMapper _mapper;
}

public class When_mapping_a_data_reader_to_a_dto_with_an_interface_member
public class When_mapping_a_data_reader_to_a_dto_with_an_interface_member
{
private const string FieldName = "Name";
private const string FieldValue = "Value";
Expand Down Expand Up @@ -656,7 +657,7 @@ void Then_results_should_be_as_expected()
{
cfg.AddDataReaderMapping();
cfg.CreateMap<IDataRecord, NoneSuch>();
});
}, new NullLoggerFactory());

var mapper = new Mapper(configuration);
var dataReader = DataBuilder.BuildDataReader();
Expand Down
5 changes: 3 additions & 2 deletions AutoMapper.Data.Tests/ProfileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace AutoMapper.Data.Tests
{
using Microsoft.Extensions.Logging.Abstractions;
using System.Collections.Generic;
using System.Data;
using System.Linq;
Expand All @@ -10,9 +11,9 @@ public abstract class ProfileTestsBase
{
public ProfileTestsBase()
{
MapperConfiguration configuration = new MapperConfiguration(cfg =>{
MapperConfiguration configuration = new MapperConfiguration(cfg => {
ConfigureMapper(cfg);
});
}, new NullLoggerFactory());

Mapper = new Mapper(configuration);
DataReader = new DataBuilder().BuildDataReader();
Expand Down
56 changes: 28 additions & 28 deletions AutoMapper.Data/AutoMapper.Data.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>ADO.NET extensions for AutoMapper</Description>
<VersionPrefix>9.0.0</VersionPrefix>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Jimmy Bogard</Authors>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>AutoMapper.Data</AssemblyName>
<PackageId>AutoMapper.Data</PackageId>
<PackageTags>AutoMapper</PackageTags>
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/AutoMapper/AutoMapper.Data</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<Deterministic>true</Deterministic>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\AutoMapper.Data.snk</AssemblyOriginatorKeyFile>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
</PropertyGroup>
<PropertyGroup>
<Description>ADO.NET extensions for AutoMapper</Description>
<VersionPrefix>15.0.0</VersionPrefix>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Authors>Jimmy Bogard</Authors>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>AutoMapper.Data</AssemblyName>
<PackageId>AutoMapper.Data</PackageId>
<PackageTags>AutoMapper</PackageTags>
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/AutoMapper/AutoMapper.Data</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<Deterministic>true</Deterministic>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\AutoMapper.Data.snk</AssemblyOriginatorKeyFile>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="[14.0.0, 15.0.0)" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="[15.0.0, 16.0.0)" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>

</Project>
</Project>