Merge pull request #192 from DenisTDR/master

Author: jbogard

src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection.EntityFramework.Tests</AssemblyName>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/AutoMapper.Collection.EntityFramework.Tests/MappingTestBase.cs

@@ -1,12 +1,13 @@
 using System;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace AutoMapper.Collection
 {
     public abstract class MappingTestBase
     {
         protected IMapper CreateMapper(Action<IMapperConfigurationExpression> cfg)
         {
-            var map = new MapperConfiguration(cfg);
+            var map = new MapperConfiguration(cfg, new NullLoggerFactory());
             map.CompileMappings();
 
             var mapper = map.CreateMapper();

src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Collection updating support for EntityFramework with AutoMapper. Extends DBSet&lt;T&gt; with Persist&lt;TDto&gt;().InsertUpdate(dto) and Persist&lt;TDto&gt;().Delete(dto).  Will find the matching object and will Insert/Update/Delete.</Description>
     <Authors>Tyler Carlson</Authors>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection.EntityFramework</AssemblyName>
     <PackageId>AutoMapper.Collection.EntityFramework</PackageId>
     <PackageIcon>icon.png</PackageIcon>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="8.0.0" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="9.0.1" />
     <PackageReference Include="EntityFramework" Version="6.5.1" />
     <PackageReference Include="MinVer" Version="2.3.1">
       <PrivateAssets>all</PrivateAssets>

src/AutoMapper.Collection.Tests/MapCollectionWithEqualityThreadSafetyTests.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace AutoMapper.Collection
 {
@@ -14,7 +15,7 @@ public async Task Should_Work_When_Initialized_Concurrently()
                 new MapperConfiguration(cfg =>
                 {
                     cfg.AddCollectionMappers();
-                });
+                }, new NullLoggerFactory());
             };
             var tasks = new List<Task>();
             for (var i = 0; i < 5; i++)

src/AutoMapper.Collection.Tests/MappingTestBase.cs

@@ -1,12 +1,13 @@
 using System;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace AutoMapper.Collection
 {
     public abstract class MappingTestBase
     {
         protected IMapper CreateMapper(Action<IMapperConfigurationExpression> cfg)
         {
-            var map = new MapperConfiguration(cfg);
+            var map = new MapperConfiguration(cfg, new NullLoggerFactory());
             map.CompileMappings();
 
             var mapper = map.CreateMapper();

src/AutoMapper.Collection.Tests/ValueTypeTests.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using AutoMapper.EquivalencyExpression;
+using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
 namespace AutoMapper.Collection
@@ -23,7 +24,7 @@ public void MapValueTypes()
 
                 c.CreateMap<int, PersonNationality>()
                     .EqualityComparison((src, dest) => dest.NationalityCountryId == src);
-            }));
+            }, new NullLoggerFactory()));
 
             var persons = new[]
             {

src/AutoMapper.Collection/AutoMapper.Collection.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Collection Add/Remove/Update support for AutoMapper. AutoMapper.Collection adds EqualityComparison Expressions for TypeMaps to determine if Source and Destination type are equivalent to each other when mapping collections.</Description>
     <Authors>Tyler Carlson</Authors>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection</AssemblyName>
     <PackageId>AutoMapper.Collection</PackageId>
     <PackageIcon>icon.png</PackageIcon>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="[14.0.0, 15.0.0)" />
+    <PackageReference Include="AutoMapper" Version="[15.0.1, 16.0.0)" />
     <PackageReference Include="MinVer" Version="2.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>