diff --git a/src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java
index 8702b9c09a..5b40cf9c30 100644
--- a/src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java
+++ b/src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java
@@ -190,16 +190,11 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("gitignore", packageFolder, ".gitignore"));
         supportingFiles.add(new SupportingFile("appsettings.json", packageFolder, "appsettings.json"));
 
-        //supportingFiles.add(new SupportingFile("Startup.mustache", packageFolder, "Startup.cs"));
-
         supportingFiles.add(new SupportingFile("validateModel.mustache", packageFolder + File.separator + "Attributes", "ValidateModelStateAttribute.cs"));
         supportingFiles.add(new SupportingFile("web.config", packageFolder, "web.config"));
 
         supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", packageFolder + File.separator + "Properties", "launchSettings.json"));
 
-//        supportingFiles.add(new SupportingFile("Filters" + File.separator + "BasePathFilter.mustache", packageFolder + File.separator + "Filters", "BasePathFilter.cs"));
-//        supportingFiles.add(new SupportingFile("Filters" + File.separator + "GeneratePathParamsValidationFilter.mustache", packageFolder + File.separator + "Filters", "GeneratePathParamsValidationFilter.cs"));
-
         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"));
@@ -373,7 +368,7 @@ private void setAspNetCoreVersion() {
         } else {
             this.aspNetCoreVersion = optionValue;
         }
-        if (!this.aspNetCoreVersion.equals("2.0") && !this.aspNetCoreVersion.equals("2.1") && !this.aspNetCoreVersion.equals("2.2")) {
+        if (!this.aspNetCoreVersion.equals("2.0") && !this.aspNetCoreVersion.equals("2.1") && !this.aspNetCoreVersion.equals("2.2") && !this.aspNetCoreVersion.equals("3.0")) {
             LOGGER.error("version '" + this.aspNetCoreVersion + "' is not supported, switching to default version: '" + DEFAULT_ASP_NET_CORE_VERSION + "'");
             this.aspNetCoreVersion = DEFAULT_ASP_NET_CORE_VERSION;
         }
diff --git a/src/main/resources/handlebars/aspnetcore/3.0/Dockerfile.mustache b/src/main/resources/handlebars/aspnetcore/3.0/Dockerfile.mustache
index a466136810..549f8be828 100644
--- a/src/main/resources/handlebars/aspnetcore/3.0/Dockerfile.mustache
+++ b/src/main/resources/handlebars/aspnetcore/3.0/Dockerfile.mustache
@@ -15,4 +15,5 @@ RUN dotnet publish -c Release -o out
 FROM mcr.microsoft.com/dotnet/core/aspnet:{{aspNetCoreVersion}}
 WORKDIR /app
 COPY --from=build-env /app/out .
-ENTRYPOINT ["dotnet", "{{packageName}}.dll"]
\ No newline at end of file
+
+ENTRYPOINT ["dotnet", "{{packageName}}.dll"]
diff --git a/src/main/resources/handlebars/aspnetcore/3.0/Filters/BasePathFilter.mustache b/src/main/resources/handlebars/aspnetcore/3.0/Filters/BasePathFilter.mustache
index a86d7ed6b5..3d2c3b67c7 100644
--- a/src/main/resources/handlebars/aspnetcore/3.0/Filters/BasePathFilter.mustache
+++ b/src/main/resources/handlebars/aspnetcore/3.0/Filters/BasePathFilter.mustache
@@ -48,4 +48,4 @@ namespace {{packageName}}.Filters
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/handlebars/aspnetcore/3.0/Project.csproj.mustache b/src/main/resources/handlebars/aspnetcore/3.0/Project.csproj.mustache
index 6fdcb63123..82f6e1a838 100644
--- a/src/main/resources/handlebars/aspnetcore/3.0/Project.csproj.mustache
+++ b/src/main/resources/handlebars/aspnetcore/3.0/Project.csproj.mustache
@@ -17,4 +17,4 @@
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/main/resources/handlebars/aspnetcore/3.0/Startup.mustache b/src/main/resources/handlebars/aspnetcore/3.0/Startup.mustache
index 0e6c58b783..988178fc7d 100644
--- a/src/main/resources/handlebars/aspnetcore/3.0/Startup.mustache
+++ b/src/main/resources/handlebars/aspnetcore/3.0/Startup.mustache
@@ -151,4 +151,4 @@ namespace {{packageName}}
             }
         }
     }
-}
\ No newline at end of file
+}