Merge branch 'dev-v4' of https://github.com/json-api-dotnet/JsonApiDotNetCore into dev-v4

maurei · maurei · commit 1be223644cbe · 2019-10-24T10:20:22.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,21 +1,16 @@
 <Project>
 
   <PropertyGroup>
-    <NetCoreAppVersion>netcoreapp2.0</NetCoreAppVersion>
+    <NetCoreAppVersion>netcoreapp2.2</NetCoreAppVersion>
     <NetStandardVersion>netstandard2.0</NetStandardVersion>
-
-    <AspNetCoreVersion>2.*</AspNetCoreVersion>
-
-    <MicrosoftLoggingVersion>2.*</MicrosoftLoggingVersion>
-    <MicrosoftConfigurationVersion>2.*</MicrosoftConfigurationVersion>
-    <MicrosoftOptionsVersion>2.*</MicrosoftOptionsVersion>
-
-    <EFCoreVersion>2.*</EFCoreVersion>
-    <EFCoreToolsVersion>2.*</EFCoreToolsVersion>
-
+    <AspNetCoreVersion>2.2.*</AspNetCoreVersion>
+    <MicrosoftLoggingVersion>2.2.*</MicrosoftLoggingVersion>
+    <MicrosoftConfigurationVersion>2.2.*</MicrosoftConfigurationVersion>
+    <MicrosoftOptionsVersion>2.2.*</MicrosoftOptionsVersion>
+    <EFCoreVersion>2.2.*</EFCoreVersion>
+    <EFCoreToolsVersion>2.2.*</EFCoreToolsVersion>
     <NpgsqlVersion>4.0.0</NpgsqlVersion>
     <NpgsqlPostgreSQLVersion>2.1.0</NpgsqlPostgreSQLVersion>
-
     <TuplesVersion>4.5.0</TuplesVersion>
   </PropertyGroup>
 
@@ -26,5 +21,4 @@
     <BogusVersion>22.1.2</BogusVersion>
     <MoqVersion>4.8.3</MoqVersion>
   </PropertyGroup>
-
-</Project>
+</Project>
diff --git a/JsonApiDotnetCore.sln b/JsonApiDotnetCore.sln
diff --git a/src/Examples/GettingStarted/Program.cs b/src/Examples/GettingStarted/Program.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -14,13 +14,12 @@ 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>()
-                .UseUrls("http://localhost:5001")
-                .Build();
+                .UseUrls("http://localhost:5001");
     }
-}
+}
diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
@@ -5,6 +5,7 @@
     <AssemblyName>JsonApiDotNetCoreExample</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>JsonApiDotNetCoreExample</PackageId>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Examples/JsonApiDotNetCoreExample/Program.cs b/src/Examples/JsonApiDotNetCoreExample/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>();
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startup.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();
         }
 
diff --git a/src/Examples/JsonApiDotNetCoreExample/web.config b/src/Examples/JsonApiDotNetCoreExample/web.config
@@ -7,7 +7,7 @@
 
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified"/>
     </handlers>
     <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
   </system.webServer>
diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
@@ -1,6 +1,7 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Examples/NoEntityFrameworkExample/Program.cs b/src/Examples/NoEntityFrameworkExample/Program.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>();
     }
 }
diff --git a/src/Examples/NoEntityFrameworkExample/Startup.cs b/src/Examples/NoEntityFrameworkExample/Startup.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();
         }
     }
diff --git a/src/Examples/ReportsExample/Program.cs b/src/Examples/ReportsExample/Program.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>();
     }
 }
diff --git a/src/Examples/ReportsExample/ReportsExample.csproj b/src/Examples/ReportsExample/ReportsExample.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/JsonApiDotNetCore/Internal/ResourceGraph.cs b/src/JsonApiDotNetCore/Internal/ResourceGraph.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);
                 }
diff --git a/src/JsonApiDotNetCore/Serialization/Server/ResponseSerializer.cs b/src/JsonApiDotNetCore/Serialization/Server/ResponseSerializer.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using JsonApiDotNetCore.Internal.Contracts;
diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj
@@ -15,5 +15,4 @@
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs
@@ -24,8 +24,8 @@ namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
     [Collection("WebHostCollection")]
     public class CreatingDataTests : EndToEndTest
     {
-        private Faker<TodoItem> _todoItemFaker;
-        private Faker<Person> _personFaker;
+        private readonly Faker<TodoItem> _todoItemFaker;
+        private readonly Faker<Person> _personFaker;
 
         public CreatingDataTests(TestFixture<TestStartup> fixture) : base(fixture)
         {
@@ -155,9 +155,11 @@ public async Task CreateWithRelationship_HasManyAndInclude_IsCreatedAndIncludes(
             var serializer = GetSerializer<TodoItemCollection>(e => new { }, e => new { e.TodoItems, e.Owner });
 
             var owner = new Person();
-            var todoItem = new TodoItem();
-            todoItem.Owner = owner;
-            todoItem.Description = "Description";
+            var todoItem = new TodoItem
+            {
+                Owner = owner,
+                Description = "Description"
+            };
             dbContext.People.Add(owner);
             dbContext.TodoItems.Add(todoItem);
             dbContext.SaveChanges();
@@ -340,7 +342,7 @@ public async Task CreateRelationship_ToManyWithImplicitRemove_IsCreated()
             var oldPersonDb = dbContext.People.AsNoTracking().Where(p => p.Id == currentPerson.Id).Include(e => e.TodoItems).Single();
             AssertEqualStatusCode(HttpStatusCode.Created, response);
             Assert.Equal(2, newPersonDb.TodoItems.Count);
-            Assert.Equal(1, oldPersonDb.TodoItems.Count);
+            Assert.Single(oldPersonDb.TodoItems);
             Assert.NotNull(newPersonDb.TodoItems.SingleOrDefault(ti => ti.Id == firstTd.Id));
             Assert.NotNull(newPersonDb.TodoItems.SingleOrDefault(ti => ti.Id == secondTd.Id));
             Assert.NotNull(oldPersonDb.TodoItems.SingleOrDefault(ti => ti.Id == thirdTd.Id));
diff --git a/test/JsonApiDotNetCoreExampleTests/Helpers/Startups/ClientGeneratedIdsStartup.cs b/test/JsonApiDotNetCoreExampleTests/Helpers/Startups/ClientGeneratedIdsStartup.cs
@@ -19,10 +19,13 @@ public ClientGeneratedIdsStartup(IHostingEnvironment env)
         public override IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
-            loggerFactory.AddConsole(LogLevel.Warning);
             var mvcBuilder = services.AddMvcCore();
             services
                 .AddSingleton<ILoggerFactory>(loggerFactory)
+                .AddLogging(builder =>
+                {
+                    builder.AddConsole();
+                })
                 .AddDbContext<AppDbContext>(options => options.UseNpgsql(GetDbConnectionString()), ServiceLifetime.Transient)
                 .AddJsonApi(options => {
                     options.Namespace = "api/v1";
diff --git a/test/UnitTests/Builders/LinkBuilderTests.cs b/test/UnitTests/Builders/LinkBuilderTests.cs
@@ -115,22 +115,22 @@ public void BuildRelationshipLinks_GlobalResourceAndAttrConfiguration_ExpectedLi
         [InlineData(Link.All, Link.All, _topSelf, true)]
         [InlineData(Link.All, Link.Self, _topSelf, false)]
         [InlineData(Link.All, Link.Paging, null, true)]
-        [InlineData(Link.All, Link.None, null, null)]
+        [InlineData(Link.All, Link.None, null, false)]
         [InlineData(Link.Self, Link.NotConfigured, _topSelf, false)]
         [InlineData(Link.Self, Link.All, _topSelf, true)]
         [InlineData(Link.Self, Link.Self, _topSelf, false)]
         [InlineData(Link.Self, Link.Paging, null, true)]
-        [InlineData(Link.Self, Link.None, null, null)]
+        [InlineData(Link.Self, Link.None, null, false)]
         [InlineData(Link.Paging, Link.NotConfigured, null, true)]
         [InlineData(Link.Paging, Link.All, _topSelf, true)]
         [InlineData(Link.Paging, Link.Self, _topSelf, false)]
         [InlineData(Link.Paging, Link.Paging, null, true)]
-        [InlineData(Link.Paging, Link.None, null, null)]
+        [InlineData(Link.Paging, Link.None, null, false)]
         [InlineData(Link.None, Link.NotConfigured, null, false)]
         [InlineData(Link.None, Link.All, _topSelf, true)]
         [InlineData(Link.None, Link.Self, _topSelf, false)]
         [InlineData(Link.None, Link.Paging, null, true)]
-        [InlineData(Link.None, Link.None, null, null)]
+        [InlineData(Link.None, Link.None, null, false)]
         public void BuildTopLevelLinks_GlobalAndResourceConfiguration_ExpectedLinks(Link global,
                                                                                     Link resource,
                                                                                     object expectedSelfLink,
diff --git a/test/UnitTests/Graph/TypeLocator_Tests.cs b/test/UnitTests/Graph/TypeLocator_Tests.cs
diff --git a/test/UnitTests/Serialization/Common/DocumentParserTests.cs b/test/UnitTests/Serialization/Common/DocumentParserTests.cs
diff --git a/test/UnitTests/Serialization/Common/ResourceObjectBuilderTests.cs b/test/UnitTests/Serialization/Common/ResourceObjectBuilderTests.cs
diff --git a/test/UnitTests/Serialization/Server/IncludedResourceObjectBuilderTests.cs b/test/UnitTests/Serialization/Server/IncludedResourceObjectBuilderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`@@ -14,13 +14,12 @@ public class Program`
`14`	`14`	`{`
`15`	`15`	`public static void Main(string[] args)`
`16`	`16`	`{`
`17`		`- BuildWebHost(args).Run();`
	`17`	`+ CreateWebHostBuilder(args).Build().Run();`
`18`	`18`	`}`
`19`	`19`
`20`		`- public static IWebHost BuildWebHost(string[] args) =>`
	`20`	`+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`21`	`21`	`WebHost.CreateDefaultBuilder(args)`
`22`	`22`	`.UseStartup<Startup>()`
`23`		`- .UseUrls("http://localhost:5001")`
`24`		`- .Build();`
	`23`	`+ .UseUrls("http://localhost:5001");`
`25`	`24`	`}`
`26`		`-}`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,12 @@ namespace JsonApiDotNetCoreExample`
`5`	`5`	`{`
`6`	`6`	`public class Program`
`7`	`7`	`{`
`8`		`- public static void Main(string[] args) => BuildWebHost(args).Run();`
`9`		`-`
`10`		`- public static IWebHost BuildWebHost(string[] args) =>`
	`8`	`+ public static void Main(string[] args)`
	`9`	`+ {`
	`10`	`+ CreateWebHostBuilder(args).Build().Run();`
	`11`	`+ }`
	`12`	`+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`11`	`13`	`WebHost.CreateDefaultBuilder(args)`
`12`		`- .UseStartup<Startup>()`
`13`		`- .Build();`
	`14`	`+ .UseStartup<Startup>();`
`14`	`15`	`}`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Microsoft.AspNetCore;`
	`1`	`+using Microsoft.AspNetCore;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
`3`	`3`
`4`	`4`	`namespace NoEntityFrameworkExample`
`@@ -7,12 +7,10 @@ public class Program`
`7`	`7`	`{`
`8`	`8`	`public static void Main(string[] args)`
`9`	`9`	`{`
`10`		`- BuildWebHost(args).Run();`
	`10`	`+ CreateWebHostBuilder(args).Build().Run();`
`11`	`11`	`}`
`12`		`-`
`13`		`- public static IWebHost BuildWebHost(string[] args) =>`
	`12`	`+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`14`	`13`	`WebHost.CreateDefaultBuilder(args)`
`15`		`- .UseStartup<Startup>()`
`16`		`- .Build();`
	`14`	`+ .UseStartup<Startup>();`
`17`	`15`	`}`
`18`	`16`	`}`