Skip to content

Commit cf6f82e

Browse files
jbogardjbogard
authored
Merge pull request #83 from thombrink/feature/automapper-15-support
Automapper 15 support
2 parents bd23f16 + a84db8e commit cf6f82e

File tree

3 files changed

+50
-48
lines changed

3 files changed

+50
-48
lines changed

‎AutoMapper.Data.Tests/DataReaderMappingTests.cs‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace AutoMapper.Data.Tests
22
{
3+
using Microsoft.Extensions.Logging.Abstractions;
34
using System;
45
using System.Collections.Generic;
56
using System.Data;
@@ -18,7 +19,7 @@ public When_mapping_a_data_reader_to_a_dto()
1819

1920
cfg.CreateMap<IDataRecord, DTOObject>()
2021
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
21-
});
22+
}, new NullLoggerFactory());
2223

2324
Mapper = new Mapper(configuration);
2425
DataReader = new DataBuilder().BuildDataReader();
@@ -122,14 +123,14 @@ public class When_mapping_a_data_reader_to_matching_dtos
122123
{
123124
public When_mapping_a_data_reader_to_matching_dtos()
124125
{
125-
MapperConfiguration configuration = new MapperConfiguration(cfg =>{
126-
cfg.AddDataReaderMapping();
126+
MapperConfiguration configuration = new MapperConfiguration(cfg => {
127+
cfg.AddDataReaderMapping();
127128

128-
cfg.CreateMap<IDataRecord, DTOObject>()
129-
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
130-
cfg.CreateMap<IDataRecord, DerivedDTOObject>()
131-
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
132-
});
129+
cfg.CreateMap<IDataRecord, DTOObject>()
130+
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
131+
cfg.CreateMap<IDataRecord, DerivedDTOObject>()
132+
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(10)));
133+
}, new NullLoggerFactory());
133134

134135
_mapper = new Mapper(configuration);
135136
_mapper.Map<IDataReader, IEnumerable<DTOObject>>(new DataBuilder().BuildDataReader()).ToArray();
@@ -155,7 +156,7 @@ public void Should_have_valid_mapping()
155156
/// </summary>
156157
public class When_mapping_a_data_reader_to_a_dto_twice : When_mapping_a_data_reader_to_a_dto
157158
{
158-
public When_mapping_a_data_reader_to_a_dto_twice()
159+
public When_mapping_a_data_reader_to_a_dto_twice()
159160
{
160161
DataReader = new DataBuilder().BuildDataReader();
161162
Results = Mapper.Map<IDataReader, IEnumerable<DTOObject>>(DataReader);
@@ -187,8 +188,8 @@ public class When_mapping_a_data_reader_to_a_dto_and_the_map_does_not_exist
187188
{
188189
public When_mapping_a_data_reader_to_a_dto_and_the_map_does_not_exist()
189190
{
190-
MapperConfiguration configuration =
191-
new MapperConfiguration(cfg => cfg.Internal().Mappers.Insert(0, new DataReaderMapper()));
191+
MapperConfiguration configuration =
192+
new MapperConfiguration(cfg => cfg.Internal().Mappers.Insert(0, new DataReaderMapper()), new NullLoggerFactory());
192193

193194
_mapper = new Mapper(configuration);
194195
_dataReader = new DataBuilder().BuildDataReader();
@@ -224,7 +225,7 @@ public When_mapping_a_single_data_record_to_a_dto()
224225

225226
cfg.CreateMap<IDataRecord, DTOObject>()
226227
.ForMember(dest => dest.Else, options => options.MapFrom(src => src.GetDateTime(src.GetOrdinal(FieldName.Something))));
227-
});
228+
}, new NullLoggerFactory());
228229

229230
_mapper = new Mapper(configuration);
230231
_dataRecord = new DataBuilder().BuildDataRecord();
@@ -345,7 +346,7 @@ public When_mapping_a_data_reader_to_a_dto_with_nullable_field()
345346
cfg.AddDataReaderMapping();
346347

347348
cfg.CreateMap<IDataReader, DtoWithSingleNullableField>();
348-
});
349+
}, new NullLoggerFactory());
349350
_mapper = new Mapper(configuration);
350351

351352
_dataReader = new DataBuilder().BuildDataReaderWithNullableField();
@@ -426,7 +427,7 @@ public When_mapping_a_data_reader_to_a_dto_with_nullable_enum()
426427
cfg.AddDataReaderMapping();
427428

428429
cfg.CreateMap<IDataReader, DtoWithSingleNullableField>();
429-
});
430+
}, new NullLoggerFactory());
430431
_mapper = new Mapper(configuration);
431432

432433
_dataReader = new DataBuilder().BuildDataReaderWithNullableField();
@@ -524,7 +525,7 @@ public When_mapping_a_data_reader_to_a_dto_with_nested_dto()
524525
cfg.AddDataReaderMapping();
525526

526527
cfg.CreateMap<IDataRecord, DtoWithNestedClass>();
527-
});
528+
}, new NullLoggerFactory());
528529

529530
_mapper = new Mapper(configuration);
530531
_dataReader = new DataBuilder().BuildDataReaderWithNestedClass();
@@ -593,7 +594,7 @@ public When_mapping_a_data_reader_to_a_dto_with_missing_columns_in_data_reader()
593594
cfg.AddDataReaderMapping();
594595

595596
cfg.CreateMap<IDataRecord, DtoWithMoreColumnsThanDataReader>();
596-
});
597+
}, new NullLoggerFactory());
597598

598599
_mapper = new Mapper(configuration);
599600
_dataReader = new DataBuilder().BuildDataReaderWithMissingColumns();
@@ -618,7 +619,7 @@ public void Then_results_should_be_as_expected()
618619
private IMapper _mapper;
619620
}
620621

621-
public class When_mapping_a_data_reader_to_a_dto_with_an_interface_member
622+
public class When_mapping_a_data_reader_to_a_dto_with_an_interface_member
622623
{
623624
private const string FieldName = "Name";
624625
private const string FieldValue = "Value";
@@ -656,7 +657,7 @@ void Then_results_should_be_as_expected()
656657
{
657658
cfg.AddDataReaderMapping();
658659
cfg.CreateMap<IDataRecord, NoneSuch>();
659-
});
660+
}, new NullLoggerFactory());
660661

661662
var mapper = new Mapper(configuration);
662663
var dataReader = DataBuilder.BuildDataReader();

‎AutoMapper.Data.Tests/ProfileTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace AutoMapper.Data.Tests
22
{
3+
using Microsoft.Extensions.Logging.Abstractions;
34
using System.Collections.Generic;
45
using System.Data;
56
using System.Linq;
@@ -10,9 +11,9 @@ public abstract class ProfileTestsBase
1011
{
1112
public ProfileTestsBase()
1213
{
13-
MapperConfiguration configuration = new MapperConfiguration(cfg =>{
14+
MapperConfiguration configuration = new MapperConfiguration(cfg => {
1415
ConfigureMapper(cfg);
15-
});
16+
}, new NullLoggerFactory());
1617

1718
Mapper = new Mapper(configuration);
1819
DataReader = new DataBuilder().BuildDataReader();

‎AutoMapper.Data/AutoMapper.Data.csproj‎

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

3-
<PropertyGroup>
4-
<Description>ADO.NET extensions for AutoMapper</Description>
5-
<VersionPrefix>9.0.0</VersionPrefix>
6-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7-
<Authors>Jimmy Bogard</Authors>
8-
<TargetFramework>net8.0</TargetFramework>
9-
<AssemblyName>AutoMapper.Data</AssemblyName>
10-
<PackageId>AutoMapper.Data</PackageId>
11-
<PackageTags>AutoMapper</PackageTags>
12-
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
13-
<PackageProjectUrl>https://github.com/AutoMapper/AutoMapper.Data</PackageProjectUrl>
14-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16-
<PackageReadmeFile>README.md</PackageReadmeFile>
17-
<IncludeSymbols>true</IncludeSymbols>
18-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
19-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
20-
<Deterministic>true</Deterministic>
21-
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
22-
<SignAssembly>true</SignAssembly>
23-
<AssemblyOriginatorKeyFile>..\AutoMapper.Data.snk</AssemblyOriginatorKeyFile>
24-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
25-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Description>ADO.NET extensions for AutoMapper</Description>
5+
<VersionPrefix>15.0.0</VersionPrefix>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
<Authors>Jimmy Bogard</Authors>
8+
<TargetFramework>net8.0</TargetFramework>
9+
<AssemblyName>AutoMapper.Data</AssemblyName>
10+
<PackageId>AutoMapper.Data</PackageId>
11+
<PackageTags>AutoMapper</PackageTags>
12+
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
13+
<PackageProjectUrl>https://github.com/AutoMapper/AutoMapper.Data</PackageProjectUrl>
14+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
17+
<IncludeSymbols>true</IncludeSymbols>
18+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
19+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
20+
<Deterministic>true</Deterministic>
21+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
22+
<SignAssembly>true</SignAssembly>
23+
<AssemblyOriginatorKeyFile>..\AutoMapper.Data.snk</AssemblyOriginatorKeyFile>
24+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
25+
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<PackageReference Include="AutoMapper" Version="[14.0.0, 15.0.0)" />
29-
<None Include="..\README.md" Pack="true" PackagePath="" />
30-
</ItemGroup>
27+
<ItemGroup>
28+
<PackageReference Include="AutoMapper" Version="[15.0.0, 16.0.0)" />
29+
<None Include="..\README.md" Pack="true" PackagePath="" />
30+
</ItemGroup>
3131

32-
</Project>
32+
</Project>

0 commit comments

Comments
 (0)