From c496ec7269172a7afe45ab4beb82e4bcde03aaf1 Mon Sep 17 00:00:00 2001
From: Max K <knom@users.noreply.github.com>
Date: Wed, 13 Dec 2017 05:03:33 +0100
Subject: [PATCH] Added support for VERSION, APPNAME and CONTACT from Swagger
 file into Startup.cs (#7103)

* Added support for VERSION and APPNAME from Swagger file into Startup.cs for Swashbuckle SwaggerGen

* Ran bin/aspnetcore-petstore-server.sh

* Added contact information

* Added contact information to startup.cs
---
 .../main/resources/aspnetcore/Startup.mustache   | 16 +++++++++++-----
 .../aspnetcore/src/IO.Swagger/Startup.cs         | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache
index fd9178dc536e..cd4e64336e46 100644
--- a/modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache
+++ b/modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache
@@ -54,11 +54,17 @@ namespace {{packageName}}
             services
                 .AddSwaggerGen(c =>
                 {
-                    c.SwaggerDoc("v1", new Info
+                    c.SwaggerDoc("{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}", new Info
                     {
-                        Version = "v1",
-                        Title = "{{packageName}}",
-                        Description = "{{packageName}} (ASP.NET Core 2.0)"
+                        Version = "{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}",
+                        Title = "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}}",
+                        Description = "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}} (ASP.NET Core 2.0)",
+                        Contact = new Contact()
+                        {
+                           Url = "{{#infoUrl}}{{{infoUrl}}}{{/infoUrl}}",
+                           Email = "{{#infoEmail}}{{{infoEmail}}}{{/infoEmail}}"
+                        },
+                        TermsOfService = "{{#termsOfService}}{{{termsOfService}}}{{/termsOfService}}"
                     });
                     c.CustomSchemaIds(type => type.FriendlyId(true));
                     c.DescribeAllEnumsAsStrings();
@@ -87,7 +93,7 @@ namespace {{packageName}}
                 .UseSwagger()
                 .UseSwaggerUI(c =>
                 {
-                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "{{packageName}}");
+                    c.SwaggerEndpoint("/swagger/{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}/swagger.json", "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}}");
                 });
 
             if (env.IsDevelopment())
diff --git a/samples/server/petstore/aspnetcore/src/IO.Swagger/Startup.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Startup.cs
index 0b7d570bb03e..3e920ec2df0a 100644
--- a/samples/server/petstore/aspnetcore/src/IO.Swagger/Startup.cs
+++ b/samples/server/petstore/aspnetcore/src/IO.Swagger/Startup.cs
@@ -63,11 +63,17 @@ namespace IO.Swagger
             services
                 .AddSwaggerGen(c =>
                 {
-                    c.SwaggerDoc("v1", new Info
+                    c.SwaggerDoc("1.0.0", new Info
                     {
-                        Version = "v1",
-                        Title = "IO.Swagger",
-                        Description = "IO.Swagger (ASP.NET Core 2.0)"
+                        Version = "1.0.0",
+                        Title = "Swagger Petstore",
+                        Description = "Swagger Petstore (ASP.NET Core 2.0)",
+                        Contact = new Contact()
+                        {
+                           Url = "",
+                           Email = "apiteam@swagger.io"
+                        },
+                        TermsOfService = "http://swagger.io/terms/"
                     });
                     c.CustomSchemaIds(type => type.FriendlyId(true));
                     c.DescribeAllEnumsAsStrings();
@@ -94,7 +100,7 @@ namespace IO.Swagger
                 .UseSwagger()
                 .UseSwaggerUI(c =>
                 {
-                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "IO.Swagger");
+                    c.SwaggerEndpoint("/swagger/1.0.0/swagger.json", "Swagger Petstore");
                 });
 
             if (env.IsDevelopment())