From e16ee8c6b8b4f48453b611d8161ba975dc077a2e Mon Sep 17 00:00:00 2001
From: Blackclaws <felix.winterhalter@fau.de>
Date: Fri, 12 Mar 2021 03:34:06 +0100
Subject: [PATCH] Add version to csproj, fix target framework, update samples
 (#8956)

---
 .../openapitools/codegen/languages/AspNetCoreServerCodegen.java | 2 +-
 .../src/main/resources/aspnetcore/2.0/Project.csproj.mustache   | 1 +
 .../src/main/resources/aspnetcore/2.1/Project.csproj.mustache   | 1 +
 .../src/main/resources/aspnetcore/3.0/Project.csproj.mustache   | 1 +
 .../aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj | 2 ++
 .../aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj | 2 ++
 .../aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj | 1 +
 .../aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj     | 1 +
 8 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
index 6e95e56dc2c..09460b3a7ff 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
@@ -596,7 +596,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
             LOGGER.warn("ASP.NET core version is " + aspnetCoreVersion.getOptValue() + " so changing to use frameworkReference instead of packageReference ");
             useFrameworkReference = true;
             additionalProperties.put(USE_FRAMEWORK_REFERENCE, useFrameworkReference);
-            additionalProperties.put(TARGET_FRAMEWORK, "netcoreapp" + aspnetCoreVersion);
+            additionalProperties.put(TARGET_FRAMEWORK, "netcoreapp" + aspnetCoreVersion.getOptValue());
         } else if (aspnetCoreVersion.getOptValue().startsWith("5.")) {// default, do nothing
             LOGGER.warn("ASP.NET core version is " + aspnetCoreVersion.getOptValue() + " so changing to use frameworkReference instead of packageReference ");
             useFrameworkReference = true;
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
index b4e85fe168f..184fe7dcff7 100644
--- 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
@@ -3,6 +3,7 @@
     <Description>{{packageName}}</Description>
     <Copyright>{{packageName}}</Copyright>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <Version>{{packageVersion}}</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>{{packageName}}</AssemblyName>
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
index 963dad63749..bb25404ee10 100644
--- 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
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>{{packageVersion}}</Version>
 {{#isLibrary}}
     <OutputType>Library</OutputType>
 {{/isLibrary}}
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
index eaf943b9525..69d7cca51d2 100644
--- 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
@@ -5,6 +5,7 @@
     <TargetFramework>{{targetFramework}}</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>{{packageVersion}}</Version>
 {{#isLibrary}}
     <OutputType>Library</OutputType>
 {{/isLibrary}}
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index abb035c92cb..41aaf28f1c3 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
     <UserSecretsId>4bc22b76-ee61-45c3-aae6-47cee9badaa0</UserSecretsId>
@@ -17,6 +18,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
+    <PackageReference Include="JsonSubTypes" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>
     <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />-->
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 7668438e876..b366d930680 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
     <UserSecretsId>4ddd97dd-77ed-459e-8cd0-dcb2f9e59a70</UserSecretsId>
@@ -17,6 +18,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
+    <PackageReference Include="JsonSubTypes" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>
     <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />-->
diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 49e482baaee..18d7e89c40d 100644
--- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
     <UserSecretsId>962d9e18-9555-468a-ab9d-0fb03e258878</UserSecretsId>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 63ecd64a450..0c249b1cb98 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
   </PropertyGroup>