Skip to content

- Changed reference to AutoMapper to the range [11.0, 12.0) #12

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 4 commits into from
Jan 6, 2022
Merged

- Changed reference to AutoMapper to the range [11.0, 12.0) #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af9e784
- Changed reference to AutoMapper to the range `[11.0, 12.0)`
micdah Jan 6, 2022
2d222e6
Use latest .net
micdah Jan 6, 2022
b472f3a
Use latest .net
micdah Jan 6, 2022
0dd1062
Merge remote-tracking branch 'origin/mda/upgrade-to-AutoMapper-11' in…
micdah Jan 6, 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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Use .NET 6
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- name: Build and Test
run: ./Build.ps1
shell: pwsh
Expand Down
15 changes: 1 addition & 14 deletions src/AutoMapper.Extensions.EnumMapping.Tests/AutoMapper.Extensions.EnumMapping.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.1;</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
Expand All @@ -24,17 +24,4 @@
<ProjectReference Include="..\..\src\AutoMapper.Extensions.EnumMapping\AutoMapper.Extensions.EnumMapping.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>

</Project>
13 changes: 3 additions & 10 deletions 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 @@ -5,7 +5,7 @@
<Company>Henk Kin</Company>
<Summary>Convention-based enum value mapping extension for AutoMapper.</Summary>
<Description>Convention-based enum value mapping extension for AutoMapper.</Description>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFramework>netstandard2.1</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>AutoMapper.Extensions.EnumMapping</AssemblyName>
<AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
Expand All @@ -24,19 +24,12 @@
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<ItemGroup>
<PackageReference Include="AutoMapper" Version="[11.0, 12.0)" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" />
Expand Down
3 changes: 2 additions & 1 deletion src/AutoMapper.Extensions.EnumMapping/EnumMapperConfigurationExpressionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Linq;
using AutoMapper.Extensions.EnumMapping.Internal;
using AutoMapper.Internal;

namespace AutoMapper.Extensions.EnumMapping
{
Expand All @@ -14,7 +15,7 @@ public static class EnumMapperConfigurationExpressionExtensions
/// <param name="mapperConfigurationExpression">Configuration object for AutoMapper</param>
public static void EnableEnumMappingValidation(this IMapperConfigurationExpression mapperConfigurationExpression)
{
mapperConfigurationExpression.Advanced.Validator(context =>
mapperConfigurationExpression.Internal().Validator(context =>
{
if (context.TypeMap != null)
{
Expand Down
3 changes: 2 additions & 1 deletion src/AutoMapper.Extensions.EnumMapping/Internal/EnumMappingValidationRuntimeFeature.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.Text;
using AutoMapper.Internal;

namespace AutoMapper.Extensions.EnumMapping.Internal
{
Expand All @@ -17,7 +18,7 @@ public EnumMappingValidationRuntimeFeature(Dictionary<TSource, TDestination> enu
_enumMappingType = enumMappingType;
}

public void Seal(IConfigurationProvider configurationProvider)
public void Seal(IGlobalConfiguration configurationProvider)
{
}

Expand Down
1 change: 1 addition & 0 deletions src/AutoMapper.Extensions.EnumMapping/Internal/IEnumMappingValidationRuntimeFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using AutoMapper.Features;
using AutoMapper.Internal;

namespace AutoMapper.Extensions.EnumMapping.Internal
{
Expand Down