Merge branch 'netcore2.0-2' of https://github.com/aspnetboilerplate/module-zero-core-template into netcore2.0-2

Author: hikalkan

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/wwwroot/swagger/ui/index.html

@@ -31,7 +31,7 @@
     <script src='lang/ru.js' type='text/javascript'></script>
     <script src='lang/en.js' type='text/javascript'></script>
     <script src='lang/zh-cn.js' type='text/javascript'></script>-->
-
+    
     <script type="text/javascript">
         $(function () {
             hljs.configure({

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

@@ -55,6 +55,7 @@
     <PackageReference Include="Abp.RedisCache" Version="3.0.0-beta3" />
     <PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0-beta3" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs

@@ -14,6 +14,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Swashbuckle.AspNetCore.Swagger;
 
 #if FEATURE_SIGNALR
 using Owin;
@@ -45,6 +46,12 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.AddScoped<IWebResourceManager, WebResourceManager>();
 
+            services.AddSwaggerGen(options =>
+            {
+                options.SwaggerDoc("v1", new Info { Title = "AbpZeroTemplate API", Version = "v1" });
+                options.DocInclusionPredicate((docName, description) => true);
+            });
+
             //Configure Abp and Dependency Injection
             return services.AddAbp<AbpProjectNameWebMvcModule>(options =>
             {
@@ -73,6 +80,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseAuthentication();
             app.UseJwtTokenMiddleware();
 
+            app.UseSwagger();
+            //Enable middleware to serve swagger - ui assets(HTML, JS, CSS etc.)
+            app.UseSwaggerUI(options =>
+            {
+                options.SwaggerEndpoint("/swagger/v1/swagger.json", "AbpZeroTemplate API V1");
+            }); //URL: /swagger
+
 #if FEATURE_SIGNALR
             //Integrate to OWIN
             app.UseAppBuilder(ConfigureOwinServices);