[csharp][aspnetcore] Update aspnetcore nuspec and csproj with authors…

… and description (#8995) * Update aspnetcore nuspec and csproj with authors and description * Removed unneccesary include
OpenAPITools · Mar 19, 2021 · 061b00e · 061b00e
1 parent de8b344
commit 061b00e
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 26 deletions.
diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md
@@ -24,6 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |operationResultTask|Set methods result to Task&lt;&gt;.| |false|
 |packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
 |packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright|
+|packageDescription|Specifies a AssemblyDescription for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |A library generated from a OpenAPI doc|
 |packageGuid|The GUID that will be associated with the C# project| |null|
 |packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
 |packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library|

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
@@ -148,6 +148,10 @@ public AspNetCoreServerCodegen() {
         setSupportNullable(Boolean.TRUE);
 
         // CLI options
+        addOption(CodegenConstants.PACKAGE_DESCRIPTION,
+                  CodegenConstants.PACKAGE_DESCRIPTION_DESC,
+                  packageDescription);
+
         addOption(CodegenConstants.LICENSE_URL,
                 CodegenConstants.LICENSE_URL_DESC,
                 licenseUrl);

diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <Description>{{packageName}}</Description>
-    <Copyright>{{packageName}}</Copyright>
+    <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description>
+    <Copyright>{{packageCopyright}}</Copyright>
+    <Authors>{{packageAuthors}}</Authors>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <Version>{{packageVersion}}</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache
@@ -1,7 +1,8 @@
 <Project Sdk="{{projectSdk}}">
   <PropertyGroup>
-    <Description>{{packageName}}</Description>
-    <Copyright>{{packageName}}</Copyright>
+    <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description>
+    <Copyright>{{packageCopyright}}</Copyright>
+    <Authors>{{packageAuthors}}</Authors>
     <TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>

diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.nuspec.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.nuspec.mustache
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <package >
-  <metadata>
-    <id>$id$</id>
-    <version>{{packageVersion}}</version>
-    <title>{{packageTitle}}</title>
-    <authors>{{packageAuthors}}</authors>
-    <owners>{{packageAuthors}}</owners>
-    <licenseUrl>{{licenseUrl}}</licenseUrl>
-    <!--
-    <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
-    <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
-    -->
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>{{packageName}}</description>
-    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
-    <copyright>{{packageCopyright}}</copyright>
-    <tags>{{packageName}}</tags>
-  </metadata>
+    <metadata>
+        <id>$id$</id>
+        <version>{{packageVersion}}</version>
+        <title>{{packageTitle}}</title>
+        <authors>{{packageAuthors}}</authors>
+        <owners>{{packageAuthors}}</owners>
+        <licenseUrl>{{licenseUrl}}</licenseUrl>
+        <!--
+        <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
+        <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
+        -->
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</description>
+        <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
+        <copyright>{{packageCopyright}}</copyright>
+        <tags>{{packageName}}</tags>
+    </metadata>
 </package>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
@@ -1,7 +1,8 @@
 <Project Sdk="{{projectSdk}}">
   <PropertyGroup>
-    <Description>{{packageName}}</Description>
-    <Copyright>{{packageName}}</Copyright>
+    <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description>
+    <Copyright>{{packageCopyright}}</Copyright>
+    <Authors>{{packageAuthors}}</Authors>
     <TargetFramework>{{targetFramework}}</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>

diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.nuspec.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.nuspec.mustache
@@ -12,7 +12,7 @@
     <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
     -->
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>{{packageName}}</description>
+    <description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</description>
     <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
     <copyright>{{packageCopyright}}</copyright>
     <tags>{{packageName}}</tags>

diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <Description>Org.OpenAPITools</Description>
-    <Copyright>Org.OpenAPITools</Copyright>
+    <Description>A library generated from a OpenAPI doc</Description>
+    <Copyright>No Copyright</Copyright>
+    <Authors>OpenAPI</Authors>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>