Skip to content

Commit e4e30bf

Browse files
RicoSuterRicoSuter
committed
Merge remote-tracking branch 'origin/master'
2 parents 0f5a265 + 9310ef3 commit e4e30bf

File tree

16 files changed

+104
-1354
lines changed

16 files changed

+104
-1354
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>14.6.1</VersionPrefix>
3+
<VersionPrefix>14.6.2</VersionPrefix>
44

55
<Authors>Rico Suter</Authors>
66
<Copyright>Copyright © Rico Suter, 2025</Copyright>

‎Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<PackageVersion Include="MyToolkit.Extended" Version="2.5.16" />
2424
<PackageVersion Include="Namotion.Reflection" Version="3.4.3" />
2525
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
26-
<PackageVersion Include="NJsonSchema" Version="11.5.1" />
27-
<PackageVersion Include="NJsonSchema.CodeGeneration" Version="11.5.1" />
28-
<PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.5.1" />
29-
<PackageVersion Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.5.1" />
30-
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.5.1" />
31-
<PackageVersion Include="NJsonSchema.Yaml" Version="11.5.1" />
26+
<PackageVersion Include="NJsonSchema" Version="11.5.2" />
27+
<PackageVersion Include="NJsonSchema.CodeGeneration" Version="11.5.2" />
28+
<PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.5.2" />
29+
<PackageVersion Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.5.2" />
30+
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.5.2" />
31+
<PackageVersion Include="NJsonSchema.Yaml" Version="11.5.2" />
3232
<PackageVersion Include="System.Runtime.Loader" Version="4.0.0" />
3333
<PackageVersion Include="Verify.XunitV3" Version="30.5.0" />
3434
<PackageVersion Include="xunit.v3" Version="3.0.0" />
@@ -48,7 +48,7 @@
4848
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
4949
</ItemGroup>
5050
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
51-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.1.25451.107" />
52-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
51+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-rc.2.25502.107" />
52+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.2.25502.107" />
5353
</ItemGroup>
5454
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25451.107",
3+
"version": "10.0.0-rc.2.25502.107",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
66
}

‎src/NSwag.Commands/Commands/CodeGeneration/JsonSchemaToCSharpCommand.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public bool GenerateNativeRecords
141141
set => Settings.GenerateNativeRecords = value;
142142
}
143143

144-
[Argument(Name = "JsonLibrary", IsRequired = false, Description = "The CSharp JSON library, 'NewtonsoftJson' or 'SystemTextJson' (default: 'NewtonsoftJson', 'SystemTextJson' is experimental).")]
144+
[Argument(Name = "JsonLibrary", IsRequired = false, Description = "The CSharp JSON library, 'NewtonsoftJson' or 'SystemTextJson' (default: 'NewtonsoftJson').")]
145145
public CSharpJsonLibrary JsonLibrary
146146
{
147147
get => Settings.JsonLibrary;
@@ -155,6 +155,13 @@ public CSharpJsonPolymorphicSerializationStyle JsonPolymorphicSerializationStyle
155155
set => Settings.JsonPolymorphicSerializationStyle = value;
156156
}
157157

158+
[Argument(Name = "JsonLibraryVersion", IsRequired = false, Description = "The CSharp JSON library version to use (applies only to System.Text.Json, default: 8.0).")]
159+
public decimal JsonLibraryVersion
160+
{
161+
get => Settings.JsonLibraryVersion;
162+
set => Settings.JsonLibraryVersion = value;
163+
}
164+
158165
[Argument(Name = "GenerateDefaultValues", IsRequired = false, Description = "Specifies whether to generate default values for properties (may generate CSharp 6 code, default: true).")]
159166
public bool GenerateDefaultValues
160167
{

‎src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpClientCommand.cs‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -192,50 +192,27 @@ public string TypeAccessModifier
192192
}
193193
}
194194

195-
[Argument(Name = "PropertySetterAccessModifier", IsRequired = false, Description = "The access modifier of property setters (default: '').")]
196-
public string PropertySetterAccessModifier
197-
{
198-
get => Settings.CSharpGeneratorSettings.PropertySetterAccessModifier;
199-
set => Settings.CSharpGeneratorSettings.PropertySetterAccessModifier = value;
200-
}
201-
202-
[Argument(Name = "GenerateNativeRecords", IsRequired = false, Description = "Generate C# 9.0 record types instead of record-like classes (default: false).")]
203-
public bool GenerateNativeRecords
204-
{
205-
get => Settings.CSharpGeneratorSettings.GenerateNativeRecords;
206-
set => Settings.CSharpGeneratorSettings.GenerateNativeRecords = value;
207-
}
208-
209-
210-
[Argument(Name = nameof(UseRequiredKeyword), IsRequired = false,
211-
Description = "Indicate whether the C# 11 'required' keyword should be used for required properties (default: false).")]
212-
public bool UseRequiredKeyword
213-
{
214-
get => Settings.CSharpGeneratorSettings.UseRequiredKeyword;
215-
set => Settings.CSharpGeneratorSettings.UseRequiredKeyword = value;
216-
}
217-
218195
[Argument(Name = "GenerateContractsOutput", IsRequired = false,
219-
Description = "Specifies whether to generate contracts output (interface and models in a separate file set with the ContractsOutput parameter).")]
196+
Description = "Specifies whether to generate contracts output (interface and models in a separate file set with the ContractsOutput parameter).")]
220197
public bool GenerateContractsOutput { get; set; }
221198

222199
[Argument(Name = "ContractsNamespace", IsRequired = false, Description = "The contracts .NET namespace.")]
223200
public string ContractsNamespace { get; set; }
224201

225202
[Argument(Name = "ContractsOutput", IsRequired = false,
226-
Description = "The contracts output file path (optional, if no path is set then a single file with the implementation and contracts is generated).")]
203+
Description = "The contracts output file path (optional, if no path is set then a single file with the implementation and contracts is generated).")]
227204
public string ContractsOutputFilePath { get; set; }
228205

229206
[Argument(Name = "ParameterDateTimeFormat", IsRequired = false,
230-
Description = "Specifies the format for DateTime type method parameters (default: s).")]
207+
Description = "Specifies the format for DateTime type method parameters (default: s).")]
231208
public string ParameterDateTimeFormat
232209
{
233210
get => Settings.ParameterDateTimeFormat;
234211
set => Settings.ParameterDateTimeFormat = value;
235212
}
236213

237214
[Argument(Name = "ParameterDateFormat", IsRequired = false,
238-
Description = "Specifies the format for Date type method parameters (default: yyyy-MM-dd).")]
215+
Description = "Specifies the format for Date type method parameters (default: yyyy-MM-dd).")]
239216
public string ParameterDateFormat
240217
{
241218
get => Settings.ParameterDateFormat;

‎src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpCommandBase.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,13 @@ public CSharpJsonPolymorphicSerializationStyle JsonPolymorphicSerializationStyle
266266
set => Settings.CSharpGeneratorSettings.JsonPolymorphicSerializationStyle = value;
267267
}
268268

269+
[Argument(Name = "JsonLibraryVersion", IsRequired = false, Description = "The CSharp JSON library version to use (applies only to System.Text.Json, default: 8.0).")]
270+
public decimal JsonLibraryVersion
271+
{
272+
get => Settings.CSharpGeneratorSettings.JsonLibraryVersion;
273+
set => Settings.CSharpGeneratorSettings.JsonLibraryVersion = value;
274+
}
275+
269276
[Argument(Name = "GenerateDefaultValues", IsRequired = false, Description = "Specifies whether to generate default values for properties (may generate CSharp 6 code, default: true).")]
270277
public bool GenerateDefaultValues
271278
{
@@ -353,6 +360,35 @@ public bool InlineNamedAny
353360
set => Settings.CSharpGeneratorSettings.InlineNamedAny = value;
354361
}
355362

363+
[Argument(Name = "PropertySetterAccessModifier", IsRequired = false, Description = "The access modifier of property setters (default: '').")]
364+
public string PropertySetterAccessModifier
365+
{
366+
get => Settings.CSharpGeneratorSettings.PropertySetterAccessModifier;
367+
set => Settings.CSharpGeneratorSettings.PropertySetterAccessModifier = value;
368+
}
369+
370+
[Argument(Name = "GenerateNativeRecords", IsRequired = false, Description = "Generate C# 9.0 record types instead of record-like classes (default: false).")]
371+
public bool GenerateNativeRecords
372+
{
373+
get => Settings.CSharpGeneratorSettings.GenerateNativeRecords;
374+
set => Settings.CSharpGeneratorSettings.GenerateNativeRecords = value;
375+
}
376+
377+
[Argument(Name = nameof(UseRequiredKeyword), IsRequired = false,
378+
Description = "Indicate whether the C# 11 'required' keyword should be used for required properties (default: false).")]
379+
public bool UseRequiredKeyword
380+
{
381+
get => Settings.CSharpGeneratorSettings.UseRequiredKeyword;
382+
set => Settings.CSharpGeneratorSettings.UseRequiredKeyword = value;
383+
}
384+
385+
[Argument(Name = "WriteAccessor", IsRequired = false, Description = "Gets the read accessor of properties ('set' | 'init', default: 'set').")]
386+
public string WriteAccessor
387+
{
388+
get => Settings.CSharpGeneratorSettings.WriteAccessor;
389+
set => Settings.CSharpGeneratorSettings.WriteAccessor = value;
390+
}
391+
356392
[Argument(Name = "GenerateDtoTypes", IsRequired = false, Description = "Specifies whether to generate DTO classes.")]
357393
public bool GenerateDtoTypes
358394
{

0 commit comments

Comments
 (0)