chore(*): fix build warnings and use new Program.cs format

jaredcnance · jaredcnance · commit 947a079ad7c2 · 2017-12-05T17:25:27.000-06:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>JsonApiDotNetCoreExample</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftConfigurationVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftConfigurationVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftConfigurationVersion)" />
diff --git a/src/Examples/JsonApiDotNetCoreExample/Program.cs b/src/Examples/JsonApiDotNetCoreExample/Program.cs
@@ -1,26 +1,18 @@
-using System.IO;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 
 namespace JsonApiDotNetCoreExample
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            var config = new ConfigurationBuilder()
-                .AddCommandLine(args)
-                .AddEnvironmentVariables(prefix: "ASPNETCORE_")
-                .Build();
+            BuildWebHost(args).Run();
+        }
 
-            var host = new WebHostBuilder()
-                .UseConfiguration(config)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .Build();
-
-            host.Run();
-        }
     }
 }
diff --git a/src/Examples/NoEntityFrameworkExample/Program.cs b/src/Examples/NoEntityFrameworkExample/Program.cs
@@ -1,4 +1,4 @@
-﻿using System.IO;
+﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace NoEntityFrameworkExample
@@ -7,14 +7,12 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
+            BuildWebHost(args).Run();
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .Build();
-
-            host.Run();
-        }
     }
 }
diff --git a/src/Examples/ReportsExample/Program.cs b/src/Examples/ReportsExample/Program.cs
@@ -1,4 +1,4 @@
-﻿using System.IO;
+﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
 namespace ReportsExample
@@ -7,14 +7,12 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
+            BuildWebHost(args).Run();
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .Build();
-
-            host.Run();
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/CamelCasedModelsControllerTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/CamelCasedModelsControllerTests.cs
@@ -35,7 +35,6 @@ public CamelCasedModelsControllerTests(TestFixture<Startup> fixture)
 
         [Fact]
         public async Task Can_Get_CamelCasedModels()
-
         {
             // Arrange
             var model = _faker.Generate();
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs
@@ -219,7 +219,7 @@ public async Task Can_Get_TodoItem_ById()
             Assert.Equal(todoItem.Description, deserializedBody.Description);
             Assert.Equal(todoItem.Ordinal, deserializedBody.Ordinal);
             Assert.Equal(todoItem.CreatedDate.ToString("G"), deserializedBody.CreatedDate.ToString("G"));
-            Assert.Equal(null, deserializedBody.AchievedDate);
+            Assert.Null(deserializedBody.AchievedDate);
         }
 
         [Fact]
@@ -248,7 +248,7 @@ public async Task Can_Get_TodoItem_WithOwner()
             Assert.Equal(todoItem.Description, deserializedBody.Description);
             Assert.Equal(todoItem.Ordinal, deserializedBody.Ordinal);
             Assert.Equal(todoItem.CreatedDate.ToString("G"), deserializedBody.CreatedDate.ToString("G"));
-            Assert.Equal(null, deserializedBody.AchievedDate);
+            Assert.Null(deserializedBody.AchievedDate);
         }
 
         [Fact]
@@ -301,7 +301,7 @@ public async Task Can_Post_TodoItem()
             Assert.Equal(HttpStatusCode.Created, response.StatusCode);
             Assert.Equal(todoItem.Description, deserializedBody.Description);
             Assert.Equal(todoItem.CreatedDate.ToString("G"), deserializedBody.CreatedDate.ToString("G"));
-            Assert.Equal(null, deserializedBody.AchievedDate);
+            Assert.Null(deserializedBody.AchievedDate);
         }
 
         [Fact]
@@ -350,7 +350,7 @@ public async Task Can_Patch_TodoItem()
             Assert.Equal(newTodoItem.Description, deserializedBody.Description);
             Assert.Equal(newTodoItem.Ordinal, deserializedBody.Ordinal);
             Assert.Equal(newTodoItem.CreatedDate.ToString("G"), deserializedBody.CreatedDate.ToString("G"));
-            Assert.Equal(null, deserializedBody.AchievedDate);
+            Assert.Null(deserializedBody.AchievedDate);
         }
 
         [Fact]
@@ -453,7 +453,7 @@ public async Task Can_Patch_TodoItemWithNullValue()
             Assert.Equal(newTodoItem.Description, deserializedBody.Description);
             Assert.Equal(newTodoItem.Ordinal, deserializedBody.Ordinal);
             Assert.Equal(newTodoItem.CreatedDate.ToString("G"), deserializedBody.CreatedDate.ToString("G"));
-            Assert.Equal(null, deserializedBody.AchievedDate);
+            Assert.Null(deserializedBody.AchievedDate);
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.IO;`
	`1`	`+using Microsoft.AspNetCore;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
`3`	`3`
`4`	`4`	`namespace NoEntityFrameworkExample`
`@@ -7,14 +7,12 @@ public class Program`
`7`	`7`	`{`
`8`	`8`	`public static void Main(string[] args)`
`9`	`9`	`{`
`10`		`- var host = new WebHostBuilder()`
`11`		`- .UseKestrel()`
`12`		`- .UseContentRoot(Directory.GetCurrentDirectory())`
`13`		`- .UseIISIntegration()`
	`10`	`+ BuildWebHost(args).Run();`
	`11`	`+ }`
	`12`	`+`
	`13`	`+ public static IWebHost BuildWebHost(string[] args) =>`
	`14`	`+ WebHost.CreateDefaultBuilder(args)`
`14`	`15`	`.UseStartup<Startup>()`
`15`	`16`	`.Build();`
`16`		`-`
`17`		`- host.Run();`
`18`		`- }`
`19`	`17`	`}`
`20`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public CamelCasedModelsControllerTests(TestFixture<Startup> fixture)`
`35`	`35`
`36`	`36`	`[Fact]`
`37`	`37`	`public async Task Can_Get_CamelCasedModels()`
`38`		`-`
`39`	`38`	`{`
`40`	`39`	`// Arrange`
`41`	`40`	`var model = _faker.Generate();`