upgrade to .net core 2.1

Author: wisepotato

.editorconfig

@@ -22,4 +22,8 @@ dotnet_naming_symbols.private_fields.applicable_kinds           = field
 dotnet_naming_symbols.private_fields.applicable_accessibilities = private
 
 dotnet_naming_style.prefix_underscore.capitalization = camel_case
-dotnet_naming_style.prefix_underscore.required_prefix = _
+dotnet_naming_style.prefix_underscore.required_prefix = _
+[*.cs]
+
+# CS0659: Type overrides Object.Equals(object o) but does not override Object.GetHashCode()
+dotnet_diagnostic.CS0659.severity = silent

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <NetCoreAppVersion>netcoreapp2.0</NetCoreAppVersion>
+    <NetCoreAppVersion>netcoreapp2.1</NetCoreAppVersion>
     <NetStandardVersion>netstandard2.0</NetStandardVersion>
 
     <AspNetCoreVersion>2.*</AspNetCoreVersion>

JsonApiDotnetCore.sln

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -10,17 +10,17 @@
 
 namespace GettingStarted
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            BuildWebHost(args).Run();
-        }
-
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .UseUrls("http://localhost:5001")
-                .Build();
+
+
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateWebHostBuilder(args).Build().Run();
+        }
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>()
+                .UseUrls("http://localhost:5001");
     }
 }

src/Examples/GettingStarted/Program.cs

@@ -5,11 +5,12 @@ namespace JsonApiDotNetCoreExample
 {
     public class Program
     {
-        public static void Main(string[] args) => BuildWebHost(args).Run();
-
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static void Main(string[] args)
+        {
+            CreateWebHostBuilder(args).Build().Run();
+        }
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }

src/Examples/JsonApiDotNetCoreExample/Program.cs

@@ -28,21 +28,23 @@ public Startup(IHostingEnvironment env)
         public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
-            loggerFactory.AddConsole(LogLevel.Warning);
             services
                 .AddSingleton<ILoggerFactory>(loggerFactory)
+                .AddLogging(builder =>
+                {
+                    builder.AddConsole();
+                    builder.AddConfiguration(Config.GetSection("Logging"));
+                })
                 .AddDbContext<AppDbContext>(options => options.UseNpgsql(GetDbConnectionString()), ServiceLifetime.Transient)
-                .AddJsonApi(
-                    options =>
-                    {
-                        options.Namespace = "api/v1";
-                        options.DefaultPageSize = 5;
-                        options.IncludeTotalRecordCount = true;
-                        options.EnableResourceHooks = true;
-                        options.LoaDatabaseValues = true;
-                    },
-                    discovery => discovery.AddCurrentAssembly());
- 
+                .AddJsonApi(options =>
+                {
+                    options.Namespace = "api/v1";
+                    options.DefaultPageSize = 5;
+                    options.IncludeTotalRecordCount = true;
+                    options.EnableResourceHooks = true;
+                    options.LoaDatabaseValues = true;
+                },
+                discovery => discovery.AddCurrentAssembly());
             return services.BuildServiceProvider();
         }
 
@@ -53,7 +55,6 @@ public virtual void Configure(
             AppDbContext context)
         {
             context.Database.EnsureCreated();
-            loggerFactory.AddConsole(Config.GetSection("Logging"));
             app.UseJsonApi();
         }
 

src/Examples/JsonApiDotNetCoreExample/Startup.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace NoEntityFrameworkExample
@@ -7,12 +7,10 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
-
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }

src/Examples/NoEntityFrameworkExample/Program.cs

@@ -32,31 +32,28 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             var mvcBuilder = services.AddMvcCore();
-
-            services.AddJsonApi(
-                options =>  options.Namespace = "api/v1",
-                resources: resources => resources.AddResource<TodoItem>("custom-todo-items"),
-                mvcBuilder: mvcBuilder
-            );
-
+            services.AddLogging(builder =>
+                {
+                    builder.AddConfiguration(Configuration.GetSection("Logging"));
+                    builder.AddConsole();
+                }).AddJsonApi(
+                    options =>  options.Namespace = "api/v1",
+                    resources: resources => resources.AddResource<TodoItem>("custom-todo-items"),
+                    mvcBuilder: mvcBuilder
+                );
             services.AddScoped<IResourceService<TodoItem>, TodoItemService>();
-
             var optionsBuilder = new DbContextOptionsBuilder<AppDbContext>(); 
             optionsBuilder.UseNpgsql(Configuration.GetValue<string>("Data:DefaultConnection")); 
             services.AddSingleton<IConfiguration>(Configuration);
-            services.AddSingleton<DbContextOptions<AppDbContext>>(optionsBuilder.Options);
+            services.AddSingleton(optionsBuilder.Options);
             services.AddScoped<AppDbContext>();
-
             return services.BuildServiceProvider();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, AppDbContext context)
+        public void Configure(IApplicationBuilder app, AppDbContext context)
         {
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-
             context.Database.EnsureCreated();
-
             app.UseJsonApi();
         }
     }

src/Examples/NoEntityFrameworkExample/Startup.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace ReportsExample
@@ -7,12 +7,10 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
-
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }

src/Examples/ReportsExample/Program.cs

@@ -93,7 +93,7 @@ private IEnumerable<IResourceField> Getter<T>(Expression<Func<T, dynamic>> selec
                     targeted.Add(available.Single(f => f.ExposedInternalMemberName == memberExpression.Member.Name));
                     return targeted;
                 }
-                catch (Exception ex)
+                catch (InvalidOperationException)
                 {
                     ThrowNotExposedError(memberExpression.Member.Name, type);
                 }
@@ -115,7 +115,7 @@ private IEnumerable<IResourceField> Getter<T>(Expression<Func<T, dynamic>> selec
                     }
                     return targeted;
                 }
-                catch (Exception ex)
+                catch (InvalidOperationException)
                 {
                     ThrowNotExposedError(memberName, type);
                 }