updated to ASP.NET Core 2.1

FabianGosebrink · FabianGosebrink · commit 9173795c845f · 2018-06-03T11:41:19.000+02:00
diff --git a/src/SampleWebApiAspNetCore/Controllers/FoodsController.cs b/src/SampleWebApiAspNetCore/Controllers/FoodsController.cs
@@ -9,14 +9,14 @@
 using SampleWebApiAspNetCore.Entities;
 using SampleWebApiAspNetCore.Models;
 using SampleWebApiAspNetCore.Helpers;
-using Microsoft.AspNetCore.Authorization;
 
 namespace SampleWebApiAspNetCore.Controllers
 {
     [ApiVersion("1.0")]
     [Route("api/v{version:apiVersion}/[controller]")]
-    // [Route("api/[controller]")]
-    public class FoodsController : Controller
+    //[Route("api/[controller]")]
+    [ApiController]
+    public class FoodsController : ControllerBase
     {
         private readonly IFoodRepository _foodRepository;
         private readonly IUrlHelper _urlHelper;
@@ -93,7 +93,7 @@ public IActionResult AddFood([FromBody] FoodCreateDto foodCreateDto)
             }
 
             FoodItem newFoodItem = _foodRepository.GetSingle(toAdd.Id);
-            
+
             return CreatedAtRoute(nameof(GetSingleFood), new { id = newFoodItem.Id },
                 Mapper.Map<FoodItemDto>(newFoodItem));
         }
@@ -299,7 +299,7 @@ private IEnumerable<LinkDto> GetLinks(int id)
 
     [ApiVersion("2.0")]
     [Route("api/v{version:apiVersion}/foods")]
-    public class Foods2Controller : Controller
+    public class Foods2Controller : ControllerBase
     {
         [HttpGet]
         public IActionResult Get()
diff --git a/src/SampleWebApiAspNetCore/Program.cs b/src/SampleWebApiAspNetCore/Program.cs
@@ -1,26 +1,17 @@
 ﻿using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 
 namespace SampleWebApiAspNetCore
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .ConfigureAppConfiguration((context, config) =>
-                {
-                    var env = context.HostingEnvironment;
-
-                    config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                            .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);
-                })
-                .Build();
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+           WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>();
     }
 }
diff --git a/src/SampleWebApiAspNetCore/Properties/launchSettings.json b/src/SampleWebApiAspNetCore/Properties/launchSettings.json
@@ -3,25 +3,28 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:29435/swagger/",
-      "sslPort": 0
+      "applicationUrl": "http://localhost:62972",
+      "sslPort": 44378
     }
   },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "SampleWebApiAspNetCore": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "http://localhost:5000",
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
     }
   }
 }
diff --git a/src/SampleWebApiAspNetCore/SampleWebApiAspNetCore.csproj b/src/SampleWebApiAspNetCore/SampleWebApiAspNetCore.csproj
@@ -1,24 +1,28 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>SampleWebApiAspNetCore</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>SampleWebApiAspNetCore</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="2.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.0.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.7" />
+    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="2.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.2.0" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.9" />
   </ItemGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SampleWebApiAspNetCore/Startup.cs b/src/SampleWebApiAspNetCore/Startup.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using SampleWebApiAspNetCore.Dtos;
+﻿using SampleWebApiAspNetCore.Dtos;
 using SampleWebApiAspNetCore.Entities;
 using SampleWebApiAspNetCore.Repositories;
 using Microsoft.AspNetCore.Builder;
@@ -16,7 +15,6 @@
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Serialization;
 using Swashbuckle.AspNetCore.Swagger;
-using Swashbuckle.AspNetCore.SwaggerGen;
 using SampleWebApiAspNetCore.Middleware;
 using SampleWebApiAspNetCore.Services;
 
@@ -85,12 +83,13 @@ public void ConfigureServices(IServiceCollection services)
                  config.ApiVersionReader = new HeaderApiVersionReader("api-version");
              });
              
-            services.AddMvcCore().AddVersionedApiExplorer(o => o.GroupNameFormat = "'v'VVV");
-            services.AddMvc().AddJsonOptions(options =>
+            services.AddMvcCore().AddVersionedApiExplorer(o => o.GroupNameFormat = "'v'VVV")
+                .SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc()
+                .AddJsonOptions(options =>
             {
                 options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
-            });
-
+            }).SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -146,8 +145,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env,
                           mapper.CreateMap<FoodItem, FoodUpdateDto>().ReverseMap();
                           mapper.CreateMap<FoodItem, FoodCreateDto>().ReverseMap();
                       });
+            app.UseHttpsRedirection();
             app.UseMvc();
         }
-
     }
 }
diff --git a/src/SampleWebApiAspNetCore/appsettings.Development.json b/src/SampleWebApiAspNetCore/appsettings.Development.json
@@ -0,0 +1,9 @@
+﻿{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
diff --git a/src/SampleWebApiAspNetCore/appsettings.json b/src/SampleWebApiAspNetCore/appsettings.json
@@ -1,10 +1,8 @@
 ﻿{
-    "Logging": {
-        "IncludeScopes": false,
-        "LogLevel": {
-            "Default": "Debug",
-            "System": "Information",
-            "Microsoft": "Information"
-        }
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
     }
+  },
+  "AllowedHosts": "*"
 }
diff --git a/src/SampleWebApiAspNetCore/web.config b/src/SampleWebApiAspNetCore/web.config
diff --git a/src/SampleWebApiAspNetCore/wwwroot/web.config b/src/SampleWebApiAspNetCore/wwwroot/web.config

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,17 @@`
`1`	`1`	`using Microsoft.AspNetCore;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
`3`		`-using Microsoft.Extensions.Configuration;`
`4`	`3`
`5`	`4`	`namespace SampleWebApiAspNetCore`
`6`	`5`	`{`
`7`	`6`	`public class Program`
`8`	`7`	`{`
`9`	`8`	`public static void Main(string[] args)`
`10`	`9`	`{`
`11`		`- BuildWebHost(args).Run();`
	`10`	`+ CreateWebHostBuilder(args).Build().Run();`
`12`	`11`	`}`
`13`	`12`
`14`		`- public static IWebHost BuildWebHost(string[] args) =>`
`15`		`- WebHost.CreateDefaultBuilder(args)`
`16`		`- .UseStartup<Startup>()`
`17`		`- .ConfigureAppConfiguration((context, config) =>`
`18`		`- {`
`19`		`- var env = context.HostingEnvironment;`
`20`		`-`
`21`		`- config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)`
`22`		`- .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);`
`23`		`- })`
`24`		`- .Build();`
	`13`	`+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
	`14`	`+ WebHost.CreateDefaultBuilder(args)`
	`15`	`+ .UseStartup<Startup>();`
`25`	`16`	`}`
`26`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`{`
`2`		`- "Logging": {`
`3`		`- "IncludeScopes": false,`
`4`		`- "LogLevel": {`
`5`		`- "Default": "Debug",`
`6`		`- "System": "Information",`
`7`		`- "Microsoft": "Information"`
`8`		`- }`
	`2`	`+ "Logging": {`
	`3`	`+ "LogLevel": {`
	`4`	`+ "Default": "Warning"`
`9`	`5`	`}`
	`6`	`+ },`
	`7`	`+ "AllowedHosts": "*"`
`10`	`8`	`}`