Add Support for ASP.NET Core 2.2

ApiVersioning.sln

@@ -28,12 +28,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{2957BAF3-9
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{915BB224-B1D0-4E27-A348-67FCC77AAA44}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webapi", "webapi", "{F446ED94-368F-4F67-913B-16E82CA80DFC}"
 	ProjectSection(SolutionItems) = preProject
-		samples\webapi\directory.build.targets = samples\webapi\directory.build.targets
+		samples\directory.build.props = samples\directory.build.props
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webapi", "webapi", "{F446ED94-368F-4F67-913B-16E82CA80DFC}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnetcore", "aspnetcore", "{900DD210-8500-4D89-A05D-C9526935A719}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicSample", "samples\aspnetcore\BasicSample\BasicSample.csproj", "{59389B47-8280-411E-B840-D097AA1DCDEE}"

build/code-analysis.props

@@ -17,7 +17,7 @@
 
   <ItemGroup Label="NuGet">
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta009" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

samples/aspnetcore/BasicSample/BasicSample.csproj

@@ -1,25 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-  <TargetFramework>netcoreapp2.0</TargetFramework>
+  <TargetFramework>netcoreapp2.2</TargetFramework>
+  <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+  <RootNamespace>Microsoft.Examples</RootNamespace>
  </PropertyGroup>
 
  <ItemGroup>
-  <Content Update="wwwroot\**\*;Views;Areas\**\Views;appsettings.json;web.config">
-   <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-  </Content>
+  <PackageReference Include="Microsoft.AspNetCore.App" />
+  <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
  </ItemGroup>
 
  <ItemGroup>
   <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Versioning\Microsoft.AspNetCore.Mvc.Versioning.csproj" />
  </ItemGroup>
 
- <ItemGroup>
-  <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
- </ItemGroup>
-
- <ItemGroup>
-  <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
- </ItemGroup>
-
 </Project>

samples/aspnetcore/BasicSample/Controllers/HelloWorldController.cs

@@ -1,17 +1,12 @@
 namespace Microsoft.Examples.Controllers
 {
-    using AspNetCore.Mvc.Routing;
     using AspNetCore.Routing;
-    using Extensions.DependencyInjection;
     using Microsoft.AspNetCore.Mvc;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
 
+    [ApiController]
     [ApiVersion( "1.0" )]
     [Route( "api/v{version:apiVersion}/[controller]" )]
-    public class HelloWorldController : Controller
+    public class HelloWorldController : ControllerBase
     {
         // GET api/v{version}/helloworld
         [HttpGet]

samples/aspnetcore/BasicSample/Controllers/Values2Controller.cs

@@ -1,17 +1,14 @@
 namespace Microsoft.Examples.Controllers
 {
     using Microsoft.AspNetCore.Mvc;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
 
+    [ApiController]
     [ApiVersion( "2.0" )]
     [Route( "api/values" )]
-    public class Values2Controller : Controller
+    public class Values2Controller : ControllerBase
     {
         // GET api/values?api-version=2.0
         [HttpGet]
-        public string Get() => $"Controller = {GetType().Name}\nVersion = {HttpContext.GetRequestedApiVersion()}";
+        public string Get( ApiVersion apiVersion ) => $"Controller = {GetType().Name}\nVersion = {apiVersion}";
     }
-}
+}

samples/aspnetcore/BasicSample/Controllers/ValuesController.cs

@@ -1,14 +1,11 @@
 namespace Microsoft.Examples.Controllers
 {
     using Microsoft.AspNetCore.Mvc;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
 
+    [ApiController]
     [ApiVersion( "1.0" )]
     [Route( "api/[controller]" )]
-    public class ValuesController : Controller
+    public class ValuesController : ControllerBase
     {
         // GET api/values?api-version=1.0
         [HttpGet]

samples/aspnetcore/BasicSample/Program.cs

@@ -1,25 +1,16 @@
 namespace Microsoft.Examples
 {
+    using Microsoft.AspNetCore;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Hosting;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Threading.Tasks;
 
-    public class Program
+    public static class Program
     {
-        public static void Main(string[] args)
-        {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .UseStartup<Startup>()
-                .Build();
+        public static void Main( string[] args ) =>
+            CreateWebHostBuilder( args ).Build().Run();
 
-            host.Run();
-        }
+        public static IWebHostBuilder CreateWebHostBuilder( string[] args ) =>
+            WebHost.CreateDefaultBuilder( args )
+                   .UseStartup<Startup>();
     }
-}
+}

samples/aspnetcore/BasicSample/Startup.cs

@@ -4,41 +4,34 @@
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.Extensions.Logging;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading.Tasks;
-
-    using Microsoft.AspNetCore.Mvc.Routing;
+    using static Microsoft.AspNetCore.Mvc.CompatibilityVersion;
 
     public class Startup
     {
-        public Startup( IHostingEnvironment env )
+        public Startup( IConfiguration configuration )
         {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath( env.ContentRootPath )
-                .AddJsonFile( "appsettings.json", optional: true, reloadOnChange: true )
-                .AddJsonFile( $"appsettings.{env.EnvironmentName}.json", optional: true )
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
+            Configuration = configuration;
         }
 
-        public IConfigurationRoot Configuration { get; }
+        public IConfiguration Configuration { get; }
 
+        // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices( IServiceCollection services )
         {
-            services.AddMvc();
-
-            // reporting api versions will return the headers "api-supported-versions" and "api-deprecated-versions"
-            services.AddApiVersioning( o => o.ReportApiVersions = true );
+            // the sample application always uses the latest version, but you may want an explict version such as Version_2_2
+            // note: Endpoint Routing is enabled by default; however, if you need legacy style routing via IRouter, change it to false
+            services.AddMvc( options => options.EnableEndpointRouting = true ).SetCompatibilityVersion( Latest );
+            services.AddApiVersioning(
+                options =>
+                {
+                    // reporting api versions will return the headers "api-supported-versions" and "api-deprecated-versions"
+                    options.ReportApiVersions = true;
+                } );
         }
 
-        public void Configure( IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory )
+        public void Configure( IApplicationBuilder app, IHostingEnvironment env )
         {
-            loggerFactory.AddConsole( Configuration.GetSection( "Logging" ) );
-            loggerFactory.AddDebug();
             app.UseMvc();
         }
     }
-}
+}

samples/aspnetcore/BasicSample/appsettings.json

@@ -1,10 +1,8 @@
 {
   "Logging": {
-    "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
+      "Default": "Warning"
     }
-  }
-}
+  },
+  "AllowedHosts": "*"
+}

samples/aspnetcore/ByNamespaceSample/ByNamespaceSample.csproj

@@ -1,25 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
-  <TargetFramework>netcoreapp2.0</TargetFramework>
+  <TargetFramework>netcoreapp2.2</TargetFramework>
+  <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+  <RootNamespace>Microsoft.Examples</RootNamespace>
  </PropertyGroup>
 
  <ItemGroup>
-  <Content Update="wwwroot\**\*;Views;Areas\**\Views;appsettings.json;web.config">
-   <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-  </Content>
+  <PackageReference Include="Microsoft.AspNetCore.App" />
+  <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
  </ItemGroup>
 
  <ItemGroup>
   <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Mvc.Versioning\Microsoft.AspNetCore.Mvc.Versioning.csproj" />
  </ItemGroup>
 
- <ItemGroup>
-  <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
- </ItemGroup>
-
- <ItemGroup>
-  <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
- </ItemGroup>
-
 </Project>

samples/aspnetcore/ByNamespaceSample/Program.cs

@@ -1,24 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-
-namespace Microsoft.Examples
+namespace Microsoft.Examples
 {
-    public class Program
+    using Microsoft.AspNetCore;
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Hosting;
+
+    public static class Program
     {
-        public static void Main( string[] args )
-        {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseContentRoot( Directory.GetCurrentDirectory() )
-                .UseIISIntegration()
-                .UseStartup<Startup>()
-                .Build();
+        public static void Main( string[] args ) =>
+            CreateWebHostBuilder( args ).Build().Run();
 
-            host.Run();
-        }
+        public static IWebHostBuilder CreateWebHostBuilder( string[] args ) =>
+            WebHost.CreateDefaultBuilder( args )
+                   .UseStartup<Startup>();
     }
 }

samples/aspnetcore/ByNamespaceSample/Startup.cs

@@ -1,18 +1,27 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Versioning.Conventions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace Microsoft.Examples
+namespace Microsoft.Examples
 {
+    using Microsoft.AspNetCore.Builder;
+    using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.Mvc.Versioning.Conventions;
+    using Microsoft.Extensions.Configuration;
+    using Microsoft.Extensions.DependencyInjection;
+    using static Microsoft.AspNetCore.Mvc.CompatibilityVersion;
+
     public class Startup
     {
+        public Startup( IConfiguration configuration )
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
         // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices( IServiceCollection services )
         {
-            services.AddMvc();
+            // the sample application always uses the latest version, but you may want an explict version such as Version_2_2
+            // note: Endpoint Routing is enabled by default; however, if you need legacy style routing via IRouter, change it to false
+            services.AddMvc( options => options.EnableEndpointRouting = true ).SetCompatibilityVersion( Latest );
             services.AddApiVersioning(
                 options =>
                 {
@@ -25,15 +34,8 @@ public void ConfigureServices( IServiceCollection services )
         }
 
         // 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 )
+        public void Configure( IApplicationBuilder app, IHostingEnvironment env )
         {
-            loggerFactory.AddConsole();
-
-            if ( env.IsDevelopment() )
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
             app.UseMvc();
         }
     }

samples/aspnetcore/ByNamespaceSample/V1/Controllers/AgreementsController.cs

@@ -3,9 +3,10 @@
     using Microsoft.AspNetCore.Mvc;
     using Models;
 
+    [ApiController]
     [Route( "[controller]" )]
     [Route( "v{version:apiVersion}/[controller]" )]
-    public class AgreementsController : Controller
+    public class AgreementsController : ControllerBase
     {
         // GET ~/v1/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=1.0

samples/aspnetcore/ByNamespaceSample/V1/Controllers/OrdersController.cs

@@ -3,9 +3,10 @@
     using Microsoft.AspNetCore.Mvc;
     using Models;
 
+    [ApiController]
     [Route( "[controller]" )]
     [Route( "v{version:apiVersion}/[controller]" )]
-    public class OrdersController : Controller
+    public class OrdersController : ControllerBase
     {
         // GET ~/v1/orders/{accountId}
         // GET ~/orders/{accountId}?api-version=1.0

samples/aspnetcore/ByNamespaceSample/V2/Controllers/AgreementsController.cs

@@ -3,9 +3,10 @@
     using Microsoft.AspNetCore.Mvc;
     using Models;
 
+    [ApiController]
     [Route( "[controller]" )]
     [Route( "v{version:apiVersion}/[controller]" )]
-    public class AgreementsController : Controller
+    public class AgreementsController : ControllerBase
     {
         // GET ~/v2/agreements/{accountId}
         // GET ~/agreements/{accountId}?api-version=2.0

samples/aspnetcore/ByNamespaceSample/V2/Controllers/OrdersController.cs

@@ -3,9 +3,10 @@
     using Microsoft.AspNetCore.Mvc;
     using Models;
 
+    [ApiController]
     [Route( "[controller]" )]
     [Route( "v{version:apiVersion}/[controller]" )]
-    public class OrdersController : Controller
+    public class OrdersController : ControllerBase
     {
         // GET ~/v2/orders/{accountId}
         // GET ~/orders/{accountId}?api-version=2.0