diff --git a/README.md b/README.md index 304a35cb5c..5ddd14b20a 100644 --- a/README.md +++ b/README.md @@ -236,3 +236,4 @@ Support this project by becoming a sponsor. Your logo will show up here with a l Thank you to all our backers! + diff --git a/build/Build.cs b/build/Build.cs index 6d04890954..93daabc5e0 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -140,9 +140,9 @@ partial class Build : NukeBuild var consoleCoreDirectory = SourceDirectory / "NSwag.ConsoleCore" / "bin" / Configuration; CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp2.1/publish", npmBinariesDirectory / "NetCore21"); - // CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp2.2/publish", npmBinariesDirectory / "NetCore22"); - // CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp3.0/publish", npmBinariesDirectory / "NetCore30"); CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp3.1/publish", npmBinariesDirectory / "NetCore31"); + CopyDirectoryRecursively(consoleCoreDirectory / "net5.0/publish", npmBinariesDirectory / "Net50"); + CopyDirectoryRecursively(consoleCoreDirectory / "net6.0/publish", npmBinariesDirectory / "Net60"); // gather relevant artifacts EnsureCleanDirectory(OutputDirectory); @@ -239,6 +239,8 @@ partial class Build : NukeBuild { ("NSwag.Sample.NETCore21", "NetCore21"), ("NSwag.Sample.NETCore31", "NetCore31"), + ("NSwag.Sample.NET50", "Net50"), + ("NSwag.Sample.NET60", "Net60"), }; foreach (var (projectName, runtime) in dotnetTargets) diff --git a/samples/WithMiddleware/Sample.AspNetCore31/Sample.AspNetCore31.csproj b/samples/WithMiddleware/Sample.AspNetCore31/Sample.AspNetCore31.csproj index 1807024029..d1a707cf3f 100644 --- a/samples/WithMiddleware/Sample.AspNetCore31/Sample.AspNetCore31.csproj +++ b/samples/WithMiddleware/Sample.AspNetCore31/Sample.AspNetCore31.csproj @@ -6,8 +6,8 @@ - - + + runtime; build; native; contentfiles; analyzers all diff --git a/samples/WithMiddleware/Sample.NetOwinMiddleware/Sample.NetOwinMiddleware.csproj b/samples/WithMiddleware/Sample.NetOwinMiddleware/Sample.NetOwinMiddleware.csproj index 8a96944341..fe2ab7e514 100644 --- a/samples/WithMiddleware/Sample.NetOwinMiddleware/Sample.NetOwinMiddleware.csproj +++ b/samples/WithMiddleware/Sample.NetOwinMiddleware/Sample.NetOwinMiddleware.csproj @@ -62,18 +62,18 @@ ..\..\packages\NJsonSchema.10.5.2\lib\net45\NJsonSchema.dll - - ..\..\packages\NSwag.AspNet.Owin.13.14.0\lib\net45\NSwag.AspNet.Owin.dll + + ..\..\packages\NSwag.AspNet.Owin.13.14.1\lib\net45\NSwag.AspNet.Owin.dll - - ..\..\packages\NSwag.Core.13.14.0\lib\net45\NSwag.Core.dll + + ..\..\packages\NSwag.Core.13.14.1\lib\net45\NSwag.Core.dll - - ..\..\packages\NSwag.Generation.13.14.0\lib\net45\NSwag.Generation.dll + + ..\..\packages\NSwag.Generation.13.14.1\lib\net45\NSwag.Generation.dll True - - ..\..\packages\NSwag.Generation.WebApi.13.14.0\lib\net45\NSwag.Generation.WebApi.dll + + ..\..\packages\NSwag.Generation.WebApi.13.14.1\lib\net45\NSwag.Generation.WebApi.dll True diff --git a/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_assembly_swagger.json b/samples/WithoutMiddleware/Sample.AspNetCore21/nswag_assembly_swagger.json index e5c377eba7..d163ca3286 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.14.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v11.0.0.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 e5c377eba7..d163ca3286 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.14.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v11.0.0.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 489c465a99..55798c1881 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.14.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/src/NSwag.Annotations/NSwag.Annotations.csproj b/src/NSwag.Annotations/NSwag.Annotations.csproj index e287c13d5b..e5ab176576 100644 --- a/src/NSwag.Annotations/NSwag.Annotations.csproj +++ b/src/NSwag.Annotations/NSwag.Annotations.csproj @@ -2,7 +2,7 @@ netstandard1.0;net45;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.nuspec b/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.nuspec index 60e16a15ea..54589b23a0 100644 --- a/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.nuspec +++ b/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.nuspec @@ -2,7 +2,7 @@ NSwag.ApiDescription.Client - 13.14.0 + 13.14.1 Rico Suter Rico Suter false @@ -16,7 +16,7 @@ true - + diff --git a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj index 1f49836cba..123352108e 100644 --- a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj +++ b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj @@ -2,7 +2,7 @@ net45 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj index bcc9b81a5c..0954e2cf81 100644 --- a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj +++ b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj @@ -2,7 +2,7 @@ net45 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj b/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj index 5f7486f163..beeadb79f6 100644 --- a/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj +++ b/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj @@ -4,7 +4,7 @@ x86 Exe false - 13.14.0 + 13.14.1 Rico Suter Rico Suter NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript diff --git a/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj b/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj index 1a8f7bf8ad..208496884c 100644 --- a/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj +++ b/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj @@ -4,7 +4,7 @@ x64 Exe false - 13.14.0 + 13.14.1 Rico Suter Rico Suter NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj index ee4ddddbf5..ea6e208091 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj @@ -2,7 +2,7 @@ net451;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 Swagger Documentation AspNetCore NetCore TypeScript CodeGen Copyright © Rico Suter, 2020 https://github.com/RicoSuter/NSwag/blob/master/LICENSE.md diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj index 43e6a53b7c..4783cb0cfb 100644 --- a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj +++ b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj @@ -2,7 +2,7 @@ netstandard1.6;net451;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj index 765b9c23fd..e00dc35257 100644 --- a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj +++ b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj @@ -2,7 +2,7 @@ netstandard1.3;net451;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj index b7adfd56bd..6c59cc6fe2 100644 --- a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj +++ b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj @@ -2,7 +2,7 @@ netstandard1.3;net451;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj index dd2a5be508..b2b053369b 100644 --- a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj +++ b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj @@ -2,7 +2,7 @@ netstandard1.3;net451;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Commands/NSwag.Commands.csproj b/src/NSwag.Commands/NSwag.Commands.csproj index ec6645e1c1..d03dc4313e 100644 --- a/src/NSwag.Commands/NSwag.Commands.csproj +++ b/src/NSwag.Commands/NSwag.Commands.csproj @@ -2,7 +2,7 @@ net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Commands/NSwagDocument.cs b/src/NSwag.Commands/NSwagDocument.cs index 3884d6a078..47fe51e861 100644 --- a/src/NSwag.Commands/NSwagDocument.cs +++ b/src/NSwag.Commands/NSwagDocument.cs @@ -316,6 +316,10 @@ private string GetArgumentsPrefix() { return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "Net50/dotnet-nswag.dll") + "\" "; } + else if (runtime == Runtime.Net60) + { + return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "Net60/dotnet-nswag.dll") + "\" "; + } else #endif return ""; diff --git a/src/NSwag.Console.x86/NSwag.Console.x86.csproj b/src/NSwag.Console.x86/NSwag.Console.x86.csproj index c69005e48e..aeef2fd0b8 100644 --- a/src/NSwag.Console.x86/NSwag.Console.x86.csproj +++ b/src/NSwag.Console.x86/NSwag.Console.x86.csproj @@ -5,7 +5,7 @@ net461 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 https://github.com/RicoSuter/NSwag/blob/master/LICENSE.md diff --git a/src/NSwag.Console/NSwag.Console.csproj b/src/NSwag.Console/NSwag.Console.csproj index b89c38b44e..eba91db9b4 100644 --- a/src/NSwag.Console/NSwag.Console.csproj +++ b/src/NSwag.Console/NSwag.Console.csproj @@ -5,7 +5,7 @@ net461 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 https://github.com/RicoSuter/NSwag/blob/master/LICENSE.md diff --git a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj index 00ea1f43bf..ab3b0a8ffd 100644 --- a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj +++ b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj @@ -3,7 +3,7 @@ netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 Exe NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj index d8a62086fd..0cb0913e6b 100644 --- a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj +++ b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj @@ -2,7 +2,7 @@ netstandard1.3;net45;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj index 0d0da9d3e6..90d6e039ac 100644 --- a/src/NSwag.Core/NSwag.Core.csproj +++ b/src/NSwag.Core/NSwag.Core.csproj @@ -2,7 +2,7 @@ netstandard1.0;net45;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj index 60680b9f7e..557eb8154c 100644 --- a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj +++ b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj @@ -2,7 +2,7 @@ netstandard1.6;net451;netstandard2.0;netcoreapp3.1;net5.0;net6.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 Swagger Documentation AspNetCore Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj index 2c76aaea93..db629bd73e 100644 --- a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj +++ b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj @@ -2,7 +2,7 @@ netstandard1.0;net45;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj index 00a8e8419e..ee3e935a58 100644 --- a/src/NSwag.Generation/NSwag.Generation.csproj +++ b/src/NSwag.Generation/NSwag.Generation.csproj @@ -2,7 +2,7 @@ netstandard1.0;net45;netstandard2.0 NSwag: The OpenAPI/Swagger API toolchain for .NET and TypeScript - 13.14.0 + 13.14.1 OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet Copyright © Rico Suter, 2020 MIT diff --git a/src/NSwag.Integration.ClientPCL/PetStoreClient.cs b/src/NSwag.Integration.ClientPCL/PetStoreClient.cs index 92a2ff1194..573668124e 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -16,7 +16,7 @@ namespace PetStore { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial interface IPetStoreClient { /// uploads an image @@ -266,7 +266,7 @@ public partial interface IPetStoreClient } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PetStoreClient : IPetStoreClient { private string _baseUrl = "https://petstore.swagger.io/v2"; @@ -2664,7 +2664,7 @@ public enum OrderStatus } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -2691,7 +2691,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -2714,7 +2714,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 990a8a56b7..817eaa5716 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -18,7 +18,7 @@ namespace NSwag.Integration.ClientPCL { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClient : ClientBase { private string _baseUrl = "http://localhost:13452"; @@ -984,7 +984,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClient : ClientBase { private string _baseUrl = "http://localhost:13452"; @@ -1964,7 +1964,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 4539045525..d8050555c0 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -291,7 +291,7 @@ private string GetSubtypeDiscriminator(System.Type objectType) } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -318,7 +318,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileResponse : System.IDisposable { private System.IDisposable _client; @@ -354,7 +354,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerResponse { public int StatusCode { get; private set; } @@ -368,7 +368,7 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDicti } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerResponse : SwaggerResponse { public TResult Result { get; private set; } @@ -380,7 +380,7 @@ public SwaggerResponse(int statusCode, System.Collections.Generic.IReadOnlyDicti } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClientException : System.Exception { public int StatusCode { get; private set; } @@ -403,7 +403,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClientException : GeoClientException { public TResult Result { get; private set; } @@ -415,7 +415,7 @@ public GeoClientException(string message, int statusCode, string response, Syste } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClientException : System.Exception { public int StatusCode { get; private set; } @@ -438,7 +438,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 8d32aca61d..18162345d7 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -16,7 +16,7 @@ namespace Uber { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class Client { private string _baseUrl = "https://api.uber.com/v1"; @@ -1121,7 +1121,7 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -1144,7 +1144,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 0056360afd..51ba2c4e17 100644 --- a/src/NSwag.Integration.ClientPCL/swagger.json +++ b/src/NSwag.Integration.ClientPCL/swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))", "info": { "title": "Swagger specification", "version": "1.0.0" diff --git a/src/NSwag.Integration.Console/Controllers.cs b/src/NSwag.Integration.Console/Controllers.cs index 752ba2deeb..b3b0751395 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -18,7 +18,7 @@ namespace MyNamespace { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public interface IGeoController { System.Threading.Tasks.Task FromBodyTestAsync(GeoPoint location); @@ -45,7 +45,7 @@ public interface IGeoController } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoController : System.Web.Http.ApiController { private IGeoController _implementation; @@ -123,7 +123,7 @@ public System.Threading.Tasks.Task GetUploadedFile(int id, [System } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public interface IPersonsController { System.Threading.Tasks.Task> GetAllAsync(); @@ -153,7 +153,7 @@ public interface IPersonsController } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsController : System.Web.Http.ApiController { private IPersonsController _implementation; @@ -507,7 +507,7 @@ private string GetSubtypeDiscriminator(System.Type objectType) } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -534,7 +534,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileResponse : System.IDisposable { private System.IDisposable _client; @@ -570,7 +570,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 3852e21cbf..92fb8a5fed 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -18,7 +18,7 @@ namespace NSwag.Integration.Console { using System = global::System; - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class GeoClient { private System.Lazy _settings; @@ -976,7 +976,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class PersonsClient { private System.Lazy _settings; @@ -1948,7 +1948,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 ec01776ef2..1fb2260776 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- @@ -291,7 +291,7 @@ private string GetSubtypeDiscriminator(System.Type objectType) } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileParameter { public FileParameter(System.IO.Stream data) @@ -318,7 +318,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType) public string ContentType { get; private set; } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class FileResponse : System.IDisposable { private System.IDisposable _client; @@ -354,7 +354,7 @@ public void Dispose() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] public partial class SwaggerException : System.Exception { public int StatusCode { get; private set; } @@ -377,7 +377,7 @@ public override string ToString() } } - [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")] + [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.1.0 (NJsonSchema v10.5.2.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 fd7c36aec5..6cd2cbb434 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 f21d97c413..acb44f43f7 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 a07e2c9f74..6435b9a9b2 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 0ffb24450c..fa823ef60d 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 6428c65a66..74471ba4fa 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 761b64494f..c2884facb2 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 abc4e15f70..25494eb052 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 7d5a2b3117..a44c764bee 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.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 4ad8c14c3b..57e68ca880 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) +// Generated using the NSwag toolchain v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org) // //---------------------- // ReSharper disable InconsistentNaming diff --git a/src/NSwag.MSBuild/NSwag.MSBuild.nuspec b/src/NSwag.MSBuild/NSwag.MSBuild.nuspec index fd231828a7..2978a95e77 100644 --- a/src/NSwag.MSBuild/NSwag.MSBuild.nuspec +++ b/src/NSwag.MSBuild/NSwag.MSBuild.nuspec @@ -2,7 +2,7 @@ NSwag.MSBuild - 13.14.0 + 13.14.1 Rico Suter Rico Suter false diff --git a/src/NSwag.Npm/README.md b/src/NSwag.Npm/README.md index cddf0891e4..d12538194c 100644 --- a/src/NSwag.Npm/README.md +++ b/src/NSwag.Npm/README.md @@ -44,11 +44,15 @@ To specify what .NET Core binaries to execute, either use (default) or nswag version /runtime:NetCore31 - + or nswag version /runtime:Net50 +or + + nswag version /runtime:Net60 + ## Development Run the following command to compile and copy the current NSwag console binaries into the NPM module directory `binaries` directory: diff --git a/src/NSwag.Npm/package-lock.json b/src/NSwag.Npm/package-lock.json index 47e8642956..7987accc01 100644 --- a/src/NSwag.Npm/package-lock.json +++ b/src/NSwag.Npm/package-lock.json @@ -1,5 +1,5 @@ { "name": "nswag", - "version": "13.14.0", + "version": "13.14.1", "lockfileVersion": 1 } diff --git a/src/NSwag.Npm/package.json b/src/NSwag.Npm/package.json index 0321f87cac..2fa6f2407e 100644 --- a/src/NSwag.Npm/package.json +++ b/src/NSwag.Npm/package.json @@ -1,6 +1,6 @@ { "name": "nswag", - "version": "13.14.0", + "version": "13.14.1", "optionalDependencies": {}, "repository": { "type": "git", diff --git a/src/NSwag.Sample.NET50/Program.cs b/src/NSwag.Sample.NET50/Program.cs index 9a09ac918e..6e50522ef2 100644 --- a/src/NSwag.Sample.NET50/Program.cs +++ b/src/NSwag.Sample.NET50/Program.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -namespace NSwag.Sample.NETCore31 +namespace NSwag.Sample.NET50 { public class Program { diff --git a/src/NSwag.Sample.NET50/Startup.cs b/src/NSwag.Sample.NET50/Startup.cs index 24fcdc6ef8..230ba3cd86 100644 --- a/src/NSwag.Sample.NET50/Startup.cs +++ b/src/NSwag.Sample.NET50/Startup.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json.Converters; using NJsonSchema.Generation; -namespace NSwag.Sample.NETCore31 +namespace NSwag.Sample.NET50 { public class Startup { diff --git a/src/NSwag.Sample.NET50/nswag.json b/src/NSwag.Sample.NET50/nswag.json index 08df0b27c5..4bda4cf1ce 100644 --- a/src/NSwag.Sample.NET50/nswag.json +++ b/src/NSwag.Sample.NET50/nswag.json @@ -3,7 +3,7 @@ "defaultVariables": null, "documentGenerator": { "aspNetCoreToOpenApi": { - "project": "NSwag.Sample.NETCore31.csproj", + "project": "NSwag.Sample.NET50.csproj", "msBuildProjectExtensionsPath": null, "configuration": null, "runtime": null, diff --git a/src/NSwag.Sample.NET50/openapi.json b/src/NSwag.Sample.NET50/openapi.json index 91675a5439..2f0a03d2be 100644 --- a/src/NSwag.Sample.NET50/openapi.json +++ b/src/NSwag.Sample.NET50/openapi.json @@ -1,5 +1,5 @@ -{ - "x-generator": "NSwag v13.1.4.0 (NJsonSchema v10.0.27.0 (Newtonsoft.Json v9.0.0.0))", +{ + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v12.0.0.0))", "openapi": "3.0.0", "info": { "title": "My Title", @@ -77,7 +77,7 @@ "content": { "application/json": { "schema": { - "type": "string" + "$ref": "#/components/schemas/TestEnum" } } } @@ -197,6 +197,18 @@ "format": "date-time" } } + }, + "TestEnum": { + "type": "string", + "description": "", + "x-enumNames": [ + "Foo", + "Bar" + ], + "enum": [ + "Foo", + "Bar" + ] } } } diff --git a/src/NSwag.Sample.NET60/Program.cs b/src/NSwag.Sample.NET60/Program.cs index 9a09ac918e..0fe6db3c92 100644 --- a/src/NSwag.Sample.NET60/Program.cs +++ b/src/NSwag.Sample.NET60/Program.cs @@ -1,7 +1,8 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; +using NSwag.Sample.NET60; -namespace NSwag.Sample.NETCore31 +namespace NSwag.Sample.NET60 { public class Program { diff --git a/src/NSwag.Sample.NET60/Startup.cs b/src/NSwag.Sample.NET60/Startup.cs index 24fcdc6ef8..3d922f5ed3 100644 --- a/src/NSwag.Sample.NET60/Startup.cs +++ b/src/NSwag.Sample.NET60/Startup.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json.Converters; using NJsonSchema.Generation; -namespace NSwag.Sample.NETCore31 +namespace NSwag.Sample.NET60 { public class Startup { diff --git a/src/NSwag.Sample.NET60/nswag.json b/src/NSwag.Sample.NET60/nswag.json index 08df0b27c5..cb90ced76a 100644 --- a/src/NSwag.Sample.NET60/nswag.json +++ b/src/NSwag.Sample.NET60/nswag.json @@ -1,9 +1,9 @@ { - "runtime": "Net50", + "runtime": "Net60", "defaultVariables": null, "documentGenerator": { "aspNetCoreToOpenApi": { - "project": "NSwag.Sample.NETCore31.csproj", + "project": "NSwag.Sample.NET60.csproj", "msBuildProjectExtensionsPath": null, "configuration": null, "runtime": null, diff --git a/src/NSwag.Sample.NET60/openapi.json b/src/NSwag.Sample.NET60/openapi.json index 91675a5439..2452fd0516 100644 --- a/src/NSwag.Sample.NET60/openapi.json +++ b/src/NSwag.Sample.NET60/openapi.json @@ -1,5 +1,5 @@ -{ - "x-generator": "NSwag v13.1.4.0 (NJsonSchema v10.0.27.0 (Newtonsoft.Json v9.0.0.0))", +{ + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v13.0.0.0))", "openapi": "3.0.0", "info": { "title": "My Title", @@ -77,7 +77,7 @@ "content": { "application/json": { "schema": { - "type": "string" + "$ref": "#/components/schemas/TestEnum" } } } @@ -197,6 +197,18 @@ "format": "date-time" } } + }, + "TestEnum": { + "type": "integer", + "description": "", + "x-enumNames": [ + "Foo", + "Bar" + ], + "enum": [ + 0, + 1 + ] } } } diff --git a/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json b/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json index 5315bc9c78..a68453a495 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.14.0.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "ljlkjlkj", diff --git a/src/NSwag.Sample.NETCore21/swagger_project_cli.json b/src/NSwag.Sample.NETCore21/swagger_project_cli.json index 074e81595a..e670406910 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.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/src/NSwag.Sample.NETCore31/openapi.json b/src/NSwag.Sample.NETCore31/openapi.json index df5ac0602c..2f0a03d2be 100644 --- a/src/NSwag.Sample.NETCore31/openapi.json +++ b/src/NSwag.Sample.NETCore31/openapi.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v12.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v12.0.0.0))", "openapi": "3.0.0", "info": { "title": "My Title", diff --git a/src/NSwag.Sample.NetGlobalAsax/swagger.json b/src/NSwag.Sample.NetGlobalAsax/swagger.json index 51edeb9a5a..7612fe99de 100644 --- a/src/NSwag.Sample.NetGlobalAsax/swagger.json +++ b/src/NSwag.Sample.NetGlobalAsax/swagger.json @@ -1,5 +1,5 @@ { - "x-generator": "NSwag v13.14.0.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))", + "x-generator": "NSwag v13.14.1.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))", "swagger": "2.0", "info": { "title": "My Title", diff --git a/src/NSwagStudio.Chocolatey/NSwagStudio.nuspec b/src/NSwagStudio.Chocolatey/NSwagStudio.nuspec index 6d279c2f99..b60e7c91f4 100644 --- a/src/NSwagStudio.Chocolatey/NSwagStudio.nuspec +++ b/src/NSwagStudio.Chocolatey/NSwagStudio.nuspec @@ -3,7 +3,7 @@ NSwagStudio NSwagStudio - 13.14.0 + 13.14.1 Rico Suter Rico Suter false diff --git a/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj b/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj index c179f2f8c4..a9cf07dcda 100644 --- a/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj +++ b/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj @@ -66,6 +66,7 @@ xcopy "$(MSBuildProjectDirectory)/../NSwag.ConsoleCore/bin/$(ConfigurationName)/netcoreapp2.1/publish" "$(MSBuildProjectDirectory)/../NSwagStudio/bin/$(ConfigurationName)/NetCore21" /E /I /y xcopy "$(MSBuildProjectDirectory)/../NSwag.ConsoleCore/bin/$(ConfigurationName)/netcoreapp3.1/publish" "$(MSBuildProjectDirectory)/../NSwagStudio/bin/$(ConfigurationName)/NetCore31" /E /I /y xcopy "$(MSBuildProjectDirectory)/../NSwag.ConsoleCore/bin/$(ConfigurationName)/net5.0/publish" "$(MSBuildProjectDirectory)/../NSwagStudio/bin/$(ConfigurationName)/Net50" /E /I /y + xcopy "$(MSBuildProjectDirectory)/../NSwag.ConsoleCore/bin/$(ConfigurationName)/net6.0/publish" "$(MSBuildProjectDirectory)/../NSwagStudio/bin/$(ConfigurationName)/Net60" /E /I /y \ No newline at end of file diff --git a/src/NSwagStudio/Properties/AssemblyInfo.cs b/src/NSwagStudio/Properties/AssemblyInfo.cs index 4e84fa878f..69cd9a159b 100644 --- a/src/NSwagStudio/Properties/AssemblyInfo.cs +++ b/src/NSwagStudio/Properties/AssemblyInfo.cs @@ -5,4 +5,4 @@ [assembly: AssemblyCompany("Rico Suter")] [assembly: AssemblyProduct("NSwagStudio")] [assembly: AssemblyCopyright("Copyright © Rico Suter, 2016")] -[assembly: AssemblyVersion("13.14.0")] +[assembly: AssemblyVersion("13.14.1")] diff --git a/src/NSwagStudio/nswag.cmd b/src/NSwagStudio/nswag.cmd index b3ef3c01ce..ed0aa436ec 100644 --- a/src/NSwagStudio/nswag.cmd +++ b/src/NSwagStudio/nswag.cmd @@ -21,5 +21,10 @@ IF NOT "%args:/runtime:net50=%" == "%args%" ( GOTO end ) +IF NOT "%args:/runtime:net60=%" == "%args%" ( + dotnet "%~dp0/Net60/dotnet-nswag.dll" %* + GOTO end +) + "%~dp0/Win/nswag.exe" %* :end \ No newline at end of file