[ASPNETCORE] Add support for central package version management #20192 (

#20403) * Fixed default value for usePackageVersions * Regenerated docs
OpenAPITools · Jan 6, 2025 · e7ac57d · e7ac57d
1 parent 9a2f155
commit e7ac57d
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 64 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java
@@ -98,6 +98,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
     private boolean useNewtonsoft = true;
     private boolean useDefaultRouting = true;
     private String newtonsoftVersion = "3.0.0";
+    private CliOption centralizedPackageVersionManagement = new CliOption(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT, "Option to control the usage of centralized package version management. https://devblogs.microsoft.com/nuget/introducing-central-package-management/#disabling-central-package-management");
 
     public AspNetServerCodegen() {
         super();
@@ -310,7 +311,10 @@ public AspNetServerCodegen() {
         modelClassModifier.setOptValue(modelClassModifier.getDefault());
         addOption(modelClassModifier.getOpt(), modelClassModifier.getDescription(), modelClassModifier.getOptValue());
 
-        CliOption centralizedPackageVersionManagement = new CliOption(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT, "Option to control the usage of centralized package version management. https://devblogs.microsoft.com/nuget/introducing-central-package-management/#disabling-central-package-management");
+        addCentralizedPackageManagementOption();
+    }
+
+    private void addCentralizedPackageManagementOption(){
         Map<String, String> centralizedPackageVersionManagementOptions = new HashMap<>();
         centralizedPackageVersionManagementOptions.put(DEFAULT, "Property in project won't be used");
         centralizedPackageVersionManagementOptions.put(ENABLE, "Centralized package version management will be used");
@@ -481,8 +485,13 @@ public void processOpts() {
         this.setTypeMapping();
 
 
+        setCentralizedPackageManagementOption();
+    }
+
+    private void setCentralizedPackageManagementOption() {
+        additionalProperties.put(USE_PACKAGE_VERSIONS, true);
+
         if (additionalProperties.containsKey(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT)) {
-            additionalProperties.put(USE_PACKAGE_VERSIONS, true);
             switch ((String) additionalProperties.get(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT)) {
                 case DEFAULT:
                     additionalProperties.remove(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT);

diff --git a/...rver/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...rver/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -14,11 +14,11 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

diff --git a/...tstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...tstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -15,12 +15,12 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

diff --git a/...es/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...es/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -14,12 +14,12 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

diff --git a/...erver/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...erver/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -15,11 +15,11 @@
     </PropertyGroup>
     <ItemGroup>
             <ProjectReference Include="../Org.OpenAPITools.Models/Org.OpenAPITools.Models.csproj"/>
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

diff --git a/...erver/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...erver/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -16,9 +16,9 @@
     </PropertyGroup>
     <ItemGroup>
                 <FrameworkReference Include="Microsoft.AspNetCore.App" />
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-                <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+                <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -14,12 +14,12 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

diff --git a/...rver/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...rver/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -14,11 +14,11 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

diff --git a/...tstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...tstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -15,12 +15,12 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

diff --git a/...es/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...es/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -14,12 +14,12 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

diff --git a/...erver/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...erver/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -15,11 +15,11 @@
     </PropertyGroup>
     <ItemGroup>
             <ProjectReference Include="../Org.OpenAPITools.Models/Org.OpenAPITools.Models.csproj"/>
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

diff --git a/...erver/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/...erver/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -16,9 +16,9 @@
     </PropertyGroup>
     <ItemGroup>
                 <FrameworkReference Include="Microsoft.AspNetCore.App" />
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-                <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+                <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -14,12 +14,12 @@
         <DockerfileContext>..\..</DockerfileContext>
     </PropertyGroup>
     <ItemGroup>
-            <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
-                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
-                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
-            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
-        <PackageReference Include="JsonSubTypes" />
+            <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+            <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+                <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+                <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+            <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+        <PackageReference Include="JsonSubTypes" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->