diff --git a/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj b/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj
index 1cfef47..27cfdce 100644
--- a/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj
+++ b/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj
@@ -6,7 +6,7 @@
AutoMapper.AspNetCore.OData.EF6
Creates LINQ expressions from ODataQueryOptions and executes the query.
false
- Supporting AutoMapper v14 (EF Core only).
+ Supporting AutoMapper v15 (EF Core only).
linq expressions odata efcore
icon.png
https://github.com/AutoMapper/AutoMapper.Extensions.OData
diff --git a/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj b/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj
index 8193d76..2566219 100644
--- a/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj
+++ b/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj
@@ -6,7 +6,7 @@
AutoMapper.AspNetCore.OData.EFCore
Creates LINQ expressions from ODataQueryOptions and executes the query.
false
- Supporting AutoMapper v14 (EF Core only).
+ Supporting AutoMapper v15 (EF Core only).
linq expressions odata efcore
icon.png
https://github.com/AutoMapper/AutoMapper.Extensions.OData
@@ -30,7 +30,7 @@
-
+
diff --git a/AutoMapper.OData.EFCore.Tests/ExpansionTests.cs b/AutoMapper.OData.EFCore.Tests/ExpansionTests.cs
index 7e9f043..8cf4519 100644
--- a/AutoMapper.OData.EFCore.Tests/ExpansionTests.cs
+++ b/AutoMapper.OData.EFCore.Tests/ExpansionTests.cs
@@ -7,6 +7,7 @@
using Microsoft.AspNetCore.OData.Query;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -217,7 +218,7 @@ public ExpansionTestsFixture()
),
ServiceLifetime.Transient
)
- .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
+ .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly), new NullLoggerFactory()))
.AddTransient(sp => new Mapper(sp.GetRequiredService(), sp.GetService))
.AddTransient(sp => new ApplicationBuilder(sp))
.AddRouting()
diff --git a/AutoMapper.OData.EFCore.Tests/GetQuerySelectTests.cs b/AutoMapper.OData.EFCore.Tests/GetQuerySelectTests.cs
index d46a445..ba9c456 100644
--- a/AutoMapper.OData.EFCore.Tests/GetQuerySelectTests.cs
+++ b/AutoMapper.OData.EFCore.Tests/GetQuerySelectTests.cs
@@ -7,6 +7,7 @@
using Microsoft.AspNetCore.OData.Query;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -213,7 +214,7 @@ public GetQuerySelectTestsFixture()
),
ServiceLifetime.Transient
)
- .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
+ .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly), new NullLoggerFactory()))
.AddTransient(sp => new Mapper(sp.GetRequiredService(), sp.GetService))
.AddTransient(sp => new ApplicationBuilder(sp))
.AddRouting()
diff --git a/AutoMapper.OData.EFCore.Tests/GetQueryTests.cs b/AutoMapper.OData.EFCore.Tests/GetQueryTests.cs
index ce07465..8d4203b 100644
--- a/AutoMapper.OData.EFCore.Tests/GetQueryTests.cs
+++ b/AutoMapper.OData.EFCore.Tests/GetQueryTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using AutoMapper.AspNet.OData;
+using AutoMapper.AspNet.OData;
using AutoMapper.OData.EFCore.Tests.Data;
using AutoMapper.OData.EFCore.Tests.Model;
using DAL.EFCore;
@@ -14,6 +9,12 @@
using Microsoft.AspNetCore.OData.Query;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
using Xunit;
namespace AutoMapper.OData.EFCore.Tests
@@ -1921,7 +1922,7 @@ public GetQueryTestsFixture()
),
ServiceLifetime.Transient
)
- .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
+ .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly), new NullLoggerFactory()))
.AddTransient(sp => new Mapper(sp.GetRequiredService(), sp.GetService))
.AddTransient(sp => new ApplicationBuilder(sp))
.AddRouting()
diff --git a/AutoMapper.OData.EFCore.Tests/GetTests.cs b/AutoMapper.OData.EFCore.Tests/GetTests.cs
index 12d891b..c13c361 100644
--- a/AutoMapper.OData.EFCore.Tests/GetTests.cs
+++ b/AutoMapper.OData.EFCore.Tests/GetTests.cs
@@ -12,6 +12,7 @@
using Microsoft.AspNetCore.OData.Query.Expressions;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.OData.Edm;
using Microsoft.OData.ModelBuilder;
using Microsoft.OData.UriParser;
@@ -776,7 +777,7 @@ public GetTestsFixture()
),
ServiceLifetime.Transient
)
- .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly)))
+ .AddSingleton(new MapperConfiguration(cfg => cfg.AddMaps(typeof(GetTests).Assembly), new NullLoggerFactory()))
.AddTransient(sp => new Mapper(sp.GetRequiredService(), sp.GetService))
.AddTransient(sp => new ApplicationBuilder(sp))
.AddRouting()
diff --git a/WebAPI.OData.EFCore/Startup.cs b/WebAPI.OData.EFCore/Startup.cs
index efe8cfd..ae35f0d 100644
--- a/WebAPI.OData.EFCore/Startup.cs
+++ b/WebAPI.OData.EFCore/Startup.cs
@@ -8,6 +8,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.OData.Edm;
using Microsoft.OData.ModelBuilder;
using WebAPI.OData.EFCore.Binders;
@@ -38,7 +39,7 @@ public void ConfigureServices(IServiceCollection services)
{
cfg.AddMaps(typeof(Startup).Assembly);
cfg.AllowNullCollections = true;
- })
+ }, new NullLoggerFactory())
)
.AddScoped(sp => new Mapper(sp.GetRequiredService(), sp.GetService));
}