Updated to .net core 2.0

Author: HeyJoel

build.cake

@@ -48,7 +48,7 @@ Task("Patch-Assembly-Version")
 
     Information("Building version {0} of Cofoundry.", versionInfo.InformationalVersion);
 
-    isPrerelease = !string.IsNullOrEmpty(versionInfo.PreReleaseNumber);
+    isPrerelease = versionInfo.PreReleaseNumber.HasValue;
 
     // Patch the version number so it's picked up when dependent projects are references
     // as nuget dependencies. Can't find a better way to do this.

src/Cofoundry.Plugins.ErrorLogging.Admin/Cofoundry.Plugins.ErrorLogging.Admin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 
     <PackageId>Cofoundry.Plugins.ErrorLogging.Admin</PackageId>
     <Description>Adds simple database error logging to Cofoundry.</Description>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cofoundry.Web.Admin" Version="0.2.0-beta0022" />
+    <PackageReference Include="Cofoundry.Web.Admin" Version="0.2.0-beta0056" />
   </ItemGroup>
 
   <ItemGroup>

src/Cofoundry.Plugins.ErrorLogging.Admin/Plugins/Admin/Api/Errors/ErrorsApiController.cs

@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Cofoundry.Domain.CQS;
-using Cofoundry.Web.WebApi;
 using Cofoundry.Web.Admin;
 using Cofoundry.Plugins.ErrorLogging.Domain;
 using Microsoft.AspNetCore.Mvc;
+using Cofoundry.Web;
 
 namespace Cofoundry.Plugins.ErrorLogging.Admin
 {

src/Cofoundry.Plugins.ErrorLogging/Bootstrap/ErrorAutoMapProfile.cs

@@ -14,16 +14,11 @@ public class ErrorDependencyRegistration : IDependencyRegistration
     {
         public void Register(IContainerRegister container)
         {
-            var overrideOptions = new RegistrationOptions()
-            {
-                ReplaceExisting = true,
-                RegistrationOverridePriority = (int)RegistrationOverridePriority.Low
-            };
+            var overrideOptions = RegistrationOptions.Override(RegistrationOverridePriority.Low);
 
             container
                 .RegisterType<IErrorLoggingService, ErrorLoggingService>(overrideOptions)
-                .RegisterDatabase<ErrorLoggingDbContext>()
-                .RegisterFactory<ErrorLoggingSettings, ConfigurationSettingsFactory<ErrorLoggingSettings>>()
+                .RegisterType<ErrorLoggingDbContext>()
                 ;
         }
     }

src/Cofoundry.Plugins.ErrorLogging/Bootstrap/ErrorDependencyRegistration.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 
     <PackageId>Cofoundry.Plugins.ErrorLogging</PackageId>
     <Description>Adds simple database error logging to Cofoundry.</Description>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cofoundry.Web" Version="0.2.0-beta0022" />
+    <PackageReference Include="Cofoundry.Web" Version="0.2.0-beta0056" />
   </ItemGroup>
 
   <ItemGroup>

src/Cofoundry.Plugins.ErrorLogging/Cofoundry.Plugins.ErrorLogging.csproj

@@ -42,7 +42,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder
                 .UseDefaultConfig(DbConstants.CofoundryPluginSchema)
-                .Map(new ErrorMap());
+                .ApplyConfiguration(new ErrorMap());
         }
 
         #endregion

src/Cofoundry.Plugins.ErrorLogging/Data/ErrorLoggingDbContext.cs

@@ -2,13 +2,12 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore;
 using Cofoundry.Core;
-using Cofoundry.Domain.Data;
 
 namespace Cofoundry.Plugins.ErrorLogging.Data
 {
     public class ErrorMap : IEntityTypeConfiguration<Error>
     {
-        public void Create(EntityTypeBuilder<Error> builder)
+        public void Configure(EntityTypeBuilder<Error> builder)
         {
             builder.ToTable("Error", DbConstants.CofoundrySchema);
 

src/Cofoundry.Plugins.ErrorLogging/Data/ErrorMap.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Cofoundry.Domain.CQS;
-using AutoMapper.QueryableExtensions;
 using Cofoundry.Domain;
 using Cofoundry.Plugins.ErrorLogging.Data;
 using Microsoft.EntityFrameworkCore;
@@ -29,7 +28,22 @@ public async Task<ErrorDetails> ExecuteAsync(GetByIdQuery<ErrorDetails> query, I
                 .Errors
                 .AsNoTracking()
                 .Where(u => u.ErrorId == query.Id)
-                .ProjectTo<ErrorDetails>()
+                .Select(e => new ErrorDetails()
+                {
+                    CreateDate = e.CreateDate,
+                    Data = e.Data,
+                    EmailSent = e.EmailSent,
+                    ErrorId = e.ErrorId,
+                    ExceptionType = e.ExceptionType,
+                    Form = e.Form,
+                    QueryString = e.QueryString,
+                    Session = e.QueryString,
+                    Source = e.Source,
+                    StackTrace = e.QueryString,
+                    Target = e.Target,
+                    Url = e.Url,
+                    UserAgent = e.UserAgent
+                })
                 .SingleOrDefaultAsync();
 
             return error;

src/Cofoundry.Plugins.ErrorLogging/Domain/Queries/GetErrorDetailsByIdQueryHandler.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using AutoMapper.QueryableExtensions;
 using Cofoundry.Domain.CQS;
 using Cofoundry.Domain.Data;
 using Cofoundry.Domain;
@@ -41,10 +40,6 @@ public async Task<PagedQueryResult<ErrorSummary>> ExecuteAsync(SearchErrorSummar
             return result;
         }
 
-        #endregion
-
-        #region helpers
-
         private IQueryable<ErrorSummary> CreateQuery(SearchErrorSummariesQuery query)
         {
             var dbQuery = _dbContext
@@ -63,7 +58,14 @@ private IQueryable<ErrorSummary> CreateQuery(SearchErrorSummariesQuery query)
 
             return dbQuery
                 .OrderByDescending(u => u.CreateDate)
-                .ProjectTo<ErrorSummary>();
+                .Select(e => new ErrorSummary()
+                {
+                    CreateDate = e.CreateDate,
+                    ErrorId = e.ErrorId,
+                    ExceptionType = e.ExceptionType,
+                    Url = e.Url,
+                    UserAgent = e.UserAgent
+                });
         }