Skip to content

Feature/support array of objects #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 5, 2025
Merged

Feature/support array of objects #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2b229c
chore: nuget updates
davidkallesen Sep 3, 2025
d453622
feat: improve ContentGeneratorServerConfigureSwaggerDocOptions for de…
davidkallesen Sep 4, 2025
f8ea65e
chore: fix some null checks, use OpenApiDataTypeConstants.Object inst…
davidkallesen Sep 4, 2025
5eb907a
feat: improve OpenApiAnyExtensions to handle more types
davidkallesen Sep 4, 2025
ebee5eb
chore: nuget updates
davidkallesen Sep 4, 2025
3ed810a
chore: fix some SA-rules
davidkallesen Sep 5, 2025
8b5fe7b
build: migrate project sln to slnx
davidkallesen Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pre-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: dotnet restore

- name: 🛠️ Build with dotnet
run: dotnet build Atc.Rest.Api.Generator.sln
run: dotnet build Atc.Rest.Api.Generator.slnx

- name: ⬇️🌎 Download Swagger Petstore v3 spec
run: curl -O https://petstore3.swagger.io/api/v3/openapi.yaml
Expand Down
156 changes: 0 additions & 156 deletions Atc.Rest.Api.Generator.sln
View file
Open in desktop

This file was deleted.

27 changes: 27 additions & 0 deletions Atc.Rest.Api.Generator.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Solution>
<Folder Name="/Docs/">
<File Path="README.md" />
</Folder>
<Folder Name="/Src/">
<Project Path="src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj" />
<Project Path="src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj" />
</Folder>
<Folder Name="/Tests/">
<Project Path="test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj" />
<Project Path="test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj" />
<Project Path="test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj" />
<Project Path="test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj" />
<Project Path="test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj" />
<Project Path="test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj" />
<Project Path="test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj" />
</Folder>
</Solution>
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<ItemGroup Label="Code Analyzers">
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.188" PrivateAssets="All" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.215" PrivateAssets="All" />
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445" PrivateAssets="All" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848" PrivateAssets="All" />
</ItemGroup>

</Project>
10 changes: 3 additions & 7 deletions src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc" Version="2.0.552" />
<PackageReference Include="Atc.CodeDocumentation" Version="2.0.552" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="SonarAnalyzer.CSharp" Version="10.7.0.110445" />
<PackageReference Include="Atc" Version="2.0.562" />
<PackageReference Include="Atc.CodeDocumentation" Version="2.0.562" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Atc.Rest.ApiGenerator.CLI/ApiOptionsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static async Task<ApiOptions> CreateDefault(
return new ApiOptions();
}

var options = await FileHelper<ApiOptions>.ReadJsonFileAndDeserializeAsync(fileInfo);
var options = await FileHelper<ApiOptions>.ReadJsonFileToModelAsync(fileInfo);
return options ?? new ApiOptions();
}

Expand All @@ -57,7 +57,7 @@ public static async Task<ApiOptions> CreateDefault(
var fileInfo = GetOptionsFile(optionsPath);
if (fileInfo.Exists)
{
options = await FileHelper<ApiOptions>.ReadJsonFileAndDeserializeAsync(fileInfo) ?? new ApiOptions();
options = await FileHelper<ApiOptions>.ReadJsonFileToModelAsync(fileInfo) ?? new ApiOptions();
}

await FileHelper<ApiOptions>.WriteModelToJsonFileAsync(fileInfo, options);
Expand All @@ -77,7 +77,7 @@ public static async Task<ApiOptions> CreateDefault(

try
{
var options = await FileHelper<ApiOptions>.ReadJsonFileAndDeserializeAsync(fileInfo);
var options = await FileHelper<ApiOptions>.ReadJsonFileToModelAsync(fileInfo);
return options is null
? (false, "File is invalid")
: (true, string.Empty);
Expand Down
6 changes: 3 additions & 3 deletions src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc" Version="2.0.552" />
<PackageReference Include="Atc.Console.Spectre" Version="2.0.552" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
<PackageReference Include="Atc" Version="2.0.562" />
<PackageReference Include="Atc.Console.Spectre" Version="2.0.562" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.23" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.25" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc" Version="2.0.552" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
<PackageReference Include="Atc" Version="2.0.562" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
</ItemGroup>

</Project>
8 changes: 2 additions & 6 deletions src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc" Version="2.0.552" />
<PackageReference Include="Atc.CodeDocumentation" Version="2.0.552" />
<PackageReference Include="Atc" Version="2.0.562" />
<PackageReference Include="Atc.CodeDocumentation" Version="2.0.562" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Atc.CodeGeneration.CSharp\Atc.CodeGeneration.CSharp.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="SonarAnalyzer.CSharp" Version="10.7.0.110445" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc" Version="2.0.552" />
<PackageReference Include="Atc" Version="2.0.562" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc" Version="2.0.552" />
<PackageReference Include="Atc.Rest" Version="2.0.552" />
<PackageReference Include="Atc" Version="2.0.562" />
<PackageReference Include="Atc.Rest" Version="2.0.562" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading