diff --git a/samples/WithoutMiddleware/Sample.AspNetCore20/nswag_project_swagger.json b/samples/WithoutMiddleware/Sample.AspNetCore20/nswag_project_swagger.json index e5fa2ce4e5..79bd912b12 100644 --- a/samples/WithoutMiddleware/Sample.AspNetCore20/nswag_project_swagger.json +++ b/samples/WithoutMiddleware/Sample.AspNetCore20/nswag_project_swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v10.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v10.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_assembly_swagger.json b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_assembly_swagger.json index 7b55307139..8847fc56b3 100644 --- a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_assembly_swagger.json +++ b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_assembly_swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_project_swagger.json b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_project_swagger.json index 7b55307139..8847fc56b3 100644 --- a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_project_swagger.json +++ b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_project_swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_reflection_swagger.json b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_reflection_swagger.json index db30b812d1..de61981e7f 100644 --- a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_reflection_swagger.json +++ b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_reflection_swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj index 3e5ea594e2..e0af0ca605 100644 --- a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj +++ b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj index a0e6e1f356..cf06b8ea99 100644 --- a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj +++ b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj index 4f7c0006e1..0296f76485 100644 --- a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj +++ b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj @@ -24,7 +24,7 @@ TRACE;RELEASE;FullNet;NET451 - + diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj index 244f4698aa..a447a24bb2 100644 --- a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj +++ b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj @@ -53,6 +53,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.CodeGeneration.TypeScript.Tests/AngularTests.cs b/src/NSwag.CodeGeneration.TypeScript.Tests/AngularTests.cs index 06db8256a8..1b959d64a5 100644 --- a/src/NSwag.CodeGeneration.TypeScript.Tests/AngularTests.cs +++ b/src/NSwag.CodeGeneration.TypeScript.Tests/AngularTests.cs @@ -61,7 +61,7 @@ public class GenericRequest2 : GenericRequestBase } - public class UrlEncodedRequestConsumingController: Controller + public class UrlEncodedRequestConsumingController : Controller { [HttpPost] [Consumes("application/x-www-form-urlencoded")] @@ -169,9 +169,9 @@ public async Task When_generic_request() //// Assert Assert.Contains("this.request = new RequestBodyBase()", code); - Assert.Contains("this.request = new RequestBody()", code); + Assert.Contains("this.request = new RequestBody()", code); } - + [Fact] public async Task When_consumes_is_url_encoded_then_construct_url_encoded_request() { diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj index a06dd689dd..97264cef19 100644 --- a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj +++ b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj @@ -49,6 +49,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj index 297b0e18d2..8b4ad2b1d0 100644 --- a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj +++ b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/src/NSwag.Commands/Commands/CodeGeneration/JsonSchemaToCSharpCommand.cs b/src/NSwag.Commands/Commands/CodeGeneration/JsonSchemaToCSharpCommand.cs index 9224c25437..85d1f88e5f 100644 --- a/src/NSwag.Commands/Commands/CodeGeneration/JsonSchemaToCSharpCommand.cs +++ b/src/NSwag.Commands/Commands/CodeGeneration/JsonSchemaToCSharpCommand.cs @@ -46,6 +46,13 @@ public bool RequiredPropertiesMustBeDefined set { Settings.RequiredPropertiesMustBeDefined = value; } } + [Argument(Name = "AnyType", IsRequired = false, Description = "The any .NET type (default: 'object').")] + public string AnyType + { + get { return Settings.AnyType; } + set { Settings.AnyType = value; } + } + [Argument(Name = "DateTimeType", IsRequired = false, Description = "The date time .NET type (default: 'DateTime').")] public string DateTimeType { diff --git a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpCommandBase.cs b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpCommandBase.cs index ec92a03cf8..7cff2ad69c 100644 --- a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpCommandBase.cs +++ b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToCSharpCommandBase.cs @@ -161,6 +161,13 @@ public string[] JsonConverters set { Settings.CSharpGeneratorSettings.JsonConverters = value; } } + [Argument(Name = "AnyType", IsRequired = false, Description = "The any .NET type (default: 'object').")] + public string AnyType + { + get { return Settings.CSharpGeneratorSettings.AnyType; } + set { Settings.CSharpGeneratorSettings.AnyType = value; } + } + [Argument(Name = "DateTimeType", IsRequired = false, Description = "The date time .NET type (default: 'DateTimeOffset').")] public string DateTimeType { diff --git a/src/NSwag.Commands/NSwag.Commands.csproj b/src/NSwag.Commands/NSwag.Commands.csproj index 17f4071ec0..1427ec6732 100644 --- a/src/NSwag.Commands/NSwag.Commands.csproj +++ b/src/NSwag.Commands/NSwag.Commands.csproj @@ -66,11 +66,11 @@ - - - - - + + + + + diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj index 3519f9c7f3..c01fa680a5 100644 --- a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj +++ b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj @@ -16,7 +16,7 @@ NSwag - + diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj index dbada19f23..d6416a51aa 100644 --- a/src/NSwag.Core/NSwag.Core.csproj +++ b/src/NSwag.Core/NSwag.Core.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj index 22418fe594..9d26ce5445 100644 --- a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj +++ b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj @@ -70,8 +70,8 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NJsonSchema.10.0.8\lib\net45\NJsonSchema.dll + + ..\packages\NJsonSchema.10.0.11\lib\net45\NJsonSchema.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/NSwag.Demo.Web/packages.config b/src/NSwag.Demo.Web/packages.config index 052913e3e2..24f4586832 100644 --- a/src/NSwag.Demo.Web/packages.config +++ b/src/NSwag.Demo.Web/packages.config @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj index 2313e13732..31800da9be 100644 --- a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj +++ b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj b/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj index 5bba67a803..01b09f82fd 100644 --- a/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj +++ b/src/NSwag.Generation.WebApi.Tests/NSwag.Generation.WebApi.Tests.csproj @@ -53,14 +53,14 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NJsonSchema.10.0.8\lib\net45\NJsonSchema.dll + + ..\packages\NJsonSchema.10.0.11\lib\net45\NJsonSchema.dll - - ..\packages\NJsonSchema.CodeGeneration.10.0.8\lib\net451\NJsonSchema.CodeGeneration.dll + + ..\packages\NJsonSchema.CodeGeneration.10.0.11\lib\net451\NJsonSchema.CodeGeneration.dll - - ..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.8\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll + + ..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.11\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll ..\packages\Swashbuckle.Core.5.5.3\lib\net40\Swashbuckle.Core.dll diff --git a/src/NSwag.Generation.WebApi.Tests/packages.config b/src/NSwag.Generation.WebApi.Tests/packages.config index 467af4e1e0..985a643da4 100644 --- a/src/NSwag.Generation.WebApi.Tests/packages.config +++ b/src/NSwag.Generation.WebApi.Tests/packages.config @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj index c8fc5e151c..4601505cea 100644 --- a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj +++ b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj index f36e856b97..7c416a539f 100644 --- a/src/NSwag.Generation/NSwag.Generation.csproj +++ b/src/NSwag.Generation/NSwag.Generation.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs index 2506abd277..d394fa1688 100644 --- a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs +++ b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -8,7 +8,7 @@ namespace PetStore { #pragma warning disable - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial interface IPetStoreClient { /// Update an existing pet @@ -258,7 +258,7 @@ public partial interface IPetStoreClient } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PetStoreClient : IPetStoreClient { private string _baseUrl = "https://petstore.swagger.io/v2"; @@ -1979,7 +1979,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Order : System.ComponentModel.INotifyPropertyChanged { private long? _id; @@ -2087,7 +2087,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class User : System.ComponentModel.INotifyPropertyChanged { private long? _id; @@ -2224,7 +2224,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Category : System.ComponentModel.INotifyPropertyChanged { private long? _id; @@ -2270,7 +2270,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Tag : System.ComponentModel.INotifyPropertyChanged { private long? _id; @@ -2316,7 +2316,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Pet : System.ComponentModel.INotifyPropertyChanged { private long? _id; @@ -2426,7 +2426,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class ApiResponse : System.ComponentModel.INotifyPropertyChanged { private int? _code; @@ -2487,7 +2487,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum Anonymous { [System.Runtime.Serialization.EnumMember(Value = @"available")] @@ -2501,7 +2501,7 @@ public enum Anonymous } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum OrderStatus { [System.Runtime.Serialization.EnumMember(Value = @"placed")] @@ -2515,7 +2515,7 @@ public enum OrderStatus } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum PetStatus { [System.Runtime.Serialization.EnumMember(Value = @"available")] @@ -2529,7 +2529,7 @@ public enum PetStatus } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -2556,7 +2556,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -2579,7 +2579,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : SwaggerException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.ClientPCL/ServiceClients.cs b/src/NSwag.Integration.ClientPCL/ServiceClients.cs index 878f5bd3b4..6466be5266 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClients.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClients.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -10,7 +10,7 @@ namespace NSwag.Integration.ClientPCL { #pragma warning disable - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClient : ClientBase { private string _baseUrl = "http://localhost:13452"; @@ -902,7 +902,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClient : ClientBase { private string _baseUrl = "http://localhost:13452"; @@ -1870,7 +1870,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] internal class JsonExceptionConverter : Newtonsoft.Json.JsonConverter { private readonly Newtonsoft.Json.Serialization.DefaultContractResolver _defaultContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); diff --git a/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs b/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs index 3a5331f5b3..e4d6f7fbd9 100644 --- a/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs +++ b/src/NSwag.Integration.ClientPCL/ServiceClientsContracts.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -10,7 +10,7 @@ namespace NSwag.Integration.ClientPCL.Contracts - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class GeoPoint { [Newtonsoft.Json.JsonProperty("Latitude", Required = Newtonsoft.Json.Required.Always)] @@ -22,7 +22,7 @@ public partial class GeoPoint } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class GenericRequestOfAddressAndPerson { [Newtonsoft.Json.JsonProperty("Item1", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -34,7 +34,7 @@ public partial class GenericRequestOfAddressAndPerson } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Address { [Newtonsoft.Json.JsonProperty("IsPrimary", Required = Newtonsoft.Json.Required.Always)] @@ -48,7 +48,7 @@ public partial class Address [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "discriminator")] [JsonInheritanceAttribute("Teacher", typeof(Teacher))] - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Person { [Newtonsoft.Json.JsonProperty("Id", Required = Newtonsoft.Json.Required.Always)] @@ -103,7 +103,7 @@ public partial class Person } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum Gender { [System.Runtime.Serialization.EnumMember(Value = @"Male")] @@ -114,7 +114,7 @@ public enum Gender } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum SkillLevel { Low = 0, @@ -125,7 +125,7 @@ public enum SkillLevel } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Teacher : Person { [Newtonsoft.Json.JsonProperty("Course", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -137,7 +137,7 @@ public partial class Teacher : Person } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] [Newtonsoft.Json.JsonObjectAttribute] public partial class PersonNotFoundException : System.Exception { @@ -148,7 +148,7 @@ public partial class PersonNotFoundException : System.Exception } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple = true)] internal class JsonInheritanceAttribute : System.Attribute { @@ -163,7 +163,7 @@ public JsonInheritanceAttribute(string key, System.Type type) public System.Type Type { get; } } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] internal class JsonInheritanceConverter : Newtonsoft.Json.JsonConverter { internal static readonly string DefaultDiscriminatorName = "discriminator"; @@ -276,7 +276,7 @@ private string GetSubtypeDiscriminator(System.Type objectType) } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -339,7 +339,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerResponse { public int StatusCode { get; private set; } @@ -353,7 +353,7 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.Dictionary : SwaggerResponse { public TResult Result { get; private set; } @@ -365,7 +365,7 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.Dictionary : GeoClientException { public TResult Result { get; private set; } @@ -400,7 +400,7 @@ public GeoClientException(string message, int statusCode, string response, Syste } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClientException : System.Exception { public int StatusCode { get; private set; } @@ -423,7 +423,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClientException : PersonsClientException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.ClientPCL/UberClient.cs b/src/NSwag.Integration.ClientPCL/UberClient.cs index 1a01b7d20f..08212ae9d4 100644 --- a/src/NSwag.Integration.ClientPCL/UberClient.cs +++ b/src/NSwag.Integration.ClientPCL/UberClient.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -8,7 +8,7 @@ namespace Uber { #pragma warning disable - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class Client { private string _baseUrl = "https://api.uber.com/v1"; @@ -571,7 +571,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Product : System.ComponentModel.INotifyPropertyChanged { private string _product_id; @@ -667,7 +667,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class PriceEstimate : System.ComponentModel.INotifyPropertyChanged { private string _product_id; @@ -795,7 +795,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Profile : System.ComponentModel.INotifyPropertyChanged { private string _first_name; @@ -891,7 +891,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Activity : System.ComponentModel.INotifyPropertyChanged { private string _uuid; @@ -923,7 +923,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Activities : System.ComponentModel.INotifyPropertyChanged { private int? _offset; @@ -1002,7 +1002,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Error : System.ComponentModel.INotifyPropertyChanged { private int? _code; @@ -1063,7 +1063,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -1086,7 +1086,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : SwaggerException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.ClientPCL/swagger.json b/src/NSwag.Integration.ClientPCL/swagger.json index 8fbdaebd28..c2e24639b6 100644 --- a/src/NSwag.Integration.ClientPCL/swagger.json +++ b/src/NSwag.Integration.ClientPCL/swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "info": { "title": "Swagger specification", "version": "1.0.0" @@ -650,7 +650,6 @@ "definitions": { "GeoPoint": { "type": "object", - "additionalProperties": false, "required": [ "Latitude", "Longitude" @@ -668,7 +667,6 @@ }, "Exception": { "type": "object", - "additionalProperties": false, "properties": { "Message": { "type": "string" @@ -686,7 +684,6 @@ }, "GenericRequestOfAddressAndPerson": { "type": "object", - "additionalProperties": false, "properties": { "Item1": { "$ref": "#/definitions/Address" @@ -698,7 +695,6 @@ }, "Address": { "type": "object", - "additionalProperties": false, "required": [ "IsPrimary" ], @@ -714,7 +710,6 @@ "Person": { "type": "object", "discriminator": "discriminator", - "additionalProperties": false, "required": [ "Id", "FirstName", @@ -822,7 +817,6 @@ }, { "type": "object", - "additionalProperties": false, "required": [ "SkillLevel" ], @@ -849,7 +843,6 @@ }, { "type": "object", - "additionalProperties": false, "required": [ "id" ], diff --git a/src/NSwag.Integration.Console/Controllers.cs b/src/NSwag.Integration.Console/Controllers.cs index 2f9e449c75..c3b80b5074 100644 --- a/src/NSwag.Integration.Console/Controllers.cs +++ b/src/NSwag.Integration.Console/Controllers.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -10,7 +10,7 @@ namespace MyNamespace { #pragma warning disable - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public interface IGeoController { System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location); @@ -37,7 +37,7 @@ public interface IGeoController } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoController : System.Web.Http.ApiController { private IGeoController _implementation; @@ -115,7 +115,7 @@ public System.Threading.Tasks.Task GetUploadedFile(int id, bool? @ } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public interface IPersonsController { System.Threading.Tasks.Task> GetAllAsync(); @@ -145,7 +145,7 @@ public interface IPersonsController } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsController : System.Web.Http.ApiController { private IPersonsController _implementation; @@ -226,7 +226,7 @@ public System.Threading.Tasks.Task Upload([System.Web.Http.FromBody] Sys } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class GeoPoint : System.ComponentModel.INotifyPropertyChanged { private double _latitude; @@ -272,7 +272,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class GenericRequestOfAddressAndPerson : System.ComponentModel.INotifyPropertyChanged { private Address _item1; @@ -318,7 +318,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Address : System.ComponentModel.INotifyPropertyChanged { private bool _isPrimary; @@ -366,7 +366,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "discriminator")] [JsonInheritanceAttribute("Teacher", typeof(Teacher))] - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Person : System.ComponentModel.INotifyPropertyChanged { private System.Guid _id; @@ -575,7 +575,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum Gender { [System.Runtime.Serialization.EnumMember(Value = @"Male")] @@ -586,7 +586,7 @@ public enum Gender } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum SkillLevel { Low = 0, @@ -597,7 +597,7 @@ public enum SkillLevel } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Teacher : Person, System.ComponentModel.INotifyPropertyChanged { private string _course; @@ -643,7 +643,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] [Newtonsoft.Json.JsonObjectAttribute] public partial class PersonNotFoundException : System.Exception, System.ComponentModel.INotifyPropertyChanged { @@ -676,7 +676,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple = true)] internal class JsonInheritanceAttribute : System.Attribute { @@ -691,7 +691,7 @@ public JsonInheritanceAttribute(string key, System.Type type) public System.Type Type { get; } } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] internal class JsonInheritanceConverter : Newtonsoft.Json.JsonConverter { internal static readonly string DefaultDiscriminatorName = "discriminator"; @@ -804,7 +804,7 @@ private string GetSubtypeDiscriminator(System.Type objectType) } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -867,7 +867,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] internal class JsonExceptionConverter : Newtonsoft.Json.JsonConverter { private readonly Newtonsoft.Json.Serialization.DefaultContractResolver _defaultContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); diff --git a/src/NSwag.Integration.Console/ServiceClients.cs b/src/NSwag.Integration.Console/ServiceClients.cs index ba821c3b42..a2a6e63cd8 100644 --- a/src/NSwag.Integration.Console/ServiceClients.cs +++ b/src/NSwag.Integration.Console/ServiceClients.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -10,7 +10,7 @@ namespace NSwag.Integration.Console { #pragma warning disable - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClient { private System.Lazy _settings; @@ -902,7 +902,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClient { private System.Lazy _settings; @@ -1880,7 +1880,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] internal class JsonExceptionConverter : Newtonsoft.Json.JsonConverter { private readonly Newtonsoft.Json.Serialization.DefaultContractResolver _defaultContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver(); diff --git a/src/NSwag.Integration.Console/ServiceClientsContracts.cs b/src/NSwag.Integration.Console/ServiceClientsContracts.cs index a75e251ba2..60a4d61099 100644 --- a/src/NSwag.Integration.Console/ServiceClientsContracts.cs +++ b/src/NSwag.Integration.Console/ServiceClientsContracts.cs @@ -1,6 +1,6 @@ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -10,7 +10,7 @@ namespace NSwag.Integration.Console.Contracts - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class GeoPoint { [Newtonsoft.Json.JsonProperty("Latitude", Required = Newtonsoft.Json.Required.Always)] @@ -22,7 +22,7 @@ public partial class GeoPoint } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class GenericRequestOfAddressAndPerson { [Newtonsoft.Json.JsonProperty("Item1", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -34,7 +34,7 @@ public partial class GenericRequestOfAddressAndPerson } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Address { [Newtonsoft.Json.JsonProperty("IsPrimary", Required = Newtonsoft.Json.Required.Always)] @@ -48,7 +48,7 @@ public partial class Address [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "discriminator")] [JsonInheritanceAttribute("Teacher", typeof(Teacher))] - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Person { [Newtonsoft.Json.JsonProperty("Id", Required = Newtonsoft.Json.Required.Always)] @@ -103,7 +103,7 @@ public partial class Person } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum Gender { [System.Runtime.Serialization.EnumMember(Value = @"Male")] @@ -114,7 +114,7 @@ public enum Gender } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public enum SkillLevel { Low = 0, @@ -125,7 +125,7 @@ public enum SkillLevel } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] public partial class Teacher : Person { [Newtonsoft.Json.JsonProperty("Course", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] @@ -137,7 +137,7 @@ public partial class Teacher : Person } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] [Newtonsoft.Json.JsonObjectAttribute] public partial class PersonNotFoundException : System.Exception { @@ -148,7 +148,7 @@ public partial class PersonNotFoundException : System.Exception } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple = true)] internal class JsonInheritanceAttribute : System.Attribute { @@ -163,7 +163,7 @@ public JsonInheritanceAttribute(string key, System.Type type) public System.Type Type { get; } } - [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.8.0 (Newtonsoft.Json v11.0.0.0)")] + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.11.0 (Newtonsoft.Json v11.0.0.0)")] internal class JsonInheritanceConverter : Newtonsoft.Json.JsonConverter { internal static readonly string DefaultDiscriminatorName = "discriminator"; @@ -276,7 +276,7 @@ private string GetSubtypeDiscriminator(System.Type objectType) } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -339,7 +339,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -362,7 +362,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : SwaggerException { public TResult Result { get; private set; } diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngular.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngular.ts index 650c3b1130..621ff48bb2 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngular.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngular.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngularJS.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngularJS.ts index aab245b286..068ac8a462 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngularJS.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAngularJS.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAurelia.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAurelia.ts index fabe21d521..8ef26de926 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAurelia.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsAurelia.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsFetch.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsFetch.ts index 4b832e9973..33eb470722 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsFetch.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsFetch.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryCallbacks.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryCallbacks.ts index a46585f729..ba70621c40 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryCallbacks.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryCallbacks.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromises.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromises.ts index a486462550..1bb95cc673 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromises.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromises.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromisesKO.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromisesKO.ts index d385a58290..3a444d7dc5 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromisesKO.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsJQueryPromisesKO.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsPetStoreFetch.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsPetStoreFetch.ts index 09937c6e26..0a7e47e4ed 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsPetStoreFetch.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsPetStoreFetch.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsUberFetch.ts b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsUberFetch.ts index 0c628f5e93..07f5556afd 100644 --- a/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsUberFetch.ts +++ b/src/NSwag.Integration.TypeScriptWeb/scripts/serviceClientsUberFetch.ts @@ -2,7 +2,7 @@ /* eslint-disable */ //---------------------- // -// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj index 92ca2aabfa..1962b0964b 100644 --- a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj +++ b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj @@ -65,8 +65,8 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NJsonSchema.10.0.8\lib\net45\NJsonSchema.dll + + ..\packages\NJsonSchema.10.0.11\lib\net45\NJsonSchema.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/NSwag.Integration.WebAPI/packages.config b/src/NSwag.Integration.WebAPI/packages.config index ee0e50cd20..dcda89fd84 100644 --- a/src/NSwag.Integration.WebAPI/packages.config +++ b/src/NSwag.Integration.WebAPI/packages.config @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore11/swagger.json b/src/NSwag.Sample.NETCore11/swagger.json index 14a9901a63..2d4510da2a 100644 --- a/src/NSwag.Sample.NETCore11/swagger.json +++ b/src/NSwag.Sample.NETCore11/swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v9.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v9.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", @@ -437,7 +437,6 @@ }, "Pet": { "type": "object", - "additionalProperties": false, "required": [ "id", "age", @@ -487,7 +486,6 @@ }, "Category": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -503,7 +501,6 @@ }, "Image": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -519,7 +516,6 @@ }, "Tag": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -535,7 +531,6 @@ }, "ApiResponse": { "type": "object", - "additionalProperties": false, "required": [ "code" ], diff --git a/src/NSwag.Sample.NETCore20/swagger.json b/src/NSwag.Sample.NETCore20/swagger.json index acabf51e67..b5a948efd6 100644 --- a/src/NSwag.Sample.NETCore20/swagger.json +++ b/src/NSwag.Sample.NETCore20/swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v10.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v10.0.0.0))", "swagger": "2.0", "info": { "title": "Hello world!", @@ -586,7 +586,6 @@ }, "Pet": { "type": "object", - "additionalProperties": false, "required": [ "id", "age", @@ -636,7 +635,6 @@ }, "Category": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -652,7 +650,6 @@ }, "Image": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -668,7 +665,6 @@ }, "Tag": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -684,7 +680,6 @@ }, "ApiResponse": { "type": "object", - "additionalProperties": false, "required": [ "code" ], diff --git a/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json b/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json index 4e95b1161d..693d1f8b0d 100644 --- a/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json +++ b/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "ljlkjlkj", @@ -448,7 +448,6 @@ }, "Pet": { "type": "object", - "additionalProperties": false, "required": [ "id", "age", @@ -498,7 +497,6 @@ }, "Category": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -514,7 +512,6 @@ }, "Image": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -530,7 +527,6 @@ }, "Tag": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -546,7 +542,6 @@ }, "ApiResponse": { "type": "object", - "additionalProperties": false, "required": [ "code" ], diff --git a/src/NSwag.Sample.NETCore21/swagger_project_cli.json b/src/NSwag.Sample.NETCore21/swagger_project_cli.json index aca3f467b5..611d63a4df 100644 --- a/src/NSwag.Sample.NETCore21/swagger_project_cli.json +++ b/src/NSwag.Sample.NETCore21/swagger_project_cli.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", @@ -448,7 +448,6 @@ }, "Pet": { "type": "object", - "additionalProperties": false, "required": [ "id", "age", @@ -498,7 +497,6 @@ }, "Category": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -514,7 +512,6 @@ }, "Image": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -530,7 +527,6 @@ }, "Tag": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -546,7 +542,6 @@ }, "ApiResponse": { "type": "object", - "additionalProperties": false, "required": [ "code" ], diff --git a/src/NSwag.Sample.NETCore22/nswag_oas_project.nswag b/src/NSwag.Sample.NETCore22/nswag_oas_project.nswag new file mode 100644 index 0000000000..f217e3c82c --- /dev/null +++ b/src/NSwag.Sample.NETCore22/nswag_oas_project.nswag @@ -0,0 +1,57 @@ +{ + "runtime": "NetCore22", + "defaultVariables": null, + "documentGenerator": { + "aspNetCoreToOpenApi": { + "project": "NSwag.Sample.NETCore22.csproj", + "msBuildProjectExtensionsPath": null, + "configuration": null, + "runtime": null, + "targetFramework": null, + "noBuild": true, + "verbose": false, + "workingDirectory": null, + "requireParametersWithoutDefault": true, + "apiGroupNames": null, + "defaultPropertyNameHandling": "Default", + "defaultReferenceTypeNullHandling": "Null", + "defaultResponseReferenceTypeNullHandling": "Null", + "defaultEnumHandling": "Integer", + "flattenInheritanceHierarchy": false, + "generateKnownTypes": true, + "generateEnumMappingDescription": false, + "generateXmlObjects": false, + "generateAbstractProperties": false, + "generateAbstractSchemas": true, + "ignoreObsoleteProperties": false, + "allowReferencesWithProperties": false, + "excludedTypeNames": [], + "serviceHost": null, + "serviceBasePath": null, + "serviceSchemes": [], + "infoTitle": "My Title", + "infoDescription": null, + "infoVersion": "1.0.0", + "documentTemplate": null, + "documentProcessorTypes": [], + "operationProcessorTypes": [], + "typeNameGeneratorType": null, + "schemaNameGeneratorType": null, + "contractResolverType": null, + "serializerSettingsType": null, + "useDocumentProvider": true, + "documentName": "a", + "aspNetCoreEnvironment": null, + "createWebHostBuilderMethod": null, + "startupType": null, + "allowNullableBodyParameters": false, + "output": "openapi_project_cli.json", + "outputType": "Swagger2", + "assemblyPaths": [], + "assemblyConfig": null, + "referencePaths": [], + "useNuGetCache": false + } + }, + "codeGenerators": {} +} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore22/openapi_project_cli.json b/src/NSwag.Sample.NETCore22/openapi_project_cli.json new file mode 100644 index 0000000000..9ea31c38a9 --- /dev/null +++ b/src/NSwag.Sample.NETCore22/openapi_project_cli.json @@ -0,0 +1,672 @@ +{ + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", + "openapi": "3.0.0", + "info": { + "title": "My Title", + "version": "1.0.0" + }, + "paths": { + "/pet": { + "post": { + "tags": [ + "Pet" + ], + "operationId": "Pet_AddPet", + "requestBody": { + "x-name": "pet", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + }, + "required": true, + "x-position": 1 + }, + "responses": { + "204": { + "description": "" + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + } + } + }, + "put": { + "tags": [ + "Pet" + ], + "operationId": "Pet_EditPet", + "requestBody": { + "x-name": "pet", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + }, + "required": true, + "x-position": 1 + }, + "responses": { + "204": { + "description": "" + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + } + } + } + }, + "/pet/findByStatus": { + "get": { + "tags": [ + "Pet" + ], + "operationId": "Pet_FindByStatus", + "requestBody": { + "x-name": "status", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "required": true, + "x-position": 1 + }, + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/Pet" + } + } + } + } + } + } + } + }, + "/pet/findByCategory": { + "get": { + "tags": [ + "Pet" + ], + "operationId": "Pet_FindByCategory", + "parameters": [ + { + "name": "category", + "in": "query", + "required": true, + "schema": { + "type": "string", + "nullable": true + }, + "x-position": 1 + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/Pet" + } + } + } + } + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + } + } + } + }, + "/pet/{petId}": { + "get": { + "tags": [ + "Pet" + ], + "operationId": "Pet_FindById", + "parameters": [ + { + "name": "petId", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 1 + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/Pet" + } + ] + } + } + } + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + }, + "404": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/ProblemDetails" + } + ] + } + } + } + } + } + }, + "post": { + "tags": [ + "Pet" + ], + "operationId": "Pet_EditPet2", + "parameters": [ + { + "name": "petId", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 1 + }, + { + "name": "Id", + "in": "formData", + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 2 + }, + { + "name": "Age", + "in": "formData", + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 3, + "maximum": 150.0, + "minimum": 0.0 + }, + { + "name": "Category.Id", + "in": "formData", + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 4 + }, + { + "name": "Category.Name", + "in": "formData", + "schema": { + "type": "string", + "nullable": true + }, + "x-position": 5 + }, + { + "name": "HasVaccinations", + "in": "formData", + "schema": { + "type": "boolean" + }, + "x-position": 6 + }, + { + "name": "Name", + "in": "formData", + "schema": { + "type": "string", + "nullable": true + }, + "x-position": 7, + "maxLength": 50, + "minLength": 2 + }, + { + "name": "Images", + "in": "formData", + "collectionFormat": "multi", + "schema": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/Image" + } + }, + "x-position": 8 + }, + { + "name": "Tags", + "in": "formData", + "collectionFormat": "multi", + "schema": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/Tag" + } + }, + "x-position": 9 + }, + { + "name": "Status", + "in": "formData", + "schema": { + "type": "string", + "nullable": true + }, + "x-position": 10 + } + ], + "responses": { + "204": { + "description": "" + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + }, + "404": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/ProblemDetails" + } + ] + } + } + } + } + } + }, + "delete": { + "tags": [ + "Pet" + ], + "operationId": "Pet_DeletePet", + "parameters": [ + { + "name": "petId", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 1 + } + ], + "responses": { + "204": { + "description": "" + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + }, + "404": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/ProblemDetails" + } + ] + } + } + } + } + } + } + }, + "/pet/{petId}/uploadImage": { + "post": { + "tags": [ + "Pet" + ], + "operationId": "Pet_UploadImage", + "parameters": [ + { + "name": "petId", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + }, + "x-position": 1 + }, + { + "type": "file", + "name": "file", + "in": "formData", + "schema": { + "type": "string", + "format": "binary", + "nullable": true + }, + "nullable": true + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/ApiResponse" + } + ] + } + } + } + }, + "400": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/SerializableError" + } + ] + } + } + } + }, + "404": { + "description": "", + "content": { + "application/json": { + "schema": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/ProblemDetails" + } + ] + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "SerializableError": { + "type": "object", + "additionalProperties": {} + }, + "Pet": { + "type": "object", + "additionalProperties": false, + "required": [ + "name", + "status" + ], + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "age": { + "type": "integer", + "format": "int32", + "maximum": 150.0, + "minimum": 0.0 + }, + "category": { + "nullable": true, + "oneOf": [ + { + "$ref": "#/components/schemas/Category" + } + ] + }, + "hasVaccinations": { + "type": "boolean" + }, + "name": { + "type": "string", + "maxLength": 50, + "minLength": 2 + }, + "images": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/Image" + } + }, + "tags": { + "type": "array", + "nullable": true, + "items": { + "$ref": "#/components/schemas/Tag" + } + }, + "status": { + "type": "string", + "minLength": 1 + } + } + }, + "Category": { + "type": "object", + "additionalProperties": false, + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "name": { + "type": "string", + "nullable": true + } + } + }, + "Image": { + "type": "object", + "additionalProperties": false, + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "url": { + "type": "string", + "nullable": true + } + } + }, + "Tag": { + "type": "object", + "additionalProperties": false, + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "name": { + "type": "string", + "nullable": true + } + } + }, + "ProblemDetails": { + "type": "object", + "additionalProperties": { + "nullable": true + }, + "properties": { + "type": { + "type": "string", + "nullable": true + }, + "title": { + "type": "string", + "nullable": true + }, + "status": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "detail": { + "type": "string", + "nullable": true + }, + "instance": { + "type": "string", + "nullable": true + } + } + }, + "ApiResponse": { + "type": "object", + "additionalProperties": false, + "properties": { + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string", + "nullable": true + }, + "type": { + "type": "string", + "nullable": true + } + } + } + } + } +} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore22/swagger_assembly_cli.json b/src/NSwag.Sample.NETCore22/swagger_assembly_cli.json index cfd9da3e50..f89a48b059 100644 --- a/src/NSwag.Sample.NETCore22/swagger_assembly_cli.json +++ b/src/NSwag.Sample.NETCore22/swagger_assembly_cli.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "ljlkjlkj", @@ -403,7 +403,6 @@ }, "Pet": { "type": "object", - "additionalProperties": false, "required": [ "id", "age", @@ -453,7 +452,6 @@ }, "Category": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -469,7 +467,6 @@ }, "Image": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -485,7 +482,6 @@ }, "Tag": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -523,7 +519,6 @@ }, "ApiResponse": { "type": "object", - "additionalProperties": false, "required": [ "code" ], diff --git a/src/NSwag.Sample.NETCore22/swagger_project_cli.json b/src/NSwag.Sample.NETCore22/swagger_project_cli.json index 7bdfc5b9a4..b8d54f9d90 100644 --- a/src/NSwag.Sample.NETCore22/swagger_project_cli.json +++ b/src/NSwag.Sample.NETCore22/swagger_project_cli.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", @@ -403,7 +403,6 @@ }, "Pet": { "type": "object", - "additionalProperties": false, "required": [ "id", "age", @@ -453,7 +452,6 @@ }, "Category": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -469,7 +467,6 @@ }, "Image": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -485,7 +482,6 @@ }, "Tag": { "type": "object", - "additionalProperties": false, "required": [ "id" ], @@ -523,7 +519,6 @@ }, "ApiResponse": { "type": "object", - "additionalProperties": false, "required": [ "code" ], diff --git a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj index 8b941ddcca..8eae28c654 100644 --- a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj +++ b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj @@ -62,8 +62,8 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NJsonSchema.10.0.8\lib\net45\NJsonSchema.dll + + ..\packages\NJsonSchema.10.0.11\lib\net45\NJsonSchema.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/NSwag.Sample.NetGlobalAsax/packages.config b/src/NSwag.Sample.NetGlobalAsax/packages.config index 2d850813cc..23590dcd2f 100644 --- a/src/NSwag.Sample.NetGlobalAsax/packages.config +++ b/src/NSwag.Sample.NetGlobalAsax/packages.config @@ -28,7 +28,7 @@ - + diff --git a/src/NSwag.Sample.NetGlobalAsax/swagger.json b/src/NSwag.Sample.NetGlobalAsax/swagger.json index 7072727905..e29237045c 100644 --- a/src/NSwag.Sample.NetGlobalAsax/swagger.json +++ b/src/NSwag.Sample.NetGlobalAsax/swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.8.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.0.0.0 (NJsonSchema v10.0.11.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj index f997819f59..1a1373dc0d 100644 --- a/src/NSwagStudio/NSwagStudio.csproj +++ b/src/NSwagStudio/NSwagStudio.csproj @@ -96,17 +96,17 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NJsonSchema.10.0.8\lib\net45\NJsonSchema.dll + + ..\packages\NJsonSchema.10.0.11\lib\net45\NJsonSchema.dll - - ..\packages\NJsonSchema.CodeGeneration.10.0.8\lib\net451\NJsonSchema.CodeGeneration.dll + + ..\packages\NJsonSchema.CodeGeneration.10.0.11\lib\net451\NJsonSchema.CodeGeneration.dll - - ..\packages\NJsonSchema.CodeGeneration.CSharp.10.0.8\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll + + ..\packages\NJsonSchema.CodeGeneration.CSharp.10.0.11\lib\net451\NJsonSchema.CodeGeneration.CSharp.dll - - ..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.8\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll + + ..\packages\NJsonSchema.CodeGeneration.TypeScript.10.0.11\lib\net451\NJsonSchema.CodeGeneration.TypeScript.dll diff --git a/src/NSwagStudio/Views/CodeGenerators/Views/CSharpSettingsView.xaml b/src/NSwagStudio/Views/CodeGenerators/Views/CSharpSettingsView.xaml index 2eb44a7434..074cddd76a 100644 --- a/src/NSwagStudio/Views/CodeGenerators/Views/CSharpSettingsView.xaml +++ b/src/NSwagStudio/Views/CodeGenerators/Views/CSharpSettingsView.xaml @@ -89,6 +89,9 @@ + + + diff --git a/src/NSwagStudio/packages.config b/src/NSwagStudio/packages.config index dcf23269bd..10553b1530 100644 --- a/src/NSwagStudio/packages.config +++ b/src/NSwagStudio/packages.config @@ -11,10 +11,10 @@ - - - - + + + +