loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add version to csproj, fix target framework, update samples (#8956)

Browse Source
This commit is contained in:
Blackclaws 2021-03-12 03:34:06 +01:00 committed by GitHub
parent ff55bf11e2
commit e16ee8c6b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
View File

@ -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 "); LOGGER.warn("ASP.NET core version is " + aspnetCoreVersion.getOptValue() + " so changing to use frameworkReference instead of packageReference ");
useFrameworkReference = true; useFrameworkReference = true;
additionalProperties.put(USE_FRAMEWORK_REFERENCE, useFrameworkReference); 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 } 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 "); LOGGER.warn("ASP.NET core version is " + aspnetCoreVersion.getOptValue() + " so changing to use frameworkReference instead of packageReference ");
useFrameworkReference = true; useFrameworkReference = true;

1
modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache vendored
View File

@ -3,6 +3,7 @@
<Description>{{packageName}}</Description> <Description>{{packageName}}</Description>
<Copyright>{{packageName}}</Copyright> <Copyright>{{packageName}}</Copyright>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<Version>{{packageVersion}}</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>{{packageName}}</AssemblyName> <AssemblyName>{{packageName}}</AssemblyName>

1
modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache vendored
View File

@ -5,6 +5,7 @@
<TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework> <TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<Version>{{packageVersion}}</Version>
{{#isLibrary}} {{#isLibrary}}
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
{{/isLibrary}} {{/isLibrary}}

1
modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache vendored
View File

@ -5,6 +5,7 @@
<TargetFramework>{{targetFramework}}</TargetFramework> <TargetFramework>{{targetFramework}}</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<Version>{{packageVersion}}</Version>
{{#isLibrary}} {{#isLibrary}}
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
{{/isLibrary}} {{/isLibrary}}

2
samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
View File

@ -5,6 +5,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<Version>1.0.0</Version>
<AssemblyName>Org.OpenAPITools</AssemblyName> <AssemblyName>Org.OpenAPITools</AssemblyName>
<PackageId>Org.OpenAPITools</PackageId> <PackageId>Org.OpenAPITools</PackageId>
<UserSecretsId>4bc22b76-ee61-45c3-aae6-47cee9badaa0</UserSecretsId> <UserSecretsId>4bc22b76-ee61-45c3-aae6-47cee9badaa0</UserSecretsId>
@ -17,6 +18,7 @@
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/> <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />--> <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />-->

2
samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
View File

@ -5,6 +5,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<Version>1.0.0</Version>
<AssemblyName>Org.OpenAPITools</AssemblyName> <AssemblyName>Org.OpenAPITools</AssemblyName>
<PackageId>Org.OpenAPITools</PackageId> <PackageId>Org.OpenAPITools</PackageId>
<UserSecretsId>4ddd97dd-77ed-459e-8cd0-dcb2f9e59a70</UserSecretsId> <UserSecretsId>4ddd97dd-77ed-459e-8cd0-dcb2f9e59a70</UserSecretsId>
@ -17,6 +18,7 @@
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/> <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />--> <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />-->

1
samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
View File

@ -5,6 +5,7 @@
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<Version>1.0.0</Version>
<AssemblyName>Org.OpenAPITools</AssemblyName> <AssemblyName>Org.OpenAPITools</AssemblyName>
<PackageId>Org.OpenAPITools</PackageId> <PackageId>Org.OpenAPITools</PackageId>
<UserSecretsId>962d9e18-9555-468a-ab9d-0fb03e258878</UserSecretsId> <UserSecretsId>962d9e18-9555-468a-ab9d-0fb03e258878</UserSecretsId>

1
samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
View File

@ -5,6 +5,7 @@
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<Version>1.0.0</Version>
<AssemblyName>Org.OpenAPITools</AssemblyName> <AssemblyName>Org.OpenAPITools</AssemblyName>
<PackageId>Org.OpenAPITools</PackageId> <PackageId>Org.OpenAPITools</PackageId>
</PropertyGroup> </PropertyGroup>