Merge pull request #12 from micdah/mda/upgrade-to-AutoMapper-11

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

Author: jbogard

.github/workflows/ci.yml

@@ -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

src/AutoMapper.Extensions.EnumMapping.Tests/AutoMapper.Extensions.EnumMapping.Tests.csproj

@@ -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>
@@ -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>

src/AutoMapper.Extensions.EnumMapping/AutoMapper.Extensions.EnumMapping.csproj

@@ -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>
@@ -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" />

src/AutoMapper.Extensions.EnumMapping/EnumMapperConfigurationExpressionExtensions.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using AutoMapper.Extensions.EnumMapping.Internal;
+using AutoMapper.Internal;
 
 namespace AutoMapper.Extensions.EnumMapping
 {
@@ -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)
                 {

src/AutoMapper.Extensions.EnumMapping/Internal/EnumMappingValidationRuntimeFeature.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using AutoMapper.Internal;
 
 namespace AutoMapper.Extensions.EnumMapping.Internal
 {
@@ -17,7 +18,7 @@ public EnumMappingValidationRuntimeFeature(Dictionary<TSource, TDestination> enu
             _enumMappingType = enumMappingType;
         }
 
-        public void Seal(IConfigurationProvider configurationProvider)
+        public void Seal(IGlobalConfiguration configurationProvider)
         {
         }
 

src/AutoMapper.Extensions.EnumMapping/Internal/IEnumMappingValidationRuntimeFeature.cs

@@ -1,4 +1,5 @@
 using AutoMapper.Features;
+using AutoMapper.Internal;
 
 namespace AutoMapper.Extensions.EnumMapping.Internal
 {