From c70a2a7481b34362657546e6ca0f4a41ff1c44b3 Mon Sep 17 00:00:00 2001 From: Jim Schubert Date: Sun, 16 Oct 2016 18:33:33 -0400 Subject: [PATCH] [aspnetcore] Deprecating aspnet5 for aspnetcore This moves previous aspnet5 functionality to aspnetcore, aspnet5 now derives from the aspnetcore generator and logs a warning that it's deprecated. This will help resolve any confusion because ASP.NET 5 is terminology referring to the project of around a year ago. ASP.NET Core 1.0 is the new name for the technology, and further enhancements should target .NET Core 1.0 rather than any old vNext or preview stuff. --- .gitignore | 4 +- README.md | 1 + ...erver.sh => aspnetcore-petstore-server.sh} | 2 +- ...ver.bat => aspnetcore-petstore-server.bat} | 2 +- .../languages/AspNet5ServerCodegen.java | 121 +-------------- .../languages/AspNetCoreServerCodegen.java | 144 ++++++++++++++++++ .../services/io.swagger.codegen.CodegenConfig | 1 + .../Dockerfile.mustache | 0 .../{aspnet5 => aspnetcore}/NuGet.Config | 0 .../{aspnet5 => aspnetcore}/Program.mustache | 0 .../Project.xproj.mustache | 0 .../Properties/launchSettings.json | 0 .../{aspnet5 => aspnetcore}/README.mustache | 0 .../{aspnet5 => aspnetcore}/Solution.mustache | 0 .../{aspnet5 => aspnetcore}/Startup.mustache | 0 .../{aspnet5 => aspnetcore}/appsettings.json | 0 .../bodyParam.mustache | 0 .../build.bat.mustache | 0 .../{aspnet5 => aspnetcore}/build.sh.mustache | 0 .../controller.mustache | 0 .../formParam.mustache | 0 .../{aspnet5 => aspnetcore}/gitignore | 0 .../{aspnet5 => aspnetcore}/global.json | 0 .../headerParam.mustache | 0 .../listReturn.mustache | 0 .../mapReturn.mustache | 0 .../{aspnet5 => aspnetcore}/model.mustache | 0 .../objectReturn.mustache | 0 .../partial_header.mustache | 0 .../pathParam.mustache | 0 .../project.json.mustache | 0 .../queryParam.mustache | 0 .../{aspnet5 => aspnetcore}/tags.mustache | 0 .../{aspnet5 => aspnetcore}/web.config | 0 .../{aspnet5 => aspnetcore}/wwwroot/README.md | 0 .../wwwroot/index.html | 0 .../wwwroot/web.config | 0 .../AspNetCoreServerOptionsTest.java} | 20 +-- ...a => AspNetCoreServerOptionsProvider.java} | 8 +- .../.swagger-codegen-ignore | 0 .../{aspnet5 => aspnetcore}/IO.Swagger.sln | 0 .../petstore/{aspnet5 => aspnetcore}/LICENSE | 0 .../{aspnet5 => aspnetcore}/NuGet.Config | 0 .../{aspnet5 => aspnetcore}/README.md | 0 .../{aspnet5 => aspnetcore}/build.bat | 0 .../petstore/{aspnet5 => aspnetcore}/build.sh | 0 .../{aspnet5 => aspnetcore}/global.json | 0 .../src/IO.Swagger/.gitignore | 0 .../src/IO.Swagger/Controllers/PetApi.cs | 0 .../src/IO.Swagger/Controllers/StoreApi.cs | 0 .../src/IO.Swagger/Controllers/UserApi.cs | 0 .../src/IO.Swagger/Dockerfile | 0 .../src/IO.Swagger/IO.Swagger.xproj | 0 .../src/IO.Swagger/Models/ApiResponse.cs | 0 .../src/IO.Swagger/Models/Category.cs | 0 .../src/IO.Swagger/Models/Order.cs | 0 .../src/IO.Swagger/Models/Pet.cs | 0 .../src/IO.Swagger/Models/Tag.cs | 0 .../src/IO.Swagger/Models/User.cs | 0 .../src/IO.Swagger/Program.cs | 0 .../IO.Swagger/Properties/launchSettings.json | 0 .../src/IO.Swagger/Startup.cs | 0 .../src/IO.Swagger/appsettings.json | 0 .../src/IO.Swagger/project.json | 0 .../src/IO.Swagger/web.config | 0 .../src/IO.Swagger/wwwroot/README.md | 0 .../src/IO.Swagger/wwwroot/index.html | 0 .../src/IO.Swagger/wwwroot/web.config | 0 68 files changed, 166 insertions(+), 137 deletions(-) rename bin/{aspnet5-petstore-server.sh => aspnetcore-petstore-server.sh} (83%) rename bin/windows/{aspnet5-petstore-server.bat => aspnetcore-petstore-server.bat} (81%) create mode 100644 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/Dockerfile.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/NuGet.Config (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/Program.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/Project.xproj.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/Properties/launchSettings.json (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/README.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/Solution.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/Startup.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/appsettings.json (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/bodyParam.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/build.bat.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/build.sh.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/controller.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/formParam.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/gitignore (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/global.json (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/headerParam.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/listReturn.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/mapReturn.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/model.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/objectReturn.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/partial_header.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/pathParam.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/project.json.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/queryParam.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/tags.mustache (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/web.config (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/wwwroot/README.md (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/wwwroot/index.html (100%) rename modules/swagger-codegen/src/main/resources/{aspnet5 => aspnetcore}/wwwroot/web.config (100%) rename modules/swagger-codegen/src/test/java/io/swagger/codegen/{aspnet5/AspNet5ServerOptionsTest.java => aspnetcore/AspNetCoreServerOptionsTest.java} (51%) rename modules/swagger-codegen/src/test/java/io/swagger/codegen/options/{AspNet5ServerOptionsProvider.java => AspNetCoreServerOptionsProvider.java} (90%) rename samples/server/petstore/{aspnet5 => aspnetcore}/.swagger-codegen-ignore (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/IO.Swagger.sln (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/LICENSE (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/NuGet.Config (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/README.md (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/build.bat (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/build.sh (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/global.json (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/.gitignore (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Controllers/PetApi.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Controllers/StoreApi.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Controllers/UserApi.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Dockerfile (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/IO.Swagger.xproj (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Models/ApiResponse.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Models/Category.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Models/Order.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Models/Pet.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Models/Tag.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Models/User.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Program.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Properties/launchSettings.json (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/Startup.cs (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/appsettings.json (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/project.json (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/web.config (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/wwwroot/README.md (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/wwwroot/index.html (100%) rename samples/server/petstore/{aspnet5 => aspnetcore}/src/IO.Swagger/wwwroot/web.config (100%) diff --git a/.gitignore b/.gitignore index 6f2eef3cee8..0ee7754ae53 100644 --- a/.gitignore +++ b/.gitignore @@ -143,6 +143,6 @@ samples/client/petstore/typescript-angular/**/typings samples/client/petstore/typescript-fetch/**/dist/ samples/client/petstore/typescript-fetch/**/typings -# aspnet5 -samples/server/petstore/aspnet5/.vs/ +# aspnetcore +samples/server/petstore/aspnetcore/.vs/ diff --git a/README.md b/README.md index cdd13d0274d..d9f7e365ad8 100644 --- a/README.md +++ b/README.md @@ -450,6 +450,7 @@ AbstractTypeScriptClientCodegen.java AkkaScalaClientCodegen.java AndroidClientCodegen.java AspNet5ServerCodegen.java +AspNetCoreServerCodegen.java AsyncScalaClientCodegen.java CSharpClientCodegen.java ClojureClientCodegen.java diff --git a/bin/aspnet5-petstore-server.sh b/bin/aspnetcore-petstore-server.sh similarity index 83% rename from bin/aspnet5-petstore-server.sh rename to bin/aspnetcore-petstore-server.sh index 4481b4b318f..1bb0c4f4e80 100755 --- a/bin/aspnet5-petstore-server.sh +++ b/bin/aspnetcore-petstore-server.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -l aspnet5 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnet5" +ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/aspnet5-petstore-server.bat b/bin/windows/aspnetcore-petstore-server.bat similarity index 81% rename from bin/windows/aspnet5-petstore-server.bat rename to bin/windows/aspnetcore-petstore-server.bat index 0823553857b..c2f5042cf6a 100755 --- a/bin/windows/aspnet5-petstore-server.bat +++ b/bin/windows/aspnetcore-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnet5 -o samples\server\petstore\aspnet5\ +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l aspnetcore -o samples\server\petstore\aspnetcore\ java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java index e98c1441254..d22e18f2cd0 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java @@ -1,74 +1,15 @@ package io.swagger.codegen.languages; -import io.swagger.codegen.*; -import io.swagger.models.properties.*; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.util.*; - -import static java.util.UUID.randomUUID; - -public class AspNet5ServerCodegen extends AbstractCSharpCodegen { - - protected String sourceFolder = "src" + File.separator + packageName; - - private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}"; +public class AspNet5ServerCodegen extends AspNetCoreServerCodegen { @SuppressWarnings("hiding") protected Logger LOGGER = LoggerFactory.getLogger(AspNet5ServerCodegen.class); public AspNet5ServerCodegen() { super(); - - outputFolder = "generated-code" + File.separator + this.getName(); - - modelTemplateFiles.put("model.mustache", ".cs"); - apiTemplateFiles.put("controller.mustache", ".cs"); - - // contextually reserved words - setReservedWordsLowerCase( - Arrays.asList("var", "async", "await", "dynamic", "yield") - ); - - cliOptions.clear(); - - // CLI options - addOption(CodegenConstants.PACKAGE_NAME, - "C# package name (convention: Title.Case).", - this.packageName); - - addOption(CodegenConstants.PACKAGE_VERSION, - "C# package version.", - this.packageVersion); - - addOption(CodegenConstants.SOURCE_FOLDER, - CodegenConstants.SOURCE_FOLDER_DESC, - sourceFolder); - - // CLI Switches - addSwitch(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, - CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC, - this.sortParamsByRequiredFlag); - - addSwitch(CodegenConstants.USE_DATETIME_OFFSET, - CodegenConstants.USE_DATETIME_OFFSET_DESC, - this.useDateTimeOffsetFlag); - - addSwitch(CodegenConstants.USE_COLLECTION, - CodegenConstants.USE_COLLECTION_DESC, - this.useCollection); - - addSwitch(CodegenConstants.RETURN_ICOLLECTION, - CodegenConstants.RETURN_ICOLLECTION_DESC, - this.returnICollection); - } - - @Override - public CodegenType getTag() { - return CodegenType.SERVER; } @Override @@ -76,68 +17,10 @@ public String getName() { return "aspnet5"; } - @Override - public String getHelp() { - return "Generates an ASP.NET 5 Web API server."; - } - @Override public void processOpts() { super.processOpts(); - additionalProperties.put("packageGuid", packageGuid); - - apiPackage = packageName + ".Controllers"; - modelPackage = packageName + ".Models"; - - supportingFiles.add(new SupportingFile("NuGet.Config", "", "NuGet.Config")); - supportingFiles.add(new SupportingFile("global.json", "", "global.json")); - supportingFiles.add(new SupportingFile("build.sh.mustache", "", "build.sh")); - supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat")); - supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - supportingFiles.add(new SupportingFile("Solution.mustache", "", this.packageName + ".sln")); - supportingFiles.add(new SupportingFile("Dockerfile.mustache", this.sourceFolder, "Dockerfile")); - supportingFiles.add(new SupportingFile("gitignore", this.sourceFolder, ".gitignore")); - supportingFiles.add(new SupportingFile("appsettings.json", this.sourceFolder, "appsettings.json")); - - supportingFiles.add(new SupportingFile("project.json.mustache", this.sourceFolder, "project.json")); - supportingFiles.add(new SupportingFile("Startup.mustache", this.sourceFolder, "Startup.cs")); - supportingFiles.add(new SupportingFile("Program.mustache", this.sourceFolder, "Program.cs")); - supportingFiles.add(new SupportingFile("web.config", this.sourceFolder, "web.config")); - - supportingFiles.add(new SupportingFile("Project.xproj.mustache", this.sourceFolder, this.packageName + ".xproj")); - - supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", this.sourceFolder + File.separator + "Properties", "launchSettings.json")); - - supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", this.sourceFolder + File.separator + "wwwroot", "README.md")); - supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", this.sourceFolder + File.separator + "wwwroot", "index.html")); - supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", this.sourceFolder + File.separator + "wwwroot", "web.config")); - } - - @Override - public String apiFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + "Controllers"; - } - - @Override - public String modelFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + "Models"; - } - - @Override - protected void processOperation(CodegenOperation operation) { - super.processOperation(operation); - - // HACK: Unlikely in the wild, but we need to clean operation paths for MVC Routing - if (operation.path != null) { - String original = operation.path; - operation.path = operation.path.replace("?", "/"); - if (!original.equals(operation.path)) { - LOGGER.warn("Normalized " + original + " to " + operation.path + ". Please verify generated source."); - } - } - - // Converts, for example, PUT to HttpPut for controller attributes - operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase(); + LOGGER.warn("aspnet5 is deprecated. Please use aspnetcore."); } } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java new file mode 100644 index 00000000000..2045a249d97 --- /dev/null +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java @@ -0,0 +1,144 @@ +package io.swagger.codegen.languages; + +import io.swagger.codegen.CodegenConstants; +import io.swagger.codegen.CodegenOperation; +import io.swagger.codegen.CodegenType; +import io.swagger.codegen.SupportingFile; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.Arrays; + +import static java.util.UUID.randomUUID; + +public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { + + protected String sourceFolder = "src" + File.separator + packageName; + + private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}"; + + @SuppressWarnings("hiding") + protected Logger LOGGER = LoggerFactory.getLogger(AspNetCoreServerCodegen.class); + + public AspNetCoreServerCodegen() { + super(); + + outputFolder = "generated-code" + File.separator + this.getName(); + + modelTemplateFiles.put("model.mustache", ".cs"); + apiTemplateFiles.put("controller.mustache", ".cs"); + + // contextually reserved words + setReservedWordsLowerCase( + Arrays.asList("var", "async", "await", "dynamic", "yield") + ); + + cliOptions.clear(); + + // CLI options + addOption(CodegenConstants.PACKAGE_NAME, + "C# package name (convention: Title.Case).", + this.packageName); + + addOption(CodegenConstants.PACKAGE_VERSION, + "C# package version.", + this.packageVersion); + + addOption(CodegenConstants.SOURCE_FOLDER, + CodegenConstants.SOURCE_FOLDER_DESC, + sourceFolder); + + // CLI Switches + addSwitch(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, + CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC, + this.sortParamsByRequiredFlag); + + addSwitch(CodegenConstants.USE_DATETIME_OFFSET, + CodegenConstants.USE_DATETIME_OFFSET_DESC, + this.useDateTimeOffsetFlag); + + addSwitch(CodegenConstants.USE_COLLECTION, + CodegenConstants.USE_COLLECTION_DESC, + this.useCollection); + + addSwitch(CodegenConstants.RETURN_ICOLLECTION, + CodegenConstants.RETURN_ICOLLECTION_DESC, + this.returnICollection); + } + + @Override + public CodegenType getTag() { + return CodegenType.SERVER; + } + + @Override + public String getName() { + return "aspnetcore"; + } + + @Override + public String getHelp() { + return "Generates an ASP.NET Core Web API server."; + } + + @Override + public void processOpts() { + super.processOpts(); + + additionalProperties.put("packageGuid", packageGuid); + + apiPackage = packageName + ".Controllers"; + modelPackage = packageName + ".Models"; + + supportingFiles.add(new SupportingFile("NuGet.Config", "", "NuGet.Config")); + supportingFiles.add(new SupportingFile("global.json", "", "global.json")); + supportingFiles.add(new SupportingFile("build.sh.mustache", "", "build.sh")); + supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat")); + supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("Solution.mustache", "", this.packageName + ".sln")); + supportingFiles.add(new SupportingFile("Dockerfile.mustache", this.sourceFolder, "Dockerfile")); + supportingFiles.add(new SupportingFile("gitignore", this.sourceFolder, ".gitignore")); + supportingFiles.add(new SupportingFile("appsettings.json", this.sourceFolder, "appsettings.json")); + + supportingFiles.add(new SupportingFile("project.json.mustache", this.sourceFolder, "project.json")); + supportingFiles.add(new SupportingFile("Startup.mustache", this.sourceFolder, "Startup.cs")); + supportingFiles.add(new SupportingFile("Program.mustache", this.sourceFolder, "Program.cs")); + supportingFiles.add(new SupportingFile("web.config", this.sourceFolder, "web.config")); + + supportingFiles.add(new SupportingFile("Project.xproj.mustache", this.sourceFolder, this.packageName + ".xproj")); + + supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", this.sourceFolder + File.separator + "Properties", "launchSettings.json")); + + supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", this.sourceFolder + File.separator + "wwwroot", "README.md")); + supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", this.sourceFolder + File.separator + "wwwroot", "index.html")); + supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", this.sourceFolder + File.separator + "wwwroot", "web.config")); + } + + @Override + public String apiFileFolder() { + return outputFolder + File.separator + sourceFolder + File.separator + "Controllers"; + } + + @Override + public String modelFileFolder() { + return outputFolder + File.separator + sourceFolder + File.separator + "Models"; + } + + @Override + protected void processOperation(CodegenOperation operation) { + super.processOperation(operation); + + // HACK: Unlikely in the wild, but we need to clean operation paths for MVC Routing + if (operation.path != null) { + String original = operation.path; + operation.path = operation.path.replace("?", "/"); + if (!original.equals(operation.path)) { + LOGGER.warn("Normalized " + original + " to " + operation.path + ". Please verify generated source."); + } + } + + // Converts, for example, PUT to HttpPut for controller attributes + operation.httpMethod = "Http" + operation.httpMethod.substring(0, 1) + operation.httpMethod.substring(1).toLowerCase(); + } +} diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig index cd4d09c2150..7f2c3ec6642 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/io.swagger.codegen.CodegenConfig @@ -1,5 +1,6 @@ io.swagger.codegen.languages.AndroidClientCodegen io.swagger.codegen.languages.AspNet5ServerCodegen +io.swagger.codegen.languages.AspNetCoreServerCodegen io.swagger.codegen.languages.AsyncScalaClientCodegen io.swagger.codegen.languages.ConfluenceWikiGenerator io.swagger.codegen.languages.CSharpClientCodegen diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Dockerfile.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Dockerfile.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/Dockerfile.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/Dockerfile.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/NuGet.Config b/modules/swagger-codegen/src/main/resources/aspnetcore/NuGet.Config similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/NuGet.Config rename to modules/swagger-codegen/src/main/resources/aspnetcore/NuGet.Config diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Program.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Program.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/Program.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/Program.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Project.xproj.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Project.xproj.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/Project.xproj.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/Project.xproj.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Properties/launchSettings.json b/modules/swagger-codegen/src/main/resources/aspnetcore/Properties/launchSettings.json similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/Properties/launchSettings.json rename to modules/swagger-codegen/src/main/resources/aspnetcore/Properties/launchSettings.json diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/README.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/README.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Solution.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Solution.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/Solution.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/Solution.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/Startup.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/Startup.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/appsettings.json b/modules/swagger-codegen/src/main/resources/aspnetcore/appsettings.json similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/appsettings.json rename to modules/swagger-codegen/src/main/resources/aspnetcore/appsettings.json diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/bodyParam.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/bodyParam.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/bodyParam.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/bodyParam.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/build.bat.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/build.bat.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/build.bat.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/build.bat.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/build.sh.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/build.sh.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/build.sh.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/build.sh.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/controller.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/controller.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/controller.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/formParam.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/formParam.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/formParam.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/formParam.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/gitignore b/modules/swagger-codegen/src/main/resources/aspnetcore/gitignore similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/gitignore rename to modules/swagger-codegen/src/main/resources/aspnetcore/gitignore diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/global.json b/modules/swagger-codegen/src/main/resources/aspnetcore/global.json similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/global.json rename to modules/swagger-codegen/src/main/resources/aspnetcore/global.json diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/headerParam.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/headerParam.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/headerParam.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/headerParam.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/listReturn.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/listReturn.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/listReturn.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/listReturn.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/mapReturn.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/mapReturn.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/mapReturn.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/mapReturn.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/model.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/model.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/model.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/model.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/objectReturn.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/objectReturn.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/objectReturn.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/objectReturn.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/partial_header.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/partial_header.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/partial_header.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/partial_header.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/pathParam.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/pathParam.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/pathParam.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/pathParam.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/project.json.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/project.json.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/project.json.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/project.json.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/queryParam.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/queryParam.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/queryParam.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/queryParam.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/tags.mustache b/modules/swagger-codegen/src/main/resources/aspnetcore/tags.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/tags.mustache rename to modules/swagger-codegen/src/main/resources/aspnetcore/tags.mustache diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/web.config b/modules/swagger-codegen/src/main/resources/aspnetcore/web.config similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/web.config rename to modules/swagger-codegen/src/main/resources/aspnetcore/web.config diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/README.md b/modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/README.md similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/README.md rename to modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/README.md diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/index.html b/modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/index.html similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/index.html rename to modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/index.html diff --git a/modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/web.config b/modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/web.config similarity index 100% rename from modules/swagger-codegen/src/main/resources/aspnet5/wwwroot/web.config rename to modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/web.config diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnet5/AspNet5ServerOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java similarity index 51% rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnet5/AspNet5ServerOptionsTest.java rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java index f42eee01fe0..befeb4f1865 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnet5/AspNet5ServerOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/aspnetcore/AspNetCoreServerOptionsTest.java @@ -1,19 +1,19 @@ -package io.swagger.codegen.aspnet5; +package io.swagger.codegen.aspnetcore; import io.swagger.codegen.AbstractOptionsTest; import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.languages.AspNet5ServerCodegen; -import io.swagger.codegen.options.AspNet5ServerOptionsProvider; +import io.swagger.codegen.languages.AspNetCoreServerCodegen; +import io.swagger.codegen.options.AspNetCoreServerOptionsProvider; import mockit.Expectations; import mockit.Tested; -public class AspNet5ServerOptionsTest extends AbstractOptionsTest { +public class AspNetCoreServerOptionsTest extends AbstractOptionsTest { @Tested - private AspNet5ServerCodegen serverCodegen; + private AspNetCoreServerCodegen serverCodegen; - public AspNet5ServerOptionsTest() { - super(new AspNet5ServerOptionsProvider()); + public AspNetCoreServerOptionsTest() { + super(new AspNetCoreServerOptionsProvider()); } @Override @@ -25,11 +25,11 @@ protected CodegenConfig getCodegenConfig() { @Override protected void setExpectations() { new Expectations(serverCodegen) {{ - serverCodegen.setPackageName(AspNet5ServerOptionsProvider.PACKAGE_NAME_VALUE); + serverCodegen.setPackageName(AspNetCoreServerOptionsProvider.PACKAGE_NAME_VALUE); times = 1; - serverCodegen.setPackageVersion(AspNet5ServerOptionsProvider.PACKAGE_VERSION_VALUE); + serverCodegen.setPackageVersion(AspNetCoreServerOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; - serverCodegen.setSourceFolder(AspNet5ServerOptionsProvider.SOURCE_FOLDER_VALUE); + serverCodegen.setSourceFolder(AspNetCoreServerOptionsProvider.SOURCE_FOLDER_VALUE); times = 1; serverCodegen.useDateTimeOffset(true); times = 1; diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNet5ServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java similarity index 90% rename from modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNet5ServerOptionsProvider.java rename to modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java index 962fc1182d3..f4c58fd7124 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNet5ServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/AspNetCoreServerOptionsProvider.java @@ -5,14 +5,14 @@ import java.util.Map; -public class AspNet5ServerOptionsProvider implements OptionsProvider { - public static final String PACKAGE_NAME_VALUE = "swagger_server_aspnet5"; +public class AspNetCoreServerOptionsProvider implements OptionsProvider { + public static final String PACKAGE_NAME_VALUE = "swagger_server_aspnetcore"; public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT"; - public static final String SOURCE_FOLDER_VALUE = "src_aspnet5"; + public static final String SOURCE_FOLDER_VALUE = "src_aspnetcore"; @Override public String getLanguage() { - return "aspnet5"; + return "aspnetcore"; } @Override diff --git a/samples/server/petstore/aspnet5/.swagger-codegen-ignore b/samples/server/petstore/aspnetcore/.swagger-codegen-ignore similarity index 100% rename from samples/server/petstore/aspnet5/.swagger-codegen-ignore rename to samples/server/petstore/aspnetcore/.swagger-codegen-ignore diff --git a/samples/server/petstore/aspnet5/IO.Swagger.sln b/samples/server/petstore/aspnetcore/IO.Swagger.sln similarity index 100% rename from samples/server/petstore/aspnet5/IO.Swagger.sln rename to samples/server/petstore/aspnetcore/IO.Swagger.sln diff --git a/samples/server/petstore/aspnet5/LICENSE b/samples/server/petstore/aspnetcore/LICENSE similarity index 100% rename from samples/server/petstore/aspnet5/LICENSE rename to samples/server/petstore/aspnetcore/LICENSE diff --git a/samples/server/petstore/aspnet5/NuGet.Config b/samples/server/petstore/aspnetcore/NuGet.Config similarity index 100% rename from samples/server/petstore/aspnet5/NuGet.Config rename to samples/server/petstore/aspnetcore/NuGet.Config diff --git a/samples/server/petstore/aspnet5/README.md b/samples/server/petstore/aspnetcore/README.md similarity index 100% rename from samples/server/petstore/aspnet5/README.md rename to samples/server/petstore/aspnetcore/README.md diff --git a/samples/server/petstore/aspnet5/build.bat b/samples/server/petstore/aspnetcore/build.bat similarity index 100% rename from samples/server/petstore/aspnet5/build.bat rename to samples/server/petstore/aspnetcore/build.bat diff --git a/samples/server/petstore/aspnet5/build.sh b/samples/server/petstore/aspnetcore/build.sh similarity index 100% rename from samples/server/petstore/aspnet5/build.sh rename to samples/server/petstore/aspnetcore/build.sh diff --git a/samples/server/petstore/aspnet5/global.json b/samples/server/petstore/aspnetcore/global.json similarity index 100% rename from samples/server/petstore/aspnet5/global.json rename to samples/server/petstore/aspnetcore/global.json diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/.gitignore b/samples/server/petstore/aspnetcore/src/IO.Swagger/.gitignore similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/.gitignore rename to samples/server/petstore/aspnetcore/src/IO.Swagger/.gitignore diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Controllers/PetApi.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/PetApi.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Controllers/PetApi.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Controllers/StoreApi.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/StoreApi.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Controllers/StoreApi.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Controllers/UserApi.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Controllers/UserApi.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Controllers/UserApi.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile b/samples/server/petstore/aspnetcore/src/IO.Swagger/Dockerfile similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Dockerfile rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Dockerfile diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/IO.Swagger.xproj b/samples/server/petstore/aspnetcore/src/IO.Swagger/IO.Swagger.xproj similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/IO.Swagger.xproj rename to samples/server/petstore/aspnetcore/src/IO.Swagger/IO.Swagger.xproj diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Models/ApiResponse.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Models/ApiResponse.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Models/ApiResponse.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Category.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Models/Category.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Category.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Order.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Models/Order.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Order.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Pet.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Models/Pet.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Pet.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Tag.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Models/Tag.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Models/Tag.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Models/User.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Models/User.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Models/User.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Program.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Program.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Program.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Program.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Properties/launchSettings.json b/samples/server/petstore/aspnetcore/src/IO.Swagger/Properties/launchSettings.json similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Properties/launchSettings.json rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Properties/launchSettings.json diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/Startup.cs b/samples/server/petstore/aspnetcore/src/IO.Swagger/Startup.cs similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/Startup.cs rename to samples/server/petstore/aspnetcore/src/IO.Swagger/Startup.cs diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/appsettings.json b/samples/server/petstore/aspnetcore/src/IO.Swagger/appsettings.json similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/appsettings.json rename to samples/server/petstore/aspnetcore/src/IO.Swagger/appsettings.json diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/project.json b/samples/server/petstore/aspnetcore/src/IO.Swagger/project.json similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/project.json rename to samples/server/petstore/aspnetcore/src/IO.Swagger/project.json diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/web.config b/samples/server/petstore/aspnetcore/src/IO.Swagger/web.config similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/web.config rename to samples/server/petstore/aspnetcore/src/IO.Swagger/web.config diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/README.md b/samples/server/petstore/aspnetcore/src/IO.Swagger/wwwroot/README.md similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/README.md rename to samples/server/petstore/aspnetcore/src/IO.Swagger/wwwroot/README.md diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/index.html b/samples/server/petstore/aspnetcore/src/IO.Swagger/wwwroot/index.html similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/index.html rename to samples/server/petstore/aspnetcore/src/IO.Swagger/wwwroot/index.html diff --git a/samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/web.config b/samples/server/petstore/aspnetcore/src/IO.Swagger/wwwroot/web.config similarity index 100% rename from samples/server/petstore/aspnet5/src/IO.Swagger/wwwroot/web.config rename to samples/server/petstore/aspnetcore/src/IO.Swagger/wwwroot/web.config