Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…

…rator into OpenAPIToolsgh-1975
nhomble · May 4, 2020 · 9246535 · 9246535
2 parents 5c8ee5f + 138276a
commit 9246535
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
@@ -325,7 +325,7 @@ public void processOpts() {
         if (!additionalProperties.containsKey(NEWTONSOFT_VERSION)) {
             additionalProperties.put(NEWTONSOFT_VERSION, newtonsoftVersion);
         } else {
-            newtonsoftVersion = (String)additionalProperties.get(NEWTONSOFT_VERSION);
+            newtonsoftVersion = (String) additionalProperties.get(NEWTONSOFT_VERSION);
         }
 
         // CHeck for the modifiers etc.
@@ -383,8 +383,6 @@ public void processOpts() {
             // wwwroot files.
             supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", packageFolder + File.separator + "wwwroot", "README.md"));
             supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", packageFolder + File.separator + "wwwroot", "index.html"));
-            supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", packageFolder + File.separator + "wwwroot", "web.config"));
-
             supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "openapi-original.mustache",
                     packageFolder + File.separator + "wwwroot", "openapi-original.json"));
         } else {
@@ -398,7 +396,7 @@ public void processOpts() {
                     packageFolder + File.separator + "Filters", "GeneratePathParamsValidationFilter.cs"));
         }
 
-        supportingFiles.add(new SupportingFile("Authentication" + File.separator + "ApiAuthentication.mustache",packageFolder + File.separator + "Authentication", "ApiAuthentication.cs"));
+        supportingFiles.add(new SupportingFile("Authentication" + File.separator + "ApiAuthentication.mustache", packageFolder + File.separator + "Authentication", "ApiAuthentication.cs"));
     }
 
     public void setPackageGuid(String packageGuid) {
@@ -542,6 +540,8 @@ private void setAspnetCoreVersion(String packageFolder) {
         } else if ("2.0".equals(aspnetCoreVersion.getOptValue())) {
             supportingFiles.add(new SupportingFile("web.config", packageFolder, "web.config"));
             compatibilityVersion = null;
+        } else if ("2.2".equals(aspnetCoreVersion.getOptValue()) || "2.1".equals(aspnetCoreVersion.getOptValue())) {
+            supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", packageFolder + File.separator + "wwwroot", "web.config"));
         } else {
             // default, do nothing
             compatibilityVersion = "Version_" + aspnetCoreVersion.getOptValue().replace(".", "_");