Skip to content
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

Changed reference to AutoMapper to the range [12.0, 13.0) #15

Merged
merged 3 commits into from
Oct 3, 2022
Merged

Changed reference to AutoMapper to the range [12.0, 13.0) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21b3eb0
Changed reference to AutoMapper to the range [11.0, 13.0)
ioaznnis Oct 2, 2022
8eb3e89
Upgrade reference to AutoMapper 12
ioaznnis Oct 3, 2022
7a3b374
Set CustomMapExpression over TypeConverter
ioaznnis Oct 3, 2022
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: 1 addition & 1 deletion src/AutoMapper.Extensions.EnumMapping/AutoMapper.Extensions.EnumMapping.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="[11.0, 12.0)" />
<PackageReference Include="AutoMapper" Version="[12.0, 13.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions src/AutoMapper.Extensions.EnumMapping/EnumMapperConfigurationExpressionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ public static void EnableEnumMappingValidation(this IMapperConfigurationExpressi
{
if (context.TypeMap != null)
{
var validator = context.TypeMap.Features.OfType<IEnumMappingValidationRuntimeFeature>().SingleOrDefault();
validator?.Validate(context.TypeMap.Types);
foreach (var feature in context.TypeMap.Features)
{
if (feature is IEnumMappingValidationRuntimeFeature validator)
{
validator.Validate(context.TypeMap.Types);
}
}
}
});
}
Expand Down
10 changes: 6 additions & 4 deletions src/AutoMapper.Extensions.EnumMapping/Internal/EnumMappingFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using AutoMapper.Execution;
using AutoMapper.Features;

namespace AutoMapper.Extensions.EnumMapping.Internal
Expand All @@ -21,14 +22,15 @@ public void Configure(TypeMap typeMap)
throw new ArgumentException($"The type {typeMap.SourceType.FullName} can not be configured as an Enum, because it is not an Enum");
}

if (!typeMap.DestinationTypeToUse.IsEnum)
if (!typeMap.DestinationType.IsEnum)
{
throw new ArgumentException($"The type {typeMap.DestinationTypeToUse.FullName} can not be configured as an Enum, because it is not an Enum");
throw new ArgumentException($"The type {typeMap.DestinationType.FullName} can not be configured as an Enum, because it is not an Enum");
}

var enumValueMappings = CreateOverridedEnumValueMappings(typeMap.SourceType, typeMap.DestinationTypeToUse);
var enumValueMappings = CreateOverridedEnumValueMappings(typeMap.SourceType, typeMap.DestinationType);

typeMap.CustomMapExpression = new CustomMapExpressionFactory<TSource, TDestination>(enumValueMappings).Create();
var lambdaExpression = new CustomMapExpressionFactory<TSource, TDestination>(enumValueMappings).Create();
typeMap.TypeConverter = new ExpressionTypeConverter(lambdaExpression);
typeMap.Features.Set(new EnumMappingValidationRuntimeFeature<TSource, TDestination>(enumValueMappings, EnumMappingType));
}

Expand Down