Skip to content

Commit e7ac57d

Browse files
UrganotUrganot
authored
[ASPNETCORE] Add support for central package version management #20192 (#20403)
* Fixed default value for usePackageVersions * Regenerated docs
1 parent 9a2f155 commit e7ac57d

File tree

13 files changed

+73
-64
lines changed

13 files changed

+73
-64
lines changed

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetServerCodegen.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public class AspNetServerCodegen extends AbstractCSharpCodegen {
9898
private boolean useNewtonsoft = true;
9999
private boolean useDefaultRouting = true;
100100
private String newtonsoftVersion = "3.0.0";
101+
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");
101102

102103
public AspNetServerCodegen() {
103104
super();
@@ -310,7 +311,10 @@ public AspNetServerCodegen() {
310311
modelClassModifier.setOptValue(modelClassModifier.getDefault());
311312
addOption(modelClassModifier.getOpt(), modelClassModifier.getDescription(), modelClassModifier.getOptValue());
312313

313-
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");
314+
addCentralizedPackageManagementOption();
315+
}
316+
317+
private void addCentralizedPackageManagementOption(){
314318
Map<String, String> centralizedPackageVersionManagementOptions = new HashMap<>();
315319
centralizedPackageVersionManagementOptions.put(DEFAULT, "Property in project won't be used");
316320
centralizedPackageVersionManagementOptions.put(ENABLE, "Centralized package version management will be used");
@@ -481,8 +485,13 @@ public void processOpts() {
481485
this.setTypeMapping();
482486

483487

488+
setCentralizedPackageManagementOption();
489+
}
490+
491+
private void setCentralizedPackageManagementOption() {
492+
additionalProperties.put(USE_PACKAGE_VERSIONS, true);
493+
484494
if (additionalProperties.containsKey(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT)) {
485-
additionalProperties.put(USE_PACKAGE_VERSIONS, true);
486495
switch ((String) additionalProperties.get(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT)) {
487496
case DEFAULT:
488497
additionalProperties.remove(CENTRALIZED_PACKAGE_VERSION_MANAGEMENT);

‎samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<DockerfileContext>..\..</DockerfileContext>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
21-
<PackageReference Include="JsonSubTypes" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
21+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

‎samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<DockerfileContext>..\..</DockerfileContext>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
19-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
22-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
23-
<PackageReference Include="JsonSubTypes" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
19+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
22+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
23+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

‎samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<DockerfileContext>..\..</DockerfileContext>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
22-
<PackageReference Include="JsonSubTypes" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
22+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

‎samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="../Org.OpenAPITools.Models/Org.OpenAPITools.Models.csproj"/>
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
22-
<PackageReference Include="JsonSubTypes" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
22+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

‎samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<FrameworkReference Include="Microsoft.AspNetCore.App" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
21-
<PackageReference Include="JsonSubTypes" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
21+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

‎samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<DockerfileContext>..\..</DockerfileContext>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
22-
<PackageReference Include="JsonSubTypes" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
22+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />-->

‎samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<DockerfileContext>..\..</DockerfileContext>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
21-
<PackageReference Include="JsonSubTypes" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
21+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

‎samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<DockerfileContext>..\..</DockerfileContext>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
19-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
22-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
23-
<PackageReference Include="JsonSubTypes" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
19+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
22+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
23+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

‎samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<DockerfileContext>..\..</DockerfileContext>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
22-
<PackageReference Include="JsonSubTypes" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
22+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

‎samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="../Org.OpenAPITools.Models/Org.OpenAPITools.Models.csproj"/>
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
22-
<PackageReference Include="JsonSubTypes" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
22+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

‎samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<FrameworkReference Include="Microsoft.AspNetCore.App" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
21-
<PackageReference Include="JsonSubTypes" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
21+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

‎samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<DockerfileContext>..\..</DockerfileContext>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
18-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
19-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
22-
<PackageReference Include="JsonSubTypes" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
19+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
22+
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />-->

0 commit comments

Comments
 (0)