AutoMapper v14 (#236)

* 1) Supporting AutoMapper v14.
2) Fixes Issue #235

Author: BlaiseD

AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj

@@ -12,6 +12,7 @@
     <RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</PackageProjectUrl>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
     <AssemblyOriginatorKeyFile>..\AutoMapper.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <MinVerTagPrefix>v</MinVerTagPrefix>
@@ -25,10 +26,11 @@
 
   <ItemGroup>
     <None Include="..\icon.png" Pack="true" PackagePath="" />
+		<None Include="..\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[7.0.2,8.0.0)" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[8.0.0,9.0.0)" />
     <PackageReference Include="LogicBuilder.Expressions.Utils" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.1.1" />
     <PackageReference Include="MinVer" Version="6.0.0">

AutoMapper.AspNetCore.OData.EFCore/Visitors/ProjectionVisitor.cs

@@ -36,7 +36,7 @@ protected override Expression VisitMemberInit(MemberInitExpression node)
 
             List<MemberBinding> AddBinding(List<MemberBinding> list, MemberAssignment binding)
             {
-                if (ListTypesAreEquivalent(binding.Member.GetMemberType(), expansion.MemberType)
+                if (TypesAreEquivalent(binding.Member.GetMemberType(), expansion.MemberType)
                         && string.Compare(binding.Member.Name, expansion.MemberName, true) == 0)//found the expansion
                 {
                     if (foundExpansions.Count > 0)
@@ -61,8 +61,11 @@ void AddBindingExpression(Expression bindingExpression)
 
         protected abstract Expression GetBindingExpression(MemberAssignment binding, ODataExpansionOptions expansion);
 
-        protected static bool ListTypesAreEquivalent(Type bindingType, Type expansionType)
+        protected static bool TypesAreEquivalent(Type bindingType, Type expansionType)
         {
+            if (!bindingType.IsList() && !expansionType.IsList())
+                return bindingType == expansionType;
+
             if (!bindingType.IsList() || !expansionType.IsList())
                 return false;