Skip to content

Upgrade to NJsonSchema v11.6.1 (NSwag v14.7.1) #5367

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
RicoSuter merged 4 commits into from
Apr 20, 2026
Merged

Upgrade to NJsonSchema v11.6.1 (NSwag v14.7.1) #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85994a8
Upgrade to NJsonSchema v11.6.1 (NSwag v14.7.1)
RicoSuter Apr 20, 2026
45cc2fc
Fix version prefix typo and add support for .NET 10.0; pin transitive…
RicoSuter Apr 20, 2026
b7a65aa
Update required property handling in JSON schema generator tests to a…
RicoSuter Apr 20, 2026
caf0d05
Update copyright year to 2026 in project files
RicoSuter Apr 20, 2026
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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<VersionPrefix>14.7.0</VersionPrefix>
<VersionPrefix>14.7.1</VersionPrefix>

<Authors>Rico Suter</Authors>
<Copyright>Copyright © Rico Suter, 2025</Copyright>
<Copyright>Copyright © Rico Suter, 2026</Copyright>

<Description>NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<PackageVersion Include="MyToolkit.Extended" Version="2.5.16" />
<PackageVersion Include="Namotion.Reflection" Version="3.5.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NJsonSchema" Version="11.6.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration" Version="11.6.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.6.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.6.0" />
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.6.0" />
<PackageVersion Include="NJsonSchema.Yaml" Version="11.6.0" />
<PackageVersion Include="NJsonSchema" Version="11.6.1" />
<PackageVersion Include="NJsonSchema.CodeGeneration" Version="11.6.1" />
<PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.6.1" />
<PackageVersion Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.6.1" />
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.6.1" />
<PackageVersion Include="NJsonSchema.Yaml" Version="11.6.1" />
<PackageVersion Include="System.Runtime.Loader" Version="4.0.0" />
<PackageVersion Include="Verify.XunitV3" Version="30.5.0" />
<PackageVersion Include="xunit.v3" Version="3.0.0" />
Expand Down
3 changes: 3 additions & 0 deletions build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="10.1.0" />
<!-- Pin transitive dependencies of Nuke.Common to patched versions (CVE fixes). -->
<PackageReference Include="NuGet.Packaging" Version="6.14.3" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
Condition="'$(TargetFramework)' == 'net8.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net80)/dotnet-nswag.dll"</_NSwagCommand>
<_NSwagCommand
Condition="'$(TargetFramework)' == 'net9.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net90)/dotnet-nswag.dll"</_NSwagCommand>
<_NSwagCommand
Condition="'$(TargetFramework)' == 'net10.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net100)/dotnet-nswag.dll"</_NSwagCommand>
</PropertyGroup>

<!-- OpenApiReference support for C# -->
Expand Down
3 changes: 1 addition & 2 deletions ...led_properties_with_required_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...es_with_required_keyword_and_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...abled_properties_with_required_keyword_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...led_properties_with_required_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public required int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public required string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...es_with_required_keyword_and_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public required int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public required string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...led_properties_with_required_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...es_with_required_keyword_and_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...abled_properties_with_required_keyword_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...led_properties_with_required_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public required int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public required string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
3 changes: 1 addition & 2 deletions ...es_with_required_keyword_and_attribute_should_generate_with_required_keyword.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ namespace MyNamespace
[Newtonsoft.Json.JsonProperty("RequiredByAttribute", Required = Newtonsoft.Json.Required.Always)]
public required int RequiredByAttribute { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.Always)]
[System.ComponentModel.DataAnnotations.Required]
[Newtonsoft.Json.JsonProperty("RequiredByC11Keyword", Required = Newtonsoft.Json.Required.AllowNull)]
public required string RequiredByC11Keyword { get; set; }

[Newtonsoft.Json.JsonProperty("RequiredByAttributeAndC11Keyword", Required = Newtonsoft.Json.Required.Always)]
Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.MSBuild/NSwag.MSBuild.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<iconUrl>https://raw.githubusercontent.com/RicoSuter/NSwag/master/assets/NuGetIcon.png</iconUrl>
<description>NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript</description>
<tags>OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet</tags>
<copyright>Copyright © Rico Suter, 2025</copyright>
<copyright>Copyright © Rico Suter, 2026</copyright>
<repository type="git" url="https://github.com/RicoSuter/NSwag.git"/>
<developmentDependency>true</developmentDependency>
<dependencies />
Expand Down
Loading