diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d95cadc38..dfc72bea84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,9 +28,9 @@ on: - '!**/*.md' jobs: - windows-2022: - name: windows-2022 - runs-on: windows-2022 + windows-latest: + name: windows-latest + runs-on: windows-latest steps: - uses: actions/checkout@v1 - uses: actions/setup-dotnet@v1 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e0629ce084..0bb9213dba 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -26,9 +26,9 @@ on: - '!**/*.md' jobs: - windows-2022: - name: windows-2022 - runs-on: windows-2022 + windows-latest: + name: windows-latest + runs-on: windows-latest steps: - uses: actions/checkout@v1 - uses: actions/setup-dotnet@v1 diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 0a1b38ef2e..5be45dd6da 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -8,7 +8,7 @@ "properties": { "ChocoApiKey": { "type": "string", - "default": "Secrets must be entered via 'nuke :secret [profile]'" + "default": "Secrets must be entered via 'nuke :secrets [profile]'" }, "Configuration": { "type": "string", @@ -48,7 +48,7 @@ }, "MyGetApiKey": { "type": "string", - "default": "Secrets must be entered via 'nuke :secret [profile]'" + "default": "Secrets must be entered via 'nuke :secrets [profile]'" }, "NoLogo": { "type": "boolean", @@ -56,11 +56,11 @@ }, "NpmAuthToken": { "type": "string", - "default": "Secrets must be entered via 'nuke :secret [profile]'" + "default": "Secrets must be entered via 'nuke :secrets [profile]'" }, "NuGetApiKey": { "type": "string", - "default": "Secrets must be entered via 'nuke :secret [profile]'" + "default": "Secrets must be entered via 'nuke :secrets [profile]'" }, "Partition": { "type": "string", diff --git a/build.ps1 b/build.ps1 index 1c774e5254..8c52d631ce 100644 --- a/build.ps1 +++ b/build.ps1 @@ -63,7 +63,7 @@ else { $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe" } -Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)" +Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)" ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet } ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments } diff --git a/build.sh b/build.sh index e8961f9988..1f3ba09e20 100755 --- a/build.sh +++ b/build.sh @@ -56,7 +56,7 @@ else export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet" fi -echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)" +echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)" "$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet "$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@" diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs index 2e4fad30a3..1dfa1f4195 100644 --- a/build/Build.CI.GitHubActions.cs +++ b/build/Build.CI.GitHubActions.cs @@ -6,7 +6,7 @@ [CustomGitHubActionsAttribute( "pr", - GitHubActionsImage.WindowsServer2022, + GitHubActionsImage.WindowsLatest, // GitHubActionsImage.UbuntuLatest, // GitHubActionsImage.MacOsLatest, OnPullRequestBranches = new[] { "master", "main" }, @@ -18,7 +18,7 @@ ] [CustomGitHubActionsAttribute( "build", - GitHubActionsImage.WindowsServer2022, + GitHubActionsImage.WindowsLatest, // GitHubActionsImage.UbuntuLatest, // GitHubActionsImage.MacOsLatest, OnPushBranches = new[] { "master", "main" }, diff --git a/build/Build.cs b/build/Build.cs index 9ec68a4b6f..b3f03de8c0 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -18,7 +18,6 @@ using Nuke.Common.Utilities.Collections; using static Nuke.Common.IO.FileSystemTasks; -using static Nuke.Common.Logger; using static Nuke.Common.Tooling.ProcessTasks; using static Nuke.Common.Tools.Chocolatey.ChocolateyTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; @@ -124,7 +123,6 @@ protected override void OnBuildInitialized() .Executes(() => { Chocolatey("install wixtoolset -y"); - Chocolatey("install netfx-4.6.1-devpack -y"); NpmInstall(x => x .EnableGlobal() .AddPackages("dotnettools") @@ -235,9 +233,7 @@ protected override void OnBuildInitialized() // project name + runtime pairs var dotnetTargets = new[] { - ("NSwag.Sample.NETCore21", "NetCore21"), ("NSwag.Sample.NETCore31", "NetCore31"), - ("NSwag.Sample.NET50", "Net50"), ("NSwag.Sample.NET60", "Net60"), ("NSwag.Sample.NET60Minimal", "Net60") }; @@ -353,23 +349,21 @@ void PublishConsoleProject(Nuke.Common.ProjectModel.Project project, string[] ta } } - PublishConsoleProject(consoleX86Project, new[] { "net461" }); - PublishConsoleProject(consoleProject, new[] { "net461" }); - PublishConsoleProject(consoleCoreProject, new[] { "netcoreapp2.1", "netcoreapp3.1", "net5.0", "net6.0" }); + PublishConsoleProject(consoleX86Project, new[] { "net462" }); + PublishConsoleProject(consoleProject, new[] { "net462" }); + PublishConsoleProject(consoleCoreProject, new[] { "netcoreapp3.1", "net6.0" }); void CopyConsoleBinaries(AbsolutePath target) { // take just exe from X86 as other files are shared with console project - var consoleX86Directory = consoleX86Project.Directory / "bin" / Configuration / "net461" / "publish"; + var consoleX86Directory = consoleX86Project.Directory / "bin" / Configuration / "net462" / "publish"; CopyFileToDirectory(consoleX86Directory / "NSwag.x86.exe", target / "Win"); CopyFileToDirectory(consoleX86Directory / "NSwag.x86.exe.config", target / "Win"); - CopyDirectoryRecursively(consoleProject.Directory / "bin" / Configuration / "net461" / "publish", target / "Win", DirectoryExistsPolicy.Merge); + CopyDirectoryRecursively(consoleProject.Directory / "bin" / Configuration / "net462" / "publish", target / "Win", DirectoryExistsPolicy.Merge); var consoleCoreDirectory = consoleCoreProject.Directory / "bin" / Configuration; - CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp2.1" / "publish", target / "NetCore21"); CopyDirectoryRecursively(consoleCoreDirectory / "netcoreapp3.1" / "publish", target / "NetCore31"); - CopyDirectoryRecursively(consoleCoreDirectory / "net5.0" / "publish", target / "Net50"); CopyDirectoryRecursively(consoleCoreDirectory / "net6.0" / "publish", target / "Net60"); } diff --git a/build/_build.csproj b/build/_build.csproj index de45e833a9..be5a82b1b0 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 8fd9fe3ba6..4c7a807106 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - 13.15.10 + 13.16.0 Rico Suter Copyright © Rico Suter, 2021 diff --git a/src/NSwag.Annotations/NSwag.Annotations.csproj b/src/NSwag.Annotations/NSwag.Annotations.csproj index 460c52189d..3e74edcaca 100644 --- a/src/NSwag.Annotations/NSwag.Annotations.csproj +++ b/src/NSwag.Annotations/NSwag.Annotations.csproj @@ -1,11 +1,8 @@  - netstandard1.0;net45;netstandard2.0 + net462;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - - \ No newline at end of file diff --git a/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets b/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets index f4c085820b..a74127f7bd 100644 --- a/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets +++ b/src/NSwag.ApiDescription.Client/NSwag.ApiDescription.Client.targets @@ -4,8 +4,6 @@ <_NSwagCommand>$(NSwagExe) <_NSwagCommand Condition="'$(MSBuildRuntimeType)' == 'Core'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Core31)/dotnet-nswag.dll" - <_NSwagCommand - Condition="'$(TargetFramework)' == 'net5.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net50)/dotnet-nswag.dll" <_NSwagCommand Condition="'$(TargetFramework)' == 'net6.0'">dotnet --roll-forward-on-no-candidate-fx 2 "$(NSwagDir_Net60)/dotnet-nswag.dll" diff --git a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj index 01b044f785..8ad2acd10c 100644 --- a/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj +++ b/src/NSwag.AspNet.Owin/NSwag.AspNet.Owin.csproj @@ -1,9 +1,8 @@  - net45 - - + net462 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + $(DefineConstants);AspNetOwin @@ -17,12 +16,6 @@ - - TRACE;DEBUG;AspNetOwin;NET45 - - - TRACE;RELEASE;AspNetOwin;NET45 - diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj index 6ad513ba63..b80e51c749 100644 --- a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj +++ b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj @@ -1,13 +1,10 @@  - net45 + net462 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - TRACE;DEBUG;NET45 - 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 bfe33ec8e8..2909459193 100644 --- a/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj +++ b/src/NSwag.AspNetCore.Launcher.x86/NSwag.AspNetCore.Launcher.x86.csproj @@ -1,6 +1,6 @@  - net461 + net462 x86 Exe false diff --git a/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj b/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj index b744ad5f09..6e35fa8d45 100644 --- a/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj +++ b/src/NSwag.AspNetCore.Launcher/NSwag.AspNetCore.Launcher.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net461 - x64 + netcoreapp3.1;net462 + x64 Exe false diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj index 6914d671cc..4d5bc4cbb5 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj @@ -1,6 +1,6 @@  - net461;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0 + net462;netstandard2.0;netcoreapp3.1;net6.0 Swagger Documentation AspNetCore NetCore TypeScript CodeGen $(MSBuildProjectName).nuspec symbols.nupkg @@ -29,7 +29,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec b/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec index 563fb5af3c..4f7633f0f9 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec @@ -11,7 +11,7 @@ NuGetIcon.png - + @@ -23,21 +23,6 @@ - - - - - - - - - - - - - - - @@ -61,15 +46,6 @@ - - - - - - - - - @@ -85,16 +61,12 @@ - - - - + + - - diff --git a/src/NSwag.AssemblyLoader.Tests/NSwag.AssemblyLoader.Tests.csproj b/src/NSwag.AssemblyLoader.Tests/NSwag.AssemblyLoader.Tests.csproj index a9bed4490e..6d6fb99ef6 100644 --- a/src/NSwag.AssemblyLoader.Tests/NSwag.AssemblyLoader.Tests.csproj +++ b/src/NSwag.AssemblyLoader.Tests/NSwag.AssemblyLoader.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;net461 + netcoreapp3.1;net462 false diff --git a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj index c354c075d6..b919582a1f 100644 --- a/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj +++ b/src/NSwag.AssemblyLoader/NSwag.AssemblyLoader.csproj @@ -1,6 +1,6 @@  - netstandard1.6;net461;netstandard2.0 + net462;netstandard2.0 $(NoWarn),1591 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -11,7 +11,7 @@ - + diff --git a/src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj b/src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj index 720d329731..b8a2215930 100644 --- a/src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj +++ b/src/NSwag.CodeGeneration.CSharp.Tests/NSwag.CodeGeneration.CSharp.Tests.csproj @@ -1,10 +1,9 @@ - + - netcoreapp2.1 + netcoreapp3.1 - diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj index 4402b44ef9..081a11bdc3 100644 --- a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj +++ b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj @@ -1,6 +1,6 @@  - net461;netstandard2.0 + net462;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -8,7 +8,7 @@ - + diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj index 878732e56f..c396b585dc 100644 --- a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj +++ b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj @@ -1,10 +1,9 @@  - netcoreapp2.1 + netcoreapp3.1 - diff --git a/src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj b/src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj index fbf62de773..7ff94f75ea 100644 --- a/src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj +++ b/src/NSwag.CodeGeneration.TypeScript.Tests/NSwag.CodeGeneration.TypeScript.Tests.csproj @@ -1,10 +1,9 @@ - + - netcoreapp2.1 + netcoreapp3.1 - diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj index 5d29b426b6..555d1b5893 100644 --- a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj +++ b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj @@ -1,6 +1,6 @@  - net461;netstandard2.0 + net462;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -8,7 +8,7 @@ - + diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj index 96e017027e..55242ab340 100644 --- a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj +++ b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj @@ -1,6 +1,6 @@  - net461;netstandard2.0 + net462;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -10,7 +10,7 @@ - + diff --git a/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs b/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs index 9002332e57..2656f44166 100644 --- a/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs +++ b/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs @@ -124,7 +124,7 @@ public override async Task RunAsync(CommandLineProcessor processor, ICon var args = new List(); string executable; -#if NET461 +#if NET462 var toolDirectory = AppDomain.CurrentDomain.BaseDirectory; if (!Directory.Exists(toolDirectory)) { diff --git a/src/NSwag.Commands/Commands/IsolatedCommandBase.cs b/src/NSwag.Commands/Commands/IsolatedCommandBase.cs index bb4f1d661a..4732d3967b 100644 --- a/src/NSwag.Commands/Commands/IsolatedCommandBase.cs +++ b/src/NSwag.Commands/Commands/IsolatedCommandBase.cs @@ -99,7 +99,7 @@ private static string[] LoadDefaultNugetCache() return new[] { Path.GetFullPath(path) }; } -#if NET461 +#if NET462 public IEnumerable GetAssemblies(string assemblyDirectory) { var codeBaseDirectory = Path.GetDirectoryName(new Uri(typeof(IsolatedCommandBase<>).GetTypeInfo().Assembly.CodeBase).LocalPath); @@ -129,7 +129,7 @@ public IEnumerable GetAssemblies(string assemblyDirectory) public IEnumerable GetBindingRedirects() { -#if NET461 +#if NET462 yield return new BindingRedirect("Newtonsoft.Json", typeof(JToken), "30ad4fe6b2a6aeed"); yield return new BindingRedirect("Namotion.Reflection", typeof(ContextualType), "c2f9c3bdfae56102"); yield return new BindingRedirect("NJsonSchema", typeof(JsonSchema), "c2f9c3bdfae56102"); diff --git a/src/NSwag.Commands/NSwag.Commands.csproj b/src/NSwag.Commands/NSwag.Commands.csproj index 9ed5377741..70c3365336 100644 --- a/src/NSwag.Commands/NSwag.Commands.csproj +++ b/src/NSwag.Commands/NSwag.Commands.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 + net462;netcoreapp3.1;net6.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn),618,1591 @@ -11,14 +11,6 @@ - - - - - - - - @@ -26,13 +18,6 @@ - - - - - - - @@ -40,7 +25,7 @@ - + @@ -53,7 +38,7 @@ - + diff --git a/src/NSwag.Commands/NSwagDocument.cs b/src/NSwag.Commands/NSwagDocument.cs index ae26af3159..dfa833dd95 100644 --- a/src/NSwag.Commands/NSwagDocument.cs +++ b/src/NSwag.Commands/NSwagDocument.cs @@ -25,7 +25,7 @@ namespace NSwag.Commands /// public class NSwagDocument : NSwagDocumentBase { -#if NET461 +#if NET462 /// Gets or sets the root binary directory where the command line executables loaded from. public static string RootBinaryDirectory { get; set; } = @@ -305,21 +305,12 @@ private string GetDocumentDirectory() private string GetArgumentsPrefix() { -#if NET461 - +#if NET462 var runtime = Runtime != Runtime.Default ? Runtime : RuntimeUtilities.CurrentRuntime; - if (runtime == Runtime.NetCore21) - { - return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "NetCore21/dotnet-nswag.dll") + "\" "; - } - else if (runtime == Runtime.NetCore31) + if (runtime == Runtime.NetCore31) { return "\"" + System.IO.Path.Combine(RootBinaryDirectory, "NetCore31/dotnet-nswag.dll") + "\" "; } - else if (runtime == Runtime.Net50) - { - 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") + "\" "; @@ -331,7 +322,7 @@ private string GetArgumentsPrefix() private string GetProgramName() { -#if NET461 +#if NET462 var runtime = Runtime != Runtime.Default ? Runtime : RuntimeUtilities.CurrentRuntime; if (runtime == Runtime.WinX64 || runtime == Runtime.Debug) diff --git a/src/NSwag.Commands/NSwagDocumentBase.cs b/src/NSwag.Commands/NSwagDocumentBase.cs index 4948d3e25b..46bbd4b8ca 100644 --- a/src/NSwag.Commands/NSwagDocumentBase.cs +++ b/src/NSwag.Commands/NSwagDocumentBase.cs @@ -57,7 +57,7 @@ protected NSwagDocumentBase() public abstract Task ExecuteAsync(); /// Gets or sets the runtime where the document should be processed. - public Runtime Runtime { get; set; } = Runtime.NetCore21; + public Runtime Runtime { get; set; } = Runtime.NetCore31; /// Gets or sets the default variables. public string DefaultVariables { get; set; } diff --git a/src/NSwag.Commands/Runtime.cs b/src/NSwag.Commands/Runtime.cs index 78557e6714..ce0c775e15 100644 --- a/src/NSwag.Commands/Runtime.cs +++ b/src/NSwag.Commands/Runtime.cs @@ -20,15 +20,9 @@ public enum Runtime /// Full .NET framework, x86. WinX86, - /// .NET Core 2.1 app. - NetCore21, - /// .NET Core 3.1 app. NetCore31, - /// .NET 5 app. - Net50, - /// .NET 6 app. Net60, diff --git a/src/NSwag.Commands/RuntimeUtilities.cs b/src/NSwag.Commands/RuntimeUtilities.cs index d8dcee38ad..869537f43d 100644 --- a/src/NSwag.Commands/RuntimeUtilities.cs +++ b/src/NSwag.Commands/RuntimeUtilities.cs @@ -25,24 +25,16 @@ public static Runtime CurrentRuntime var framework = PlatformServices.Default.Application.RuntimeFramework; if (framework.Identifier == ".NETCoreApp") { - if (framework.Version.Major == 2) - { - return Runtime.NetCore21; - } - else if (framework.Version.Major >= 6) + if (framework.Version.Major >= 6) { return Runtime.Net60; } - else if (framework.Version.Major >= 5) - { - return Runtime.Net50; - } else if (framework.Version.Major >= 3) { return Runtime.NetCore31; } - return Runtime.NetCore21; + return Runtime.NetCore31; } return IntPtr.Size == 4 ? Runtime.WinX86 : Runtime.WinX64; #endif diff --git a/src/NSwag.Console.x86/NSwag.Console.x86.csproj b/src/NSwag.Console.x86/NSwag.Console.x86.csproj index 50a0134a70..8643f33b88 100644 --- a/src/NSwag.Console.x86/NSwag.Console.x86.csproj +++ b/src/NSwag.Console.x86/NSwag.Console.x86.csproj @@ -1,6 +1,6 @@  - net461 + net462 Exe exe diff --git a/src/NSwag.Console/NSwag.Console.csproj b/src/NSwag.Console/NSwag.Console.csproj index e0e14afc5a..0266f33eb0 100644 --- a/src/NSwag.Console/NSwag.Console.csproj +++ b/src/NSwag.Console/NSwag.Console.csproj @@ -1,6 +1,6 @@  - net461 + net462 Exe exe diff --git a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj index 6fa2ee93f9..4b911d6955 100644 --- a/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj +++ b/src/NSwag.ConsoleCore/NSwag.ConsoleCore.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 + netcoreapp3.1;net6.0 Exe dotnet-nswag NSwag.ConsoleCore @@ -13,23 +13,12 @@ - - - - - - - - - - - diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj index f7afd7dc8e..a3a83fee0e 100644 --- a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj +++ b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj @@ -1,6 +1,6 @@  - netstandard1.3;net45;netstandard2.0 + net462;netstandard2.0 NSwag diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj index 3ec8c29254..aa6c4d346f 100644 --- a/src/NSwag.Core/NSwag.Core.csproj +++ b/src/NSwag.Core/NSwag.Core.csproj @@ -1,6 +1,6 @@  - netstandard1.0;net45;netstandard2.0 + net462;netstandard2.0 NSwag @@ -10,12 +10,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj index 1c2d9ba602..c480514a15 100644 --- a/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj +++ b/src/NSwag.Demo.Web/NSwag.Demo.Web.csproj @@ -14,7 +14,7 @@ Properties NSwag.Demo.Web NSwag.Demo.Web - v4.6.1 + v4.6.2 win true diff --git a/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj b/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj index 58093d529e..a6dba8aded 100644 --- a/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj +++ b/src/NSwag.Generation.AspNetCore.Tests.Web/NSwag.Generation.AspNetCore.Tests.Web.csproj @@ -1,23 +1,13 @@  - net5.0;net6.0;netcoreapp2.1;netcoreapp3.1 + net6.0;netcoreapp3.1 true $(NoWarn),618,1591 - - - - - - - - - - diff --git a/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj b/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj index 3fe3c3ae8f..9f1ee5972a 100644 --- a/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj +++ b/src/NSwag.Generation.AspNetCore.Tests/NSwag.Generation.AspNetCore.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 + netcoreapp3.1;net6.0 $(NoWarn),618,1591 @@ -11,12 +11,7 @@ - - - - - - + @@ -24,10 +19,6 @@ - - - - diff --git a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj index e4be33f3d8..f3cc3cf79e 100644 --- a/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj +++ b/src/NSwag.Generation.AspNetCore/NSwag.Generation.AspNetCore.csproj @@ -1,18 +1,18 @@  - netstandard1.6;net461;netstandard2.0;netcoreapp3.1;net5.0;net6.0 + net462;netstandard2.0;netcoreapp3.1;net6.0 Swagger Documentation AspNetCore $(DefineConstants);ASPNETCORE bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - + - + @@ -22,12 +22,6 @@ - - - - - - diff --git a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj index 42fb75ef96..3f6d93baf4 100644 --- a/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj +++ b/src/NSwag.Generation.WebApi/NSwag.Generation.WebApi.csproj @@ -1,7 +1,7 @@  - netstandard1.0;net45;netstandard2.0 + net462;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -9,7 +9,7 @@ - + diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj index dd08cfac10..861e840bd6 100644 --- a/src/NSwag.Generation/NSwag.Generation.csproj +++ b/src/NSwag.Generation/NSwag.Generation.csproj @@ -1,6 +1,6 @@  - netstandard1.0;net45;netstandard2.0 + net462;netstandard2.0 bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml $(NoWarn),618 @@ -11,7 +11,7 @@ - + diff --git a/src/NSwag.Integration.ClientPCL/NSwag.Integration.ClientPCL.csproj b/src/NSwag.Integration.ClientPCL/NSwag.Integration.ClientPCL.csproj index 518362cb56..c87feaa9b8 100644 --- a/src/NSwag.Integration.ClientPCL/NSwag.Integration.ClientPCL.csproj +++ b/src/NSwag.Integration.ClientPCL/NSwag.Integration.ClientPCL.csproj @@ -1,6 +1,6 @@  - netstandard1.4 + netstandard2.0 diff --git a/src/NSwag.Integration.TypeScriptWeb/package-lock.json b/src/NSwag.Integration.TypeScriptWeb/package-lock.json index 4517fe7926..2780378fc5 100644 --- a/src/NSwag.Integration.TypeScriptWeb/package-lock.json +++ b/src/NSwag.Integration.TypeScriptWeb/package-lock.json @@ -1,27 +1,248 @@ { "name": "nswag-integration-typescriptweb", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "name": "nswag-integration-typescriptweb", + "license": "MIT", + "dependencies": { + "@angular/common": "^2.4.8", + "@angular/core": "^2.4.8", + "@angular/http": "^2.4.8", + "@angular/platform-browser": "^2.4.8", + "aurelia-fetch-client": "^1.1.1", + "aurelia-framework": "^1.1.0", + "rxjs": "^5.2.0", + "zone.js": "^0.7.7" + }, + "devDependencies": { + "@types/angular": "^1.6.7", + "@types/jasmine": "^2.5.43", + "@types/jquery": "^2.0.40", + "@types/knockout": "^3.4.39", + "typescript": "^2.2.1" + } + }, + "node_modules/@angular/common": { + "version": "2.4.10", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-2.4.10.tgz", + "integrity": "sha1-o6aC0iKPow7CPdDrV8joh/uiaZc=", + "peerDependencies": { + "@angular/core": "2.4.10" + } + }, + "node_modules/@angular/core": { + "version": "2.4.10", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-2.4.10.tgz", + "integrity": "sha1-C4MgplBlll2ZhkWx9c0892m0Qeo=", + "peerDependencies": { + "rxjs": "^5.0.1", + "zone.js": "^0.7.2" + } + }, + "node_modules/@angular/http": { + "version": "2.4.10", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-2.4.10.tgz", + "integrity": "sha1-/2vq3ls5yYnr8jk8SbNO69Q+lVU=", + "deprecated": "Package no longer supported. Use @angular/common instead, see https://angular.io/guide/deprecations#angularhttp", + "peerDependencies": { + "@angular/core": "2.4.10", + "@angular/platform-browser": "2.4.10", + "rxjs": "^5.0.1" + } + }, + "node_modules/@angular/platform-browser": { + "version": "2.4.10", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-2.4.10.tgz", + "integrity": "sha1-y/JWCBSPtP/vlsxQBbpdez4JOQY=", + "peerDependencies": { + "@angular/common": "2.4.10", + "@angular/core": "2.4.10" + } + }, + "node_modules/@types/angular": { + "version": "1.6.32", + "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.32.tgz", + "integrity": "sha512-xpx7oFBN2oQEwtD80m+aI8wpejzGvlgkgzYD+MpxFTyJtlbwUUUIaJEaEJOtgtF/9Fndt3q6W1qNGf7vO2AUjw==", + "dev": true + }, + "node_modules/@types/jasmine": { + "version": "2.5.54", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.54.tgz", + "integrity": "sha512-B9YofFbUljs19g5gBKUYeLIulsh31U5AK70F41BImQRHEZQGm4GcN922UvnYwkduMqbC/NH+9fruWa/zrqvHIg==", + "dev": true + }, + "node_modules/@types/jquery": { + "version": "2.0.48", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.48.tgz", + "integrity": "sha512-nNLzUrVjaRV/Ds1eHZLYTd7IZxs38cwwLSaqMJj8OTXY8xNUbxSK69bi9cMLvQ7dm/IBeQ1wHwQ0S1uYa0rd2w==", + "dev": true + }, + "node_modules/@types/knockout": { + "version": "3.4.45", + "resolved": "https://registry.npmjs.org/@types/knockout/-/knockout-3.4.45.tgz", + "integrity": "sha512-RgzIhwDtvem3rHxmyMokAEGsPk/b0npoKUgGkIKXiEj89B1TXXbWd1fC8BPxV/CyPg5kLD5QKK24MzXdU6DDvQ==", + "dev": true + }, + "node_modules/aurelia-binding": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/aurelia-binding/-/aurelia-binding-1.2.2.tgz", + "integrity": "sha1-9A2hsxqmgEbTKqBbz69b0/PklxY=", + "dependencies": { + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-task-queue": "^1.0.0" + } + }, + "node_modules/aurelia-dependency-injection": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/aurelia-dependency-injection/-/aurelia-dependency-injection-1.3.2.tgz", + "integrity": "sha1-X5yl3t5qHMxyoIOMmA3z3+eRh1Y=", + "dependencies": { + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0" + } + }, + "node_modules/aurelia-fetch-client": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/aurelia-fetch-client/-/aurelia-fetch-client-1.1.3.tgz", + "integrity": "sha1-O2pLi53kgJ6Za9oSmfBYOMOQewo=" + }, + "node_modules/aurelia-framework": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/aurelia-framework/-/aurelia-framework-1.1.4.tgz", + "integrity": "sha1-TcYwscSCAxZ0ZuXfKHiAP/Qd/2U=", + "dependencies": { + "aurelia-binding": "^1.0.0", + "aurelia-dependency-injection": "^1.0.0", + "aurelia-loader": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-path": "^1.0.0", + "aurelia-task-queue": "^1.0.0", + "aurelia-templating": "^1.0.0" + } + }, + "node_modules/aurelia-loader": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/aurelia-loader/-/aurelia-loader-1.0.0.tgz", + "integrity": "sha1-t4wqKBOqjkQSRyN91m/WLl1OGeo=", + "dependencies": { + "aurelia-metadata": "^1.0.0", + "aurelia-path": "^1.0.0" + } + }, + "node_modules/aurelia-logging": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/aurelia-logging/-/aurelia-logging-1.3.1.tgz", + "integrity": "sha1-s0rnWTcroIdAqxIjOom60VSH/pg=" + }, + "node_modules/aurelia-metadata": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/aurelia-metadata/-/aurelia-metadata-1.0.3.tgz", + "integrity": "sha1-Ho1Z2hiOKHGorXSbpCyoUISj8w4=", + "dependencies": { + "aurelia-pal": "^1.0.0" + } + }, + "node_modules/aurelia-pal": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/aurelia-pal/-/aurelia-pal-1.4.0.tgz", + "integrity": "sha1-EUjyVshUwOAgoKj0Zcv0pu6vkYg=" + }, + "node_modules/aurelia-path": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/aurelia-path/-/aurelia-path-1.1.7.tgz", + "integrity": "sha512-D6/Tz8jE8b2+Y8Pt6P/fxF6xfJGef+TA6YEljzo1kEzyzbxIvwfqc7pK6i/XGY3LowlumPqrhxkfMjPxLpFIcA==" + }, + "node_modules/aurelia-task-queue": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aurelia-task-queue/-/aurelia-task-queue-1.2.0.tgz", + "integrity": "sha1-kjOsMOwQtiARO7qzcCSijmH1mGU=", + "dependencies": { + "aurelia-pal": "^1.0.0" + } + }, + "node_modules/aurelia-templating": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/aurelia-templating/-/aurelia-templating-1.4.2.tgz", + "integrity": "sha1-R5zkdwWglf1jbgl1yct5y+5+18s=", + "dependencies": { + "aurelia-binding": "^1.0.0", + "aurelia-dependency-injection": "^1.0.0", + "aurelia-loader": "^1.0.0", + "aurelia-logging": "^1.0.0", + "aurelia-metadata": "^1.0.0", + "aurelia-pal": "^1.0.0", + "aurelia-path": "^1.0.0", + "aurelia-task-queue": "^1.1.0" + } + }, + "node_modules/rxjs": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz", + "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==", + "dependencies": { + "symbol-observable": "^1.0.1" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/symbol-observable": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", + "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/typescript": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", + "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/zone.js": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.7.8.tgz", + "integrity": "sha1-Tz/og01EWX8mOQU6D6Q43zT//e0=" + } + }, "dependencies": { "@angular/common": { "version": "2.4.10", "resolved": "https://registry.npmjs.org/@angular/common/-/common-2.4.10.tgz", - "integrity": "sha1-o6aC0iKPow7CPdDrV8joh/uiaZc=" + "integrity": "sha1-o6aC0iKPow7CPdDrV8joh/uiaZc=", + "requires": {} }, "@angular/core": { "version": "2.4.10", "resolved": "https://registry.npmjs.org/@angular/core/-/core-2.4.10.tgz", - "integrity": "sha1-C4MgplBlll2ZhkWx9c0892m0Qeo=" + "integrity": "sha1-C4MgplBlll2ZhkWx9c0892m0Qeo=", + "requires": {} }, "@angular/http": { "version": "2.4.10", "resolved": "https://registry.npmjs.org/@angular/http/-/http-2.4.10.tgz", - "integrity": "sha1-/2vq3ls5yYnr8jk8SbNO69Q+lVU=" + "integrity": "sha1-/2vq3ls5yYnr8jk8SbNO69Q+lVU=", + "requires": {} }, "@angular/platform-browser": { "version": "2.4.10", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-2.4.10.tgz", - "integrity": "sha1-y/JWCBSPtP/vlsxQBbpdez4JOQY=" + "integrity": "sha1-y/JWCBSPtP/vlsxQBbpdez4JOQY=", + "requires": {} }, "@types/angular": { "version": "1.6.32", diff --git a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj index 6365d73cd2..50e2966772 100644 --- a/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj +++ b/src/NSwag.Integration.WebAPI/NSwag.Integration.WebAPI.csproj @@ -13,7 +13,7 @@ Properties NSwag.Integration.WebAPI NSwag.Integration.WebAPI - v4.6.1 + v4.6.2 win true diff --git a/src/NSwag.MSBuild/NSwag.MSBuild.nuspec b/src/NSwag.MSBuild/NSwag.MSBuild.nuspec index 37109c79bf..fc0182f26c 100644 --- a/src/NSwag.MSBuild/NSwag.MSBuild.nuspec +++ b/src/NSwag.MSBuild/NSwag.MSBuild.nuspec @@ -21,15 +21,13 @@ - - - - - + + + + + - - \ No newline at end of file diff --git a/src/NSwag.MSBuild/NSwag.MSBuild.props b/src/NSwag.MSBuild/NSwag.MSBuild.props index bb0a3ad06d..12a37cf0ea 100644 --- a/src/NSwag.MSBuild/NSwag.MSBuild.props +++ b/src/NSwag.MSBuild/NSwag.MSBuild.props @@ -3,15 +3,11 @@ "$(MSBuildThisFileDirectory)../tools/Win/NSwag.exe" "$(MSBuildThisFileDirectory)../tools/Win/NSwag.x86.exe" - dotnet "$(MSBuildThisFileDirectory)../tools/NetCore21/dotnet-nswag.dll" dotnet "$(MSBuildThisFileDirectory)../tools/NetCore31/dotnet-nswag.dll" - dotnet "$(MSBuildThisFileDirectory)../tools/Net50/dotnet-nswag.dll" dotnet "$(MSBuildThisFileDirectory)../tools/Net60/dotnet-nswag.dll" $(MSBuildThisFileDirectory)../tools/Win/ - $(MSBuildThisFileDirectory)../tools/NetCore21/ $(MSBuildThisFileDirectory)../tools/NetCore31/ - $(MSBuildThisFileDirectory)../tools/Net50/ $(MSBuildThisFileDirectory)../tools/Net60/ diff --git a/src/NSwag.Npm/package-lock.json b/src/NSwag.Npm/package-lock.json index c4f3636353..3f2eb7b09c 100644 --- a/src/NSwag.Npm/package-lock.json +++ b/src/NSwag.Npm/package-lock.json @@ -1,5 +1,19 @@ { "name": "nswag", - "version": "13.15.4", - "lockfileVersion": 1 + "version": "13.15.5", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "nswag", + "version": "13.15.5", + "license": "MIT", + "bin": { + "nswag": "bin/nswag.js" + }, + "engines": { + "npm": ">=3.10.8" + } + } + } } diff --git a/src/NSwag.Sample.Common/NSwag.Sample.Common.csproj b/src/NSwag.Sample.Common/NSwag.Sample.Common.csproj index 9eca547297..eb7e0662cf 100644 --- a/src/NSwag.Sample.Common/NSwag.Sample.Common.csproj +++ b/src/NSwag.Sample.Common/NSwag.Sample.Common.csproj @@ -1,7 +1,7 @@  - netstandard1.4 + netstandard2.0 \ No newline at end of file diff --git a/src/NSwag.Sample.NET50/Controllers/ValuesController.cs b/src/NSwag.Sample.NET50/Controllers/ValuesController.cs deleted file mode 100644 index 377079e037..0000000000 --- a/src/NSwag.Sample.NET50/Controllers/ValuesController.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Mvc; - -namespace NSwag.Sample.NET50.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class ValuesController : ControllerBase - { - public class Person - { - public string FirstName { get; set; } = ""; - - public string? MiddleName { get; set; } - - public string LastName { get; set; } = ""; - - public DateTime DayOfBirth { get; set; } - } - - public enum TestEnum - { - Foo, - Bar - } - - [HttpGet] - public ActionResult> Get() - { - return new Person[] { }; - } - - // GET api/values/5 - [HttpGet("{id}")] - public ActionResult Get(int id) - { - return TestEnum.Foo; - } - - // GET api/values/5 - [HttpGet("{id}/foo")] - public ActionResult GetFooBar(int id) - { - return "value"; - } - - // POST api/values - [HttpPost] - public void Post([FromBody] string value) - { - } - - // PUT api/values/5 - [HttpPut("{id}")] - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - [HttpDelete("{id}")] - public void Delete(int id) - { - } - } -} diff --git a/src/NSwag.Sample.NET50/NSwag.Sample.NET50.csproj b/src/NSwag.Sample.NET50/NSwag.Sample.NET50.csproj deleted file mode 100644 index 69d950cd98..0000000000 --- a/src/NSwag.Sample.NET50/NSwag.Sample.NET50.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - net5.0 - enable - 8.0 - - - - - - - - diff --git a/src/NSwag.Sample.NET50/Program.cs b/src/NSwag.Sample.NET50/Program.cs deleted file mode 100644 index 6e50522ef2..0000000000 --- a/src/NSwag.Sample.NET50/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; - -namespace NSwag.Sample.NET50 -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } -} diff --git a/src/NSwag.Sample.NET50/Properties/launchSettings.json b/src/NSwag.Sample.NET50/Properties/launchSettings.json deleted file mode 100644 index 50ee08064c..0000000000 --- a/src/NSwag.Sample.NET50/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:1284/", - "sslPort": 44390 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "NSwag.Sample.NET50": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:5000;https://localhost:5001" - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NET50/Startup.cs b/src/NSwag.Sample.NET50/Startup.cs deleted file mode 100644 index 2487a295b1..0000000000 --- a/src/NSwag.Sample.NET50/Startup.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using NJsonSchema.Generation; -using System.Text.Json.Serialization; - -namespace NSwag.Sample.NET50 -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc(); - - services - .AddControllers() - .AddJsonOptions(options => - { - options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull; - options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()); - }); - - services.AddOpenApiDocument(document => - { - document.Description = "Hello world!"; - document.DefaultReferenceTypeNullHandling = ReferenceTypeNullHandling.NotNull; - }); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseHttpsRedirection(); - app.UseRouting(); - app.UseAuthorization(); - app.UseEndpoints(endpoints => - { - endpoints.MapControllers(); - }); - - app.UseOpenApi(p => p.Path = "/swagger/{documentName}/swagger.yaml"); - app.UseSwaggerUi3(p => p.DocumentPath = "/swagger/{documentName}/swagger.yaml"); - //app.UseApimundo(); - app.UseApimundo(settings => - { - //settings.CompareTo = "a:a:27:25:15:latest"; - settings.DocumentPath = "/swagger/v1/swagger.yaml"; - settings.ApimundoUrl = "https://localhost:5001"; - }); - } - } -} diff --git a/src/NSwag.Sample.NET50/appsettings.Development.json b/src/NSwag.Sample.NET50/appsettings.Development.json deleted file mode 100644 index e203e9407e..0000000000 --- a/src/NSwag.Sample.NET50/appsettings.Development.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/src/NSwag.Sample.NET50/appsettings.json b/src/NSwag.Sample.NET50/appsettings.json deleted file mode 100644 index 7cb5ac8193..0000000000 --- a/src/NSwag.Sample.NET50/appsettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -} diff --git a/src/NSwag.Sample.NET50/nswag.json b/src/NSwag.Sample.NET50/nswag.json deleted file mode 100644 index 4bda4cf1ce..0000000000 --- a/src/NSwag.Sample.NET50/nswag.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "runtime": "Net50", - "defaultVariables": null, - "documentGenerator": { - "aspNetCoreToOpenApi": { - "project": "NSwag.Sample.NET50.csproj", - "msBuildProjectExtensionsPath": null, - "configuration": null, - "runtime": null, - "targetFramework": null, - "noBuild": false, - "verbose": true, - "workingDirectory": null, - "requireParametersWithoutDefault": false, - "apiGroupNames": null, - "defaultPropertyNameHandling": "Default", - "defaultReferenceTypeNullHandling": "Null", - "defaultDictionaryValueReferenceTypeNullHandling": "NotNull", - "defaultResponseReferenceTypeNullHandling": "NotNull", - "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": "v1", - "aspNetCoreEnvironment": null, - "createWebHostBuilderMethod": null, - "startupType": null, - "allowNullableBodyParameters": true, - "output": "openapi.json", - "outputType": "Swagger2", - "assemblyPaths": [], - "assemblyConfig": null, - "referencePaths": [], - "useNuGetCache": false - } - }, - "codeGenerators": {} -} \ No newline at end of file diff --git a/src/NSwag.Sample.NET50/openapi.json b/src/NSwag.Sample.NET50/openapi.json deleted file mode 100644 index b056765f37..0000000000 --- a/src/NSwag.Sample.NET50/openapi.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "x-generator": "NSwag v13.15.5.0 (NJsonSchema v10.6.6.0 (Newtonsoft.Json v12.0.0.0))", - "openapi": "3.0.0", - "info": { - "title": "My Title", - "description": "Hello world!", - "version": "1.0.0" - }, - "paths": { - "/api/Values": { - "get": { - "tags": [ - "Values" - ], - "operationId": "Values_GetAll", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } - } - } - } - } - } - }, - "post": { - "tags": [ - "Values" - ], - "operationId": "Values_Post", - "requestBody": { - "x-name": "value", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - }, - "required": true, - "x-position": 1 - }, - "responses": { - "200": { - "description": "" - } - } - } - }, - "/api/Values/{id}": { - "get": { - "tags": [ - "Values" - ], - "operationId": "Values_Get", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "x-position": 1 - } - ], - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TestEnum" - } - } - } - } - } - }, - "put": { - "tags": [ - "Values" - ], - "operationId": "Values_Put", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "x-position": 1 - } - ], - "requestBody": { - "x-name": "value", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - }, - "required": true, - "x-position": 2 - }, - "responses": { - "200": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Values" - ], - "operationId": "Values_Delete", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "x-position": 1 - } - ], - "responses": { - "200": { - "description": "" - } - } - } - }, - "/api/Values/{id}/foo": { - "get": { - "tags": [ - "Values" - ], - "operationId": "Values_GetFooBar", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "x-position": 1 - } - ], - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - } - }, - "components": { - "schemas": { - "Person": { - "type": "object", - "additionalProperties": false, - "properties": { - "firstName": { - "type": "string" - }, - "middleName": { - "type": "string", - "nullable": true - }, - "lastName": { - "type": "string" - }, - "dayOfBirth": { - "type": "string", - "format": "date-time" - } - } - }, - "TestEnum": { - "type": "string", - "description": "", - "x-enumNames": [ - "Foo", - "Bar" - ], - "enum": [ - "Foo", - "Bar" - ] - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20.Part/NSwag.Sample.NETCore20.Part.csproj b/src/NSwag.Sample.NETCore20.Part/NSwag.Sample.NETCore20.Part.csproj deleted file mode 100644 index 2a377ca6d6..0000000000 --- a/src/NSwag.Sample.NETCore20.Part/NSwag.Sample.NETCore20.Part.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - netcoreapp2.0 - - - - - diff --git a/src/NSwag.Sample.NETCore20.Part/SampleController.cs b/src/NSwag.Sample.NETCore20.Part/SampleController.cs deleted file mode 100644 index e399930843..0000000000 --- a/src/NSwag.Sample.NETCore20.Part/SampleController.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace NSwag.Sample.NETCore20.Part -{ - [Route("/sample")] - public class SampleController : Controller - { - [HttpPost] - public string GetSample() - { - return null; - } - } -} diff --git a/src/NSwag.Sample.NETCore20/NSwag.Sample.NETCore20.csproj b/src/NSwag.Sample.NETCore20/NSwag.Sample.NETCore20.csproj deleted file mode 100644 index d648e88b31..0000000000 --- a/src/NSwag.Sample.NETCore20/NSwag.Sample.NETCore20.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - netcoreapp2.0 - false - - - - %(RecursiveDir)\%(FileName)%(Extension) - - - - - - - - - - - - - diff --git a/src/NSwag.Sample.NETCore20/Output/swagger_new_v2.json b/src/NSwag.Sample.NETCore20/Output/swagger_new_v2.json deleted file mode 100644 index b6f2aaa55e..0000000000 --- a/src/NSwag.Sample.NETCore20/Output/swagger_new_v2.json +++ /dev/null @@ -1,601 +0,0 @@ -{ - "x-generator": "NSwag v11.18.3.0 (NJsonSchema v9.10.67.0 (Newtonsoft.Json v10.0.0.0))", - "swagger": "2.0", - "info": { - "title": "My Title", - "version": "1.0.0" - }, - "host": "localhost:65384", - "schemes": [ - "http" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json", - "text/plain", - "text/json" - ], - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "consumes": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet", - "consumes": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "type": "string" - } - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/Pet" - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetWithFormData", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Age", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Category.Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "string", - "name": "Category.Name", - "in": "formData", - "required": true, - "x-nullable": true - }, - { - "type": "boolean", - "name": "HasVaccinations", - "in": "formData", - "required": true, - "x-nullable": false - }, - { - "type": "string", - "name": "Name", - "in": "formData", - "required": true, - "x-nullable": true - }, - { - "type": "array", - "name": "Images", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Image" - } - }, - { - "type": "array", - "name": "Tags", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Tag" - } - }, - { - "type": "string", - "name": "Status", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "consumes": [ - "multipart/form-data" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/ApiResponse" - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/RequiredAndOptional": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_RequiredAndOptional", - "parameters": [ - { - "type": "integer", - "name": "int_RequiredAndNotNullable", - "in": "query", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "int_RequiredAndNullable", - "in": "query", - "required": true, - "format": "int32", - "x-nullable": true - }, - { - "type": "string", - "name": "string_RequiredAndNullable", - "in": "query", - "required": true, - "x-nullable": true - }, - { - "type": "string", - "name": "string_RequiredAndNotNullable", - "in": "query", - "required": true, - "x-nullable": false - }, - { - "type": "number", - "name": "decimalWithDefault_NotRequiredAndNotNullable", - "in": "query", - "format": "decimal", - "default": 1.0, - "x-nullable": false - }, - { - "type": "number", - "name": "decimalWithDefault_NotRequiredAndNullable", - "in": "query", - "format": "decimal", - "default": 1.0, - "x-nullable": true - }, - { - "type": "string", - "name": "stringWithDefault_NotRequiredAndNullable", - "in": "query", - "default": "foo", - "x-nullable": true - }, - { - "type": "string", - "name": "stringWithDefault_NotRequiredAndNotNullable", - "in": "query", - "default": "foo", - "x-nullable": false - } - ], - "responses": { - "200": { - "description": "" - } - } - } - }, - "/sample": { - "post": { - "tags": [ - "Sample" - ], - "operationId": "Sample_GetSample", - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "string" - } - } - } - } - } - }, - "definitions": { - "Pet": { - "type": "object", - "additionalProperties": false, - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "SerializableError": { - "type": "object", - "additionalProperties": false, - "allOf": [ - { - "type": "object", - "additionalProperties": {} - } - ] - }, - "ApiResponse": { - "type": "object", - "additionalProperties": false, - "required": [ - "code" - ], - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - }, - "securityDefinitions": { - "TEST_HEADER": { - "type": "apiKey", - "description": "TEST_HEADER", - "name": "TEST_HEADER", - "in": "header" - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/Output/swagger_new_v3.json b/src/NSwag.Sample.NETCore20/Output/swagger_new_v3.json deleted file mode 100644 index 844554e4b2..0000000000 --- a/src/NSwag.Sample.NETCore20/Output/swagger_new_v3.json +++ /dev/null @@ -1,728 +0,0 @@ -{ - "x-generator": "NSwag v11.18.3.0 (NJsonSchema v9.10.67.0 (Newtonsoft.Json v10.0.0.0))", - "openapi": "3.0", - "info": { - "title": "My Title", - "version": "1.0.0" - }, - "consumes": [ - "application/json" - ], - "produces": [ - "application/json", - "text/plain", - "text/json" - ], - "servers": [ - { - "url": "http://localhost:65384" - } - ], - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "requestBody": { - "x-name": "pet", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Pet" - } - } - }, - "required": true - }, - "responses": { - "400": { - "x-nullable": true, - "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 - }, - "responses": { - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "parameters": [ - { - "name": "status", - "in": "query", - "required": true, - "schema": { - "type": "array", - "items": { - "type": "string" - } - }, - "collectionFormat": "multi", - "nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Pet" - } - } - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "parameters": [ - { - "name": "category", - "in": "query", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Pet" - } - } - } - } - }, - "400": { - "x-nullable": true, - "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" - }, - "nullable": false - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/Pet" - } - ] - } - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetWithFormData", - "parameters": [ - { - "name": "petId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "Id", - "in": "formData", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "Age", - "in": "formData", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "Category.Id", - "in": "formData", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "Category.Name", - "in": "formData", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - }, - { - "name": "HasVaccinations", - "in": "formData", - "required": true, - "schema": { - "type": "boolean" - }, - "nullable": false - }, - { - "name": "Name", - "in": "formData", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - }, - { - "name": "Images", - "in": "formData", - "required": true, - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Image" - } - }, - "collectionFormat": "multi", - "nullable": true - }, - { - "name": "Tags", - "in": "formData", - "required": true, - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Tag" - } - }, - "collectionFormat": "multi", - "nullable": true - }, - { - "name": "Status", - "in": "formData", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "parameters": [ - { - "name": "petId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "parameters": [ - { - "name": "petId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "required": true, - "schema": { - "type": "file" - }, - "nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/ApiResponse" - } - ] - } - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/RequiredAndOptional": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_RequiredAndOptional", - "parameters": [ - { - "name": "int_RequiredAndNotNullable", - "in": "query", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "int_RequiredAndNullable", - "in": "query", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": true - }, - { - "name": "string_RequiredAndNullable", - "in": "query", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - }, - { - "name": "string_RequiredAndNotNullable", - "in": "query", - "required": true, - "schema": { - "type": "string" - }, - "nullable": false - }, - { - "name": "decimalWithDefault_NotRequiredAndNotNullable", - "in": "query", - "schema": { - "type": "number", - "format": "decimal" - }, - "default": 1.0, - "nullable": false - }, - { - "name": "decimalWithDefault_NotRequiredAndNullable", - "in": "query", - "schema": { - "type": "number", - "format": "decimal" - }, - "default": 1.0, - "nullable": true - }, - { - "name": "stringWithDefault_NotRequiredAndNullable", - "in": "query", - "schema": { - "type": "string" - }, - "default": "foo", - "nullable": true - }, - { - "name": "stringWithDefault_NotRequiredAndNotNullable", - "in": "query", - "schema": { - "type": "string" - }, - "default": "foo", - "nullable": false - } - ], - "responses": { - "200": { - "description": "" - } - } - } - }, - "/sample": { - "post": { - "tags": [ - "Sample" - ], - "operationId": "Sample_GetSample", - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - } - }, - "components": { - "schemas": { - "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", - "items": { - "$ref": "#/components/schemas/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "SerializableError": { - "type": "object", - "additionalProperties": false, - "allOf": [ - { - "type": "object", - "additionalProperties": {} - } - ] - }, - "ApiResponse": { - "type": "object", - "additionalProperties": false, - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/Output/swagger_old_v2.json b/src/NSwag.Sample.NETCore20/Output/swagger_old_v2.json deleted file mode 100644 index 0c60237713..0000000000 --- a/src/NSwag.Sample.NETCore20/Output/swagger_old_v2.json +++ /dev/null @@ -1,501 +0,0 @@ -{ - "x-generator": "NSwag v11.18.3.0 (NJsonSchema v9.10.67.0 (Newtonsoft.Json v10.0.0.0))", - "swagger": "2.0", - "info": { - "title": "My Title", - "version": "1.0.0" - }, - "host": "localhost:65384", - "schemes": [ - "http" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet", - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "type": "string" - } - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/Pet" - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetWithFormData", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "object", - "name": "pet", - "in": "formData", - "x-schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "consumes": [ - "multipart/form-data" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/ApiResponse" - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/RequiredAndOptional": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_RequiredAndOptional", - "parameters": [ - { - "type": "integer", - "name": "int_RequiredAndNotNullable", - "in": "query", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "int_RequiredAndNullable", - "in": "query", - "required": true, - "format": "int32", - "x-nullable": true - }, - { - "type": "string", - "name": "string_RequiredAndNullable", - "in": "query", - "required": true, - "x-nullable": true - }, - { - "type": "string", - "name": "string_RequiredAndNotNullable", - "in": "query", - "required": true, - "x-nullable": false - }, - { - "type": "number", - "name": "decimalWithDefault_NotRequiredAndNotNullable", - "in": "query", - "format": "decimal", - "default": 1.0, - "x-nullable": false - }, - { - "type": "number", - "name": "decimalWithDefault_NotRequiredAndNullable", - "in": "query", - "format": "decimal", - "default": 1.0, - "x-nullable": true - }, - { - "type": "string", - "name": "stringWithDefault_NotRequiredAndNullable", - "in": "query", - "default": "foo", - "x-nullable": true - }, - { - "type": "string", - "name": "stringWithDefault_NotRequiredAndNotNullable", - "in": "query", - "default": "foo", - "x-nullable": false - } - ], - "responses": { - "200": { - "description": "" - } - } - } - } - }, - "definitions": { - "Pet": { - "type": "object", - "additionalProperties": false, - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "SerializableError": { - "type": "object", - "additionalProperties": false, - "allOf": [ - { - "type": "object", - "additionalProperties": {} - } - ] - }, - "ApiResponse": { - "type": "object", - "additionalProperties": false, - "required": [ - "code" - ], - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/Output/swagger_old_v3.json b/src/NSwag.Sample.NETCore20/Output/swagger_old_v3.json deleted file mode 100644 index 7d3d375314..0000000000 --- a/src/NSwag.Sample.NETCore20/Output/swagger_old_v3.json +++ /dev/null @@ -1,619 +0,0 @@ -{ - "x-generator": "NSwag v11.18.3.0 (NJsonSchema v9.10.67.0 (Newtonsoft.Json v10.0.0.0))", - "openapi": "3.0", - "info": { - "title": "My Title", - "version": "1.0.0" - }, - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "servers": [ - { - "url": "http://localhost:65384" - } - ], - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "requestBody": { - "x-name": "pet", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Pet" - } - } - }, - "required": true - }, - "responses": { - "400": { - "x-nullable": true, - "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 - }, - "responses": { - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "parameters": [ - { - "name": "status", - "in": "query", - "schema": { - "type": "array", - "items": { - "type": "string" - } - }, - "collectionFormat": "multi", - "nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Pet" - } - } - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "parameters": [ - { - "name": "category", - "in": "query", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Pet" - } - } - } - } - }, - "400": { - "x-nullable": true, - "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" - }, - "nullable": false - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/Pet" - } - ] - } - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetWithFormData", - "parameters": [ - { - "name": "petId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "pet", - "in": "formData", - "schema": { - "$ref": "#/components/schemas/Pet" - }, - "nullable": true - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "parameters": [ - { - "name": "petId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - } - ], - "responses": { - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "parameters": [ - { - "name": "petId", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "schema": { - "type": "file" - }, - "nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/ApiResponse" - } - ] - } - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "content": { - "application/json": { - "schema": { - "nullable": true, - "oneOf": [ - { - "$ref": "#/components/schemas/SerializableError" - } - ] - } - } - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/RequiredAndOptional": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_RequiredAndOptional", - "parameters": [ - { - "name": "int_RequiredAndNotNullable", - "in": "query", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": false - }, - { - "name": "int_RequiredAndNullable", - "in": "query", - "required": true, - "schema": { - "type": "integer", - "format": "int32" - }, - "nullable": true - }, - { - "name": "string_RequiredAndNullable", - "in": "query", - "required": true, - "schema": { - "type": "string" - }, - "nullable": true - }, - { - "name": "string_RequiredAndNotNullable", - "in": "query", - "required": true, - "schema": { - "type": "string" - }, - "nullable": false - }, - { - "name": "decimalWithDefault_NotRequiredAndNotNullable", - "in": "query", - "schema": { - "type": "number", - "format": "decimal" - }, - "default": 1.0, - "nullable": false - }, - { - "name": "decimalWithDefault_NotRequiredAndNullable", - "in": "query", - "schema": { - "type": "number", - "format": "decimal" - }, - "default": 1.0, - "nullable": true - }, - { - "name": "stringWithDefault_NotRequiredAndNullable", - "in": "query", - "schema": { - "type": "string" - }, - "default": "foo", - "nullable": true - }, - { - "name": "stringWithDefault_NotRequiredAndNotNullable", - "in": "query", - "schema": { - "type": "string" - }, - "default": "foo", - "nullable": false - } - ], - "responses": { - "200": { - "description": "" - } - } - } - } - }, - "components": { - "schemas": { - "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", - "items": { - "$ref": "#/components/schemas/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "additionalProperties": false, - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "SerializableError": { - "type": "object", - "additionalProperties": false, - "allOf": [ - { - "type": "object", - "additionalProperties": {} - } - ] - }, - "ApiResponse": { - "type": "object", - "additionalProperties": false, - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/Program.cs b/src/NSwag.Sample.NETCore20/Program.cs deleted file mode 100644 index 259dc400b9..0000000000 --- a/src/NSwag.Sample.NETCore20/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; - -namespace NSwag.Sample.NETCore20 -{ - public class Program - { - public static void Main(string[] args) - { - BuildWebHost(args).Run(); - } - - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); - } -} diff --git a/src/NSwag.Sample.NETCore20/Properties/launchSettings.json b/src/NSwag.Sample.NETCore20/Properties/launchSettings.json deleted file mode 100644 index 64a4855280..0000000000 --- a/src/NSwag.Sample.NETCore20/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:65384/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "NSwag.Sample.NETCore20": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:65385/" - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/Startup.cs b/src/NSwag.Sample.NETCore20/Startup.cs deleted file mode 100644 index 7999a79832..0000000000 --- a/src/NSwag.Sample.NETCore20/Startup.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System.Reflection; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using NSwag.AspNetCore; -using NSwag.Sample.NETCore20.Part; -using NSwag.Generation.Processors.Security; - -namespace NSwag.Sample.NETCore20 -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - public void ConfigureServices(IServiceCollection services) - { - services.AddMvc(). - AddApplicationPart(typeof(SampleController).GetTypeInfo().Assembly); - - // Add OpenAPI and Swagger DI services and configure documents - - // Adds the NSwag services - services - // Register a Swagger 2.0 document generator - .AddSwaggerDocument(document => - { - document.DocumentName = "swagger"; - // Add operation security scope processor - document.OperationProcessors.Add(new OperationSecurityScopeProcessor("TEST_APIKEY")); - // Add custom document processors, etc. - document.DocumentProcessors.Add(new SecurityDefinitionAppender("TEST_APIKEY", new OpenApiSecurityScheme - { - Type = OpenApiSecuritySchemeType.ApiKey, - Name = "TEST_HEADER", - In = OpenApiSecurityApiKeyLocation.Header, - Description = "TEST_DESCRIPTION" - })); - // Post process the generated document - document.PostProcess = d => d.Info.Title = "Hello world!"; - }) - // Register an OpenAPI 3.0 document generator - .AddOpenApiDocument(document => document.DocumentName = "openapi"); - } - - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseMvc(); - - //// Add OpenAPI and Swagger middlewares to serve documents and web UIs - - // URLs: - // - http://localhost:65384/swagger/v1/swagger.json - // - http://localhost:65384/swagger - // - http://localhost:65384/redoc - // - http://localhost:65384/openapi - // - http://localhost:65384/openapi_redoc - - // Add Swagger 2.0 document serving middleware - app.UseOpenApi(options => - { - options.DocumentName = "swagger"; - options.Path = "/swagger/v1/swagger.json"; - }); - - // Add web UIs to interact with the document - app.UseSwaggerUi3(options => - { - // Define web UI route - options.Path = "/swagger"; - - // Define OpenAPI/Swagger document route (defined with UseSwaggerWithApiExplorer) - options.DocumentPath = "/swagger/v1/swagger.json"; - }); - app.UseReDoc(options => - { - options.Path = "/redoc"; - options.DocumentPath = "/swagger/v1/swagger.json"; - }); - - //// Add OpenAPI 3.0 document serving middleware - app.UseOpenApi(options => - { - options.DocumentName = "openapi"; - options.Path = "/openapi/v1/openapi.json"; - }); - - // Add web UIs to interact with the document - app.UseSwaggerUi3(options => - { - options.Path = "/openapi"; - options.DocumentPath = "/openapi/v1/openapi.json"; - }); - app.UseReDoc(options => - { - options.Path = "/openapi_redoc"; - options.DocumentPath = "/openapi/v1/openapi.json"; - }); - - // Add Swagger UI with multiple documents - app.UseSwaggerUi3(options => - { - // Add multiple OpenAPI/Swagger documents to the Swagger UI 3 web frontend - options.SwaggerRoutes.Add(new SwaggerUi3Route("Swagger", "/swagger/v1/swagger.json")); - options.SwaggerRoutes.Add(new SwaggerUi3Route("Openapi", "/openapi/v1/openapi.json")); - options.SwaggerRoutes.Add(new SwaggerUi3Route("Petstore", "http://petstore.swagger.io/v2/swagger.json")); - - // Define web UI route - options.Path = "/swagger_all"; - }); - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/Update-SwaggerSpecs.ps1 b/src/NSwag.Sample.NETCore20/Update-SwaggerSpecs.ps1 deleted file mode 100644 index 144649d80b..0000000000 --- a/src/NSwag.Sample.NETCore20/Update-SwaggerSpecs.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -Try -{ - New-Item -ItemType directory -Force -Path "$PSScriptRoot/Output" - - Invoke-WebRequest -Uri 'http://localhost:65384/swagger_new_ui/v1/swagger.json' -OutFile "$PSScriptRoot/Output/swagger_new_v2.json" - - Invoke-WebRequest -Uri 'http://localhost:65384/swagger_new_v3/v1/swagger.json' -OutFile "$PSScriptRoot/Output/swagger_new_v3.json" - - Invoke-WebRequest -Uri 'http://localhost:65384/swagger_old_ui/v1/swagger.json' -OutFile "$PSScriptRoot/Output/swagger_old_v2.json" - - Invoke-WebRequest -Uri 'http://localhost:65384/swagger_old_v3/v1/swagger.json' -OutFile "$PSScriptRoot/Output/swagger_old_v3.json" -} -Catch -{ - "Could not download the OpenAPI/Swagger specifications: " - Throw -} - diff --git a/src/NSwag.Sample.NETCore20/appsettings.Development.json b/src/NSwag.Sample.NETCore20/appsettings.Development.json deleted file mode 100644 index fa8ce71a97..0000000000 --- a/src/NSwag.Sample.NETCore20/appsettings.Development.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/src/NSwag.Sample.NETCore20/appsettings.json b/src/NSwag.Sample.NETCore20/appsettings.json deleted file mode 100644 index 26bb0ac7ac..0000000000 --- a/src/NSwag.Sample.NETCore20/appsettings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Logging": { - "IncludeScopes": false, - "Debug": { - "LogLevel": { - "Default": "Warning" - } - }, - "Console": { - "LogLevel": { - "Default": "Warning" - } - } - } -} diff --git a/src/NSwag.Sample.NETCore20/nswag.json b/src/NSwag.Sample.NETCore20/nswag.json deleted file mode 100644 index 60ab8fa8b0..0000000000 --- a/src/NSwag.Sample.NETCore20/nswag.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "runtime": "NetCore21", - "defaultVariables": "", - "documentGenerator": { - "aspNetCoreToOpenApi": { - "project": null, - "msBuildProjectExtensionsPath": null, - "configuration": null, - "runtime": null, - "targetFramework": null, - "noBuild": false, - "verbose": true, - "workingDirectory": null, - "requireParametersWithoutDefault": false, - "apiGroupNames": null, - "defaultPropertyNameHandling": "Default", - "defaultReferenceTypeNullHandling": "Null", - "defaultResponseReferenceTypeNullHandling": "NotNull", - "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": "swagger", - "aspNetCoreEnvironment": null, - "createWebHostBuilderMethod": null, - "startupType": null, - "allowNullableBodyParameters": false, - "output": "swagger.json", - "outputType": "Swagger2", - "assemblyPaths": [ - "bin/Debug/netcoreapp2.0/NSwag.Sample.NETCore20.dll" - ], - "assemblyConfig": null, - "referencePaths": [], - "useNuGetCache": false - } - }, - "codeGenerators": {} -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore20/swagger.json b/src/NSwag.Sample.NETCore20/swagger.json deleted file mode 100644 index a32d73b7b4..0000000000 --- a/src/NSwag.Sample.NETCore20/swagger.json +++ /dev/null @@ -1,758 +0,0 @@ -{ - "x-generator": "NSwag v13.10.8.0 (NJsonSchema v10.3.11.0 (Newtonsoft.Json v11.0.0.0))", - "swagger": "2.0", - "info": { - "title": "Hello world!", - "version": "1.0.0" - }, - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": false - } - ], - "responses": { - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": false - } - ], - "responses": { - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatusAll", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "type": "string" - } - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/pet/findByStatus/{skip}/{sortOrder}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "type": "string" - } - }, - { - "type": "integer", - "name": "skip", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "sortOrder", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/Pet" - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetWithFormData", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Id", - "in": "formData", - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Age", - "in": "formData", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0, - "x-nullable": false - }, - { - "type": "integer", - "name": "Category.Id", - "in": "formData", - "format": "int32", - "x-nullable": false - }, - { - "type": "string", - "name": "Category.Name", - "in": "formData", - "x-nullable": true - }, - { - "type": "boolean", - "name": "HasVaccinations", - "in": "formData", - "x-nullable": false - }, - { - "type": "string", - "name": "Name", - "in": "formData", - "maxLength": 50, - "minLength": 2, - "x-nullable": true - }, - { - "type": "array", - "name": "Images", - "in": "formData", - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Image" - } - }, - { - "type": "array", - "name": "Tags", - "in": "formData", - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Tag" - } - }, - { - "type": "string", - "name": "Status", - "in": "formData", - "x-nullable": true - } - ], - "responses": { - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "string", - "name": "ContentType", - "in": "query", - "x-nullable": true - }, - { - "type": "string", - "name": "ContentDisposition", - "in": "query", - "x-nullable": true - }, - { - "type": "object", - "name": "Headers", - "in": "query", - "x-schema": { - "$ref": "#/definitions/IHeaderDictionary" - }, - "x-nullable": true - }, - { - "type": "integer", - "name": "Length", - "in": "query", - "format": "int64", - "x-nullable": false - }, - { - "type": "string", - "name": "Name", - "in": "query", - "x-nullable": true - }, - { - "type": "string", - "name": "FileName", - "in": "query", - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/ApiResponse" - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/pet/RequiredAndOptional": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_RequiredAndOptional", - "parameters": [ - { - "type": "integer", - "name": "int_RequiredAndNotNullable", - "in": "query", - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "int_RequiredAndNullable", - "in": "query", - "format": "int32", - "x-nullable": true - }, - { - "type": "string", - "name": "string_RequiredAndNullable", - "in": "query", - "x-nullable": true - }, - { - "type": "string", - "name": "string_RequiredAndNotNullable", - "in": "query", - "x-nullable": false - }, - { - "type": "number", - "name": "decimalWithDefault_NotRequiredAndNotNullable", - "in": "query", - "format": "decimal", - "default": 1.0, - "x-nullable": false - }, - { - "type": "number", - "name": "decimalWithDefault_NotRequiredAndNullable", - "in": "query", - "format": "decimal", - "default": 1.0, - "x-nullable": true - }, - { - "type": "string", - "name": "stringWithDefault_NotRequiredAndNullable", - "in": "query", - "default": "foo", - "x-nullable": true - }, - { - "type": "string", - "name": "stringWithDefault_NotRequiredAndNotNullable", - "in": "query", - "default": "foo", - "x-nullable": false - } - ], - "responses": { - "200": { - "description": "" - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - }, - "/sample": { - "post": { - "tags": [ - "Sample" - ], - "operationId": "Sample_GetSample", - "produces": [ - "text/plain", - "application/json", - "text/json" - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "string" - } - } - }, - "security": [ - { - "TEST_APIKEY": [] - } - ] - } - } - }, - "definitions": { - "SerializableError": { - "type": "object", - "additionalProperties": {} - }, - "Pet": { - "type": "object", - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "ApiResponse": { - "type": "object", - "required": [ - "code" - ], - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - }, - "IHeaderDictionary": { - "type": "object", - "x-abstract": true, - "required": [ - "Item" - ], - "properties": { - "Item": { - "type": "array", - "items": { - "additionalProperties": {} - } - }, - "ContentLength": { - "type": "integer", - "format": "int64" - } - } - } - }, - "securityDefinitions": { - "TEST_APIKEY": { - "type": "apiKey", - "description": "TEST_DESCRIPTION", - "name": "TEST_HEADER", - "in": "header" - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/Controllers/PetController.cs b/src/NSwag.Sample.NETCore21/Controllers/PetController.cs deleted file mode 100644 index 9a0e94c010..0000000000 --- a/src/NSwag.Sample.NETCore21/Controllers/PetController.cs +++ /dev/null @@ -1,161 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Net; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.ModelBinding; - -namespace NSwag.Sample -{ - // Intentionally not sharing the controller source code with the 1.1 and 2.0 samples. - // 2.1 introduces enhancements to the programming model for API but expects you to - // write some different code. - // - // This sample is similar to http://petstore.swagger.io/#/ - [ApiController] - [Route("/pet")] - public class PetController : ControllerBase - { - /// - /// Creates an order - /// - /// Order created - /// Order invalid - [HttpPost("createOrder")] - [ProducesResponseType(typeof(int), 201)] - [ProducesResponseType(typeof(IDictionary), 400)] - public void CreateOrder() - { - - } - - [HttpPost] - [Consumes("application/json")] - [Produces("application/json")] - [ProducesResponseType(StatusCodes.Status204NoContent)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - [return: Description("My success response description.")] - public async Task AddPet([FromBody] Pet pet) - { - await Task.Delay(0); - return new EmptyResult(); - } - - [HttpPut] - [Consumes("application/json")] - [Produces("application/json")] - [ProducesResponseType(StatusCodes.Status204NoContent)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - public async Task EditPet([FromBody] Pet pet) - { - if (pet.Id == 0) - { - return NotFound(); - } - - await Task.Delay(0); - return new EmptyResult(); - } - - // 'status' is intended to be an optional query string parameter - // Sample with ActionResult auto-detection - [HttpGet("findByStatus")] - [Produces("application/json")] - public async Task>> FindByStatus(string[] status) - { - await Task.Delay(0); - return new ObjectResult(Array.Empty()); - } - - // Included this extra action not present in http://petstore.swagger.io/#/ - // to represent an action with a required query parameter. - [HttpGet("findByCategory")] - [Produces("application/json")] - [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - public async Task>> FindByCategory([BindRequired] string category) - { - await Task.Delay(0); - return new ObjectResult(Array.Empty()); - } - - [HttpGet("{petId}", Name = "FindPetById")] - [Produces("application/json")] - [ProducesResponseType(typeof(Pet), StatusCodes.Status200OK)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task> FindById(int petId) - { - if (!ModelState.IsValid) - { - return BadRequest(ModelState); - } - - await Task.Delay(0); - if (petId == 0) - { - return NotFound(); - } - - return Ok(new Pet()); - } - - [HttpPost("{petId}")] - [Consumes("application/www-form-url-encoded")] - [Produces("application/json")] - [ProducesResponseType(StatusCodes.Status204NoContent)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task EditPet(int petId, [FromForm] Pet pet) - { - if (petId == 0) - { - return NotFound(); - } - - await Task.Delay(0); - return new EmptyResult(); - } - - [HttpDelete("{petId}")] - [Produces("application/json")] - [ProducesResponseType(StatusCodes.Status204NoContent)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task DeletePet(int petId) - { - if (petId == 0) - { - return NotFound(); - } - - await Task.Delay(0); - return new EmptyResult(); - } - - [HttpPost("{petId}/uploadImage")] - [Consumes("multipart/form-data")] - [Produces("application/json")] - [ProducesResponseType(typeof(ApiResponse), StatusCodes.Status200OK)] - [ProducesResponseType(typeof(SerializableError), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status404NotFound)] - public async Task> UploadImage(int petId, IFormFile file) - { - if (petId == 0) - { - return NotFound(); - } - - await Task.Delay(0); - return Ok(new ApiResponse()); - } - - [HttpPost("file")] - public ActionResult GetFile() - { - return NoContent(); - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/NSwag.Sample.NETCore21.csproj b/src/NSwag.Sample.NETCore21/NSwag.Sample.NETCore21.csproj deleted file mode 100644 index d958c42da8..0000000000 --- a/src/NSwag.Sample.NETCore21/NSwag.Sample.NETCore21.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - netcoreapp2.1 - true - - $(NoWarn),1591 - - - - - Models\%(RecursiveDir)\%(FileName)%(Extension) - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/Program.cs b/src/NSwag.Sample.NETCore21/Program.cs deleted file mode 100644 index bbe0a68db5..0000000000 --- a/src/NSwag.Sample.NETCore21/Program.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; - -namespace NSwag.Sample.NETCore21 -{ - public class Program - { - public static void Main(string[] args) - { - CreateWebHostBuilder(args).Build().Run(); - } - - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup(); - } -} diff --git a/src/NSwag.Sample.NETCore21/Properties/launchSettings.json b/src/NSwag.Sample.NETCore21/Properties/launchSettings.json deleted file mode 100644 index 3c6ca53ffa..0000000000 --- a/src/NSwag.Sample.NETCore21/Properties/launchSettings.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:32367", - "sslPort": 44370 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_HTTPS_PORT": "44370", - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "NSwag.Sample.NETCore21": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_URLS": "https://localhost:5001;http://localhost:5000", - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/Startup.cs b/src/NSwag.Sample.NETCore21/Startup.cs deleted file mode 100644 index 7e5a05a06b..0000000000 --- a/src/NSwag.Sample.NETCore21/Startup.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace NSwag.Sample.NETCore21 -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - public void ConfigureServices(IServiceCollection services) - { - services - .AddMvc(options => options.AllowEmptyInputInBodyModelBinding = false) - .SetCompatibilityVersion(CompatibilityVersion.Version_2_1); - - // Add NSwag OpenAPI/Swagger DI services and configure documents - // For more advanced setup, see NSwag.Sample.NETCore20 project - - services.AddOpenApiDocument(document => document.DocumentName = "a"); - services.AddSwaggerDocument(document => document.DocumentName = "b"); - } - - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseHsts(); - } - - app.UseHttpsRedirection(); - app.UseMvc(); - - // Add middlewares to service the OpenAPI/Swagger document and the web UI - - // URLs: - // - http://localhost:32367/swagger/a/swagger.json - // - http://localhost:32367/swagger/b/swagger.json - // - http://localhost:32367/swagger - -#pragma warning disable 618 - app.UseSwagger(); // registers the two documents in separate routes -#pragma warning restore 618 - app.UseSwaggerUi3(); // registers a single Swagger UI (v3) with the two documents - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/appsettings.Development.json b/src/NSwag.Sample.NETCore21/appsettings.Development.json deleted file mode 100644 index 0623a3f445..0000000000 --- a/src/NSwag.Sample.NETCore21/appsettings.Development.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/src/NSwag.Sample.NETCore21/appsettings.json b/src/NSwag.Sample.NETCore21/appsettings.json deleted file mode 100644 index 09cf536c1e..0000000000 --- a/src/NSwag.Sample.NETCore21/appsettings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Warning" - } - } -} diff --git a/src/NSwag.Sample.NETCore21/nswag_assembly.nswag b/src/NSwag.Sample.NETCore21/nswag_assembly.nswag deleted file mode 100644 index 3e348e7642..0000000000 --- a/src/NSwag.Sample.NETCore21/nswag_assembly.nswag +++ /dev/null @@ -1,59 +0,0 @@ -{ - "runtime": "NetCore21", - "defaultVariables": null, - "documentGenerator": { - "aspNetCoreToOpenApi": { - "project": "", - "msBuildProjectExtensionsPath": null, - "configuration": null, - "runtime": null, - "targetFramework": null, - "noBuild": false, - "verbose": false, - "workingDirectory": null, - "requireParametersWithoutDefault": true, - "apiGroupNames": null, - "defaultPropertyNameHandling": "Default", - "defaultReferenceTypeNullHandling": "Null", - "defaultResponseReferenceTypeNullHandling": "NotNull", - "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": "ljlkjlkj", - "infoDescription": null, - "infoVersion": "", - "documentTemplate": null, - "documentProcessorTypes": [], - "operationProcessorTypes": [], - "typeNameGeneratorType": null, - "schemaNameGeneratorType": null, - "contractResolverType": null, - "serializerSettingsType": null, - "useDocumentProvider": false, - "documentName": "v1", - "aspNetCoreEnvironment": null, - "createWebHostBuilderMethod": null, - "startupType": null, - "allowNullableBodyParameters": true, - "output": "swagger_assembly_cli.json", - "outputType": "Swagger2", - "assemblyPaths": [ - "bin/Debug/netcoreapp2.1/NSwag.Sample.NETCore21.dll" - ], - "assemblyConfig": null, - "referencePaths": [], - "useNuGetCache": false - } - }, - "codeGenerators": {} -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/nswag_project.nswag b/src/NSwag.Sample.NETCore21/nswag_project.nswag deleted file mode 100644 index cfd575a0e8..0000000000 --- a/src/NSwag.Sample.NETCore21/nswag_project.nswag +++ /dev/null @@ -1,57 +0,0 @@ -{ - "runtime": "NetCore21", - "defaultVariables": null, - "documentGenerator": { - "aspNetCoreToOpenApi": { - "project": "NSwag.Sample.NETCore21.csproj", - "msBuildProjectExtensionsPath": null, - "configuration": null, - "runtime": null, - "targetFramework": null, - "noBuild": true, - "verbose": false, - "workingDirectory": null, - "requireParametersWithoutDefault": true, - "apiGroupNames": null, - "defaultPropertyNameHandling": "Default", - "defaultReferenceTypeNullHandling": "Null", - "defaultResponseReferenceTypeNullHandling": "NotNull", - "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": false, - "documentName": "v1", - "aspNetCoreEnvironment": null, - "createWebHostBuilderMethod": null, - "startupType": null, - "allowNullableBodyParameters": false, - "output": "swagger_project_cli.json", - "outputType": "Swagger2", - "assemblyPaths": [], - "assemblyConfig": null, - "referencePaths": [], - "useNuGetCache": false - } - }, - "codeGenerators": {} -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/oldswagger.json b/src/NSwag.Sample.NETCore21/oldswagger.json deleted file mode 100644 index 456d392bb2..0000000000 --- a/src/NSwag.Sample.NETCore21/oldswagger.json +++ /dev/null @@ -1,376 +0,0 @@ -{ - "x-generator": "NSwag v11.15.4.0 (NJsonSchema v9.10.31.0 (Newtonsoft.Json v10.0.0.0))", - "swagger": "2.0", - "info": { - "title": "", - "version": "" - }, - "host": "localhost:5001", - "basePath": "", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - } - } - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet", - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "x-nullable": true, - "collectionFormat": "multi", - "items": { - "type": "string" - } - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "required": true, - "x-nullable": true - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - } - } - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "x-nullable": false, - "format": "int32" - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet2", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "x-nullable": false, - "format": "int32" - }, - { - "type": "object", - "name": "pet", - "in": "formData", - "x-schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "x-nullable": false, - "format": "int32" - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "consumes": [ - "multipart/form-data" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "x-nullable": false, - "format": "int32" - }, - { - "type": "file", - "name": "file", - "in": "formData", - "x-nullable": true - } - ], - "responses": { - "400": { - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - }, - "x-nullable": true - }, - "404": { - "description": "" - } - } - } - } - }, - "definitions": { - "Pet": { - "type": "object", - "additionalProperties": false, - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string" - } - } - }, - "Category": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "SerializableError": { - "type": "object", - "additionalProperties": false, - "allOf": [ - { - "type": "object", - "additionalProperties": {} - } - ] - } - }, - "parameters": {}, - "responses": {}, - "securityDefinitions": {} -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/swagger.json b/src/NSwag.Sample.NETCore21/swagger.json deleted file mode 100644 index 663b26f9b5..0000000000 --- a/src/NSwag.Sample.NETCore21/swagger.json +++ /dev/null @@ -1,514 +0,0 @@ -{ - "x-generator": "NSwag v11.17.15.0 (NJsonSchema v9.10.53.0 (Newtonsoft.Json v10.0.0.0))", - "swagger": "2.0", - "info": { - "title": "My Title", - "version": "1.0.0" - }, - "host": "localhost:44370", - "schemes": [ - "https" - ], - "consumes": [ - "application/json", - "application/json-patch+json", - "text/json", - "application/*+json", - "multipart/form-data" - ], - "produces": [ - "application/json" - ], - "paths": { - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "consumes": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet", - "consumes": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": true - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "consumes": [ - "application/json-patch+json", - "application/json", - "text/json", - "application/*+json" - ], - "parameters": [ - { - "name": "status", - "in": "body", - "required": true, - "schema": { - "type": "array", - "items": { - "type": "string" - } - }, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/Pet" - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPet2", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Age", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Category.Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "string", - "name": "Category.Name", - "in": "formData", - "required": true, - "x-nullable": true - }, - { - "type": "boolean", - "name": "HasVaccinations", - "in": "formData", - "required": true, - "x-nullable": false - }, - { - "type": "string", - "name": "Name", - "in": "formData", - "required": true, - "x-nullable": true - }, - { - "type": "array", - "name": "Images", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Image" - } - }, - { - "type": "array", - "name": "Tags", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Tag" - } - }, - { - "type": "string", - "name": "Status", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "consumes": [ - "multipart/form-data" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/ApiResponse" - } - }, - "400": { - "x-nullable": true, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - } - }, - "definitions": { - "Pet": { - "type": "object", - "additionalProperties": false, - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string" - } - } - }, - "Category": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "additionalProperties": false, - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "SerializableError": { - "type": "object", - "additionalProperties": false, - "allOf": [ - { - "type": "object", - "additionalProperties": {} - } - ] - }, - "ApiResponse": { - "type": "object", - "additionalProperties": false, - "required": [ - "code" - ], - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json b/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json deleted file mode 100644 index d118dea644..0000000000 --- a/src/NSwag.Sample.NETCore21/swagger_assembly_cli.json +++ /dev/null @@ -1,563 +0,0 @@ -{ - "x-generator": "NSwag v13.15.5.0 (NJsonSchema v10.6.6.0 (Newtonsoft.Json v11.0.0.0))", - "swagger": "2.0", - "info": { - "title": "ljlkjlkj", - "version": "1.0.0" - }, - "paths": { - "/pet/createOrder": { - "post": { - "tags": [ - "Pet" - ], - "summary": "Creates an order", - "operationId": "Pet_CreateOrder", - "produces": [ - "text/plain", - "application/json", - "text/json" - ], - "responses": { - "201": { - "x-nullable": false, - "description": "Order created", - "schema": { - "type": "integer", - "format": "int32" - } - }, - "400": { - "x-nullable": false, - "description": "Order invalid", - "schema": { - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - } - } - }, - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "My success response description." - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetPUT", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "type": "string" - } - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/Pet" - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetPOST", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Age", - "in": "formData", - "required": true, - "format": "int32", - "maximum": 150.0, - "minimum": 0.0, - "x-nullable": false - }, - { - "type": "integer", - "name": "Category.Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "string", - "name": "Category.Name", - "in": "formData", - "required": true, - "x-nullable": true - }, - { - "type": "boolean", - "name": "HasVaccinations", - "in": "formData", - "required": true, - "x-nullable": false - }, - { - "type": "string", - "name": "Name", - "in": "formData", - "required": true, - "maxLength": 50, - "minLength": 2, - "x-nullable": true - }, - { - "type": "array", - "name": "Images", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Image" - } - }, - { - "type": "array", - "name": "Tags", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Tag" - } - }, - { - "type": "string", - "name": "Status", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "consumes": [ - "multipart/form-data" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/ApiResponse" - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/file": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_GetFile", - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "file" - } - } - } - } - } - }, - "definitions": { - "SerializableError": { - "type": "object", - "description": "Defines a serializable container for storing ModelState information.\nThis information is stored as key/value pairs.", - "additionalProperties": {} - }, - "Pet": { - "type": "object", - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "ApiResponse": { - "type": "object", - "required": [ - "code" - ], - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NETCore21/swagger_project_cli.json b/src/NSwag.Sample.NETCore21/swagger_project_cli.json deleted file mode 100644 index 0b1425bbfa..0000000000 --- a/src/NSwag.Sample.NETCore21/swagger_project_cli.json +++ /dev/null @@ -1,562 +0,0 @@ -{ - "x-generator": "NSwag v13.15.4.0 (NJsonSchema v10.6.5.0 (Newtonsoft.Json v11.0.0.0))", - "swagger": "2.0", - "info": { - "title": "My Title", - "version": "1.0.0" - }, - "paths": { - "/pet/createOrder": { - "post": { - "tags": [ - "Pet" - ], - "summary": "Creates an order", - "operationId": "Pet_CreateOrder", - "produces": [ - "text/plain", - "application/json", - "text/json" - ], - "responses": { - "201": { - "x-nullable": false, - "description": "Order created", - "schema": { - "type": "integer", - "format": "int32" - } - }, - "400": { - "x-nullable": false, - "description": "Order invalid", - "schema": { - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - } - } - }, - "/pet": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_AddPet", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "My success response description." - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - }, - "put": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetPUT", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "name": "pet", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Pet" - }, - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/findByStatus": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByStatus", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "array", - "name": "status", - "in": "query", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "type": "string" - } - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - } - } - } - }, - "/pet/findByCategory": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindByCategory", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "string", - "name": "category", - "in": "query", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/Pet" - } - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - } - } - } - }, - "/pet/{petId}": { - "get": { - "tags": [ - "Pet" - ], - "operationId": "Pet_FindById", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/Pet" - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_EditPetPOST", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "integer", - "name": "Age", - "in": "formData", - "required": true, - "format": "int32", - "maximum": 150.0, - "minimum": 0.0, - "x-nullable": false - }, - { - "type": "integer", - "name": "Category.Id", - "in": "formData", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "string", - "name": "Category.Name", - "in": "formData", - "required": true, - "x-nullable": true - }, - { - "type": "boolean", - "name": "HasVaccinations", - "in": "formData", - "required": true, - "x-nullable": false - }, - { - "type": "string", - "name": "Name", - "in": "formData", - "required": true, - "maxLength": 50, - "minLength": 2, - "x-nullable": true - }, - { - "type": "array", - "name": "Images", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Image" - } - }, - { - "type": "array", - "name": "Tags", - "in": "formData", - "required": true, - "collectionFormat": "multi", - "x-nullable": true, - "items": { - "$ref": "#/definitions/Tag" - } - }, - { - "type": "string", - "name": "Status", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - }, - "delete": { - "tags": [ - "Pet" - ], - "operationId": "Pet_DeletePet", - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - } - ], - "responses": { - "204": { - "description": "" - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/{petId}/uploadImage": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_UploadImage", - "consumes": [ - "multipart/form-data" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "type": "integer", - "name": "petId", - "in": "path", - "required": true, - "format": "int32", - "x-nullable": false - }, - { - "type": "file", - "name": "file", - "in": "formData", - "required": true, - "x-nullable": true - } - ], - "responses": { - "200": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/ApiResponse" - } - }, - "400": { - "x-nullable": false, - "description": "", - "schema": { - "$ref": "#/definitions/SerializableError" - } - }, - "404": { - "description": "" - } - } - } - }, - "/pet/file": { - "post": { - "tags": [ - "Pet" - ], - "operationId": "Pet_GetFile", - "responses": { - "200": { - "x-nullable": true, - "description": "", - "schema": { - "type": "file" - } - } - } - } - } - }, - "definitions": { - "SerializableError": { - "type": "object", - "additionalProperties": {} - }, - "Pet": { - "type": "object", - "required": [ - "id", - "age", - "hasVaccinations", - "name", - "status" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "age": { - "type": "integer", - "format": "int32", - "maximum": 150.0, - "minimum": 0.0 - }, - "category": { - "$ref": "#/definitions/Category" - }, - "hasVaccinations": { - "type": "boolean" - }, - "name": { - "type": "string", - "maxLength": 50, - "minLength": 2 - }, - "images": { - "type": "array", - "items": { - "$ref": "#/definitions/Image" - } - }, - "tags": { - "type": "array", - "items": { - "$ref": "#/definitions/Tag" - } - }, - "status": { - "type": "string", - "minLength": 1 - } - } - }, - "Category": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "Image": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "url": { - "type": "string" - } - } - }, - "Tag": { - "type": "object", - "required": [ - "id" - ], - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "name": { - "type": "string" - } - } - }, - "ApiResponse": { - "type": "object", - "required": [ - "code" - ], - "properties": { - "code": { - "type": "integer", - "format": "int32" - }, - "message": { - "type": "string" - }, - "type": { - "type": "string" - } - } - } - } -} \ No newline at end of file diff --git a/src/NSwag.Sample.NetCoreAngular.Clients/NSwag.Sample.NetCoreAngular.Clients.csproj b/src/NSwag.Sample.NetCoreAngular.Clients/NSwag.Sample.NetCoreAngular.Clients.csproj index e416a6758e..7ddab2614c 100644 --- a/src/NSwag.Sample.NetCoreAngular.Clients/NSwag.Sample.NetCoreAngular.Clients.csproj +++ b/src/NSwag.Sample.NetCoreAngular.Clients/NSwag.Sample.NetCoreAngular.Clients.csproj @@ -1,7 +1,7 @@  - netstandard1.4 + netstandard2.0 diff --git a/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj b/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj index 74aaad7d20..fa15eef89d 100644 --- a/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj +++ b/src/NSwag.Sample.NetCoreAngular/NSwag.Sample.NetCoreAngular.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 true false @@ -9,6 +9,7 @@ + diff --git a/src/NSwag.Sample.NetCoreAngular/Startup.cs b/src/NSwag.Sample.NetCoreAngular/Startup.cs index b6e0b9760a..a373bf58f2 100644 --- a/src/NSwag.Sample.NetCoreAngular/Startup.cs +++ b/src/NSwag.Sample.NetCoreAngular/Startup.cs @@ -30,10 +30,18 @@ public Startup(IHostingEnvironment env) public void ConfigureServices(IServiceCollection services) { // Add framework services. - services.AddMvc().AddJsonOptions(o => + services + .AddMvc() + .AddNewtonsoftJson(o => + { + o.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects; + o.SerializerSettings.Converters = new List { new StringEnumConverter() }; + }); + + services.AddLogging(o => { - o.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects; - o.SerializerSettings.Converters = new List { new StringEnumConverter() }; + o.AddConsole(); + o.AddDebug(); }); services.AddSwaggerDocument(); @@ -48,9 +56,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF .AllowAnyHeader() .WithExposedHeaders("content-disposition", "content-type")); - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - app.UseSwaggerUi3(); if (env.IsDevelopment()) diff --git a/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj b/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj index 29f3d24928..4e2cbfffd2 100644 --- a/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj +++ b/src/NSwag.Sample.NetCoreAurelia/NSwag.Sample.NetCoreAurelia.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 true false @@ -11,7 +11,8 @@ - + + diff --git a/src/NSwag.Sample.NetCoreAurelia/Startup.cs b/src/NSwag.Sample.NetCoreAurelia/Startup.cs index f8615caf25..fdd8e1c6f4 100644 --- a/src/NSwag.Sample.NetCoreAurelia/Startup.cs +++ b/src/NSwag.Sample.NetCoreAurelia/Startup.cs @@ -1,17 +1,16 @@ -using System.Reflection; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using NSwag.AspNetCore; namespace NSwag_Sample_NetCoreAurelia { public class Startup { - public Startup(IHostingEnvironment env) + public Startup(IWebHostEnvironment env) { var builder = new ConfigurationBuilder() .SetBasePath(env.ContentRootPath) @@ -27,12 +26,17 @@ public Startup(IHostingEnvironment env) public void ConfigureServices(IServiceCollection services) { // Add framework services. - services.AddMvc(); + services.AddMvc(o => o.EnableEndpointRouting = true); services.AddSwaggerDocument(); + services.AddLogging(o => + { + o.AddConsole(); + o.AddDebug(); + }); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.UseCors(builder => builder .WithOrigins("*") @@ -40,9 +44,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF .AllowAnyHeader() .WithExposedHeaders("content-disposition", "content-type")); - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - app.UseSwaggerUi3(); if (env.IsDevelopment()) diff --git a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj index 7f5350f364..5eebae2256 100644 --- a/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj +++ b/src/NSwag.Sample.NetGlobalAsax/NSwag.Sample.NetGlobalAsax.csproj @@ -14,7 +14,7 @@ NSwag.Sample.NetGlobalAsax NSwag.Sample.NetGlobalAsax win - v4.6.1 + v4.6.2 false true diff --git a/src/NSwag.VersionMissmatchTest/App.config b/src/NSwag.VersionMissmatchTest/App.config index 3a16ba8580..a068fd13fb 100644 --- a/src/NSwag.VersionMissmatchTest/App.config +++ b/src/NSwag.VersionMissmatchTest/App.config @@ -1,7 +1,7 @@ - + diff --git a/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj b/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj index 8d79872a0b..ae3d1f8874 100644 --- a/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj +++ b/src/NSwag.VersionMissmatchTest/NSwag.VersionMissmatchTest.csproj @@ -2,7 +2,7 @@ Exe - net461 + net462 win true diff --git a/src/NSwag.sln b/src/NSwag.sln index 7c196ef946..e8924b7dc9 100644 --- a/src/NSwag.sln +++ b/src/NSwag.sln @@ -136,10 +136,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.AspNetCore.Launcher.x EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Core.Tests", "NSwag.Core.Tests\NSwag.Core.Tests.csproj", "{810AF444-D713-4CEE-BC9F-13D7875AE69B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Sample.NETCore21", "NSwag.Sample.NETCore21\NSwag.Sample.NETCore21.csproj", "{B60E7723-91F4-412B-9EB3-4050B71B0DAA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Sample.NET50", "NSwag.Sample.NET50\NSwag.Sample.NET50.csproj", "{F109D48B-A2FF-497D-8374-FEA60C5F2365}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Generation.AspNetCore.Tests.Web", "NSwag.Generation.AspNetCore.Tests.Web\NSwag.Generation.AspNetCore.Tests.Web.csproj", "{FDD41017-91E2-4BD8-B827-F851BDEC6B6E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.AssemblyLoader.Tests", "NSwag.AssemblyLoader.Tests\NSwag.AssemblyLoader.Tests.csproj", "{1853262B-6D39-477B-872A-8B5473FE74BB}" @@ -162,10 +158,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00 Build", "00 Build", "{6F Directory.Build.props = Directory.Build.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Sample.NETCore20", "NSwag.Sample.NETCore20\NSwag.Sample.NETCore20.csproj", "{37563171-4C09-4BCD-B2FB-08F786198909}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Sample.NETCore20.Part", "NSwag.Sample.NETCore20.Part\NSwag.Sample.NETCore20.Part.csproj", "{60438B13-8111-44C3-B5E5-34C3F30FF234}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{AC3D8125-AE21-49FC-A217-D96C7B585FF9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSwag.Sample.NET60", "NSwag.Sample.NET60\NSwag.Sample.NET60.csproj", "{DE82965A-6935-43E0-A9A1-F3F35B4487EB}" @@ -862,42 +854,6 @@ Global {810AF444-D713-4CEE-BC9F-13D7875AE69B}.ReleaseTypeScriptStrict|x64.Build.0 = Release|Any CPU {810AF444-D713-4CEE-BC9F-13D7875AE69B}.ReleaseTypeScriptStrict|x86.ActiveCfg = Release|Any CPU {810AF444-D713-4CEE-BC9F-13D7875AE69B}.ReleaseTypeScriptStrict|x86.Build.0 = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Debug|x64.ActiveCfg = Debug|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Debug|x64.Build.0 = Debug|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Debug|x86.ActiveCfg = Debug|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Debug|x86.Build.0 = Debug|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Release|Any CPU.Build.0 = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Release|x64.ActiveCfg = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Release|x64.Build.0 = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Release|x86.ActiveCfg = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.Release|x86.Build.0 = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.ReleaseTypeScriptStrict|Any CPU.ActiveCfg = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.ReleaseTypeScriptStrict|Any CPU.Build.0 = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.ReleaseTypeScriptStrict|x64.ActiveCfg = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.ReleaseTypeScriptStrict|x64.Build.0 = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.ReleaseTypeScriptStrict|x86.ActiveCfg = Release|Any CPU - {B60E7723-91F4-412B-9EB3-4050B71B0DAA}.ReleaseTypeScriptStrict|x86.Build.0 = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Debug|x64.ActiveCfg = Debug|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Debug|x64.Build.0 = Debug|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Debug|x86.ActiveCfg = Debug|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Debug|x86.Build.0 = Debug|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Release|Any CPU.Build.0 = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Release|x64.ActiveCfg = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Release|x64.Build.0 = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Release|x86.ActiveCfg = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.Release|x86.Build.0 = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.ReleaseTypeScriptStrict|Any CPU.ActiveCfg = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.ReleaseTypeScriptStrict|Any CPU.Build.0 = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.ReleaseTypeScriptStrict|x64.ActiveCfg = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.ReleaseTypeScriptStrict|x64.Build.0 = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.ReleaseTypeScriptStrict|x86.ActiveCfg = Release|Any CPU - {F109D48B-A2FF-497D-8374-FEA60C5F2365}.ReleaseTypeScriptStrict|x86.Build.0 = Release|Any CPU {FDD41017-91E2-4BD8-B827-F851BDEC6B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FDD41017-91E2-4BD8-B827-F851BDEC6B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDD41017-91E2-4BD8-B827-F851BDEC6B6E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -988,42 +944,6 @@ Global {4BCF42CE-A289-4B6D-92DB-ED95F8ED4B19}.ReleaseTypeScriptStrict|x64.Build.0 = Release|Any CPU {4BCF42CE-A289-4B6D-92DB-ED95F8ED4B19}.ReleaseTypeScriptStrict|x86.ActiveCfg = Release|Any CPU {4BCF42CE-A289-4B6D-92DB-ED95F8ED4B19}.ReleaseTypeScriptStrict|x86.Build.0 = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Debug|x64.ActiveCfg = Debug|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Debug|x64.Build.0 = Debug|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Debug|x86.ActiveCfg = Debug|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Debug|x86.Build.0 = Debug|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Release|Any CPU.Build.0 = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Release|x64.ActiveCfg = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Release|x64.Build.0 = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Release|x86.ActiveCfg = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.Release|x86.Build.0 = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.ReleaseTypeScriptStrict|Any CPU.ActiveCfg = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.ReleaseTypeScriptStrict|Any CPU.Build.0 = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.ReleaseTypeScriptStrict|x64.ActiveCfg = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.ReleaseTypeScriptStrict|x64.Build.0 = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.ReleaseTypeScriptStrict|x86.ActiveCfg = Release|Any CPU - {37563171-4C09-4BCD-B2FB-08F786198909}.ReleaseTypeScriptStrict|x86.Build.0 = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Debug|x64.ActiveCfg = Debug|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Debug|x64.Build.0 = Debug|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Debug|x86.ActiveCfg = Debug|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Debug|x86.Build.0 = Debug|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Release|Any CPU.Build.0 = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Release|x64.ActiveCfg = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Release|x64.Build.0 = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Release|x86.ActiveCfg = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.Release|x86.Build.0 = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.ReleaseTypeScriptStrict|Any CPU.ActiveCfg = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.ReleaseTypeScriptStrict|Any CPU.Build.0 = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.ReleaseTypeScriptStrict|x64.ActiveCfg = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.ReleaseTypeScriptStrict|x64.Build.0 = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.ReleaseTypeScriptStrict|x86.ActiveCfg = Release|Any CPU - {60438B13-8111-44C3-B5E5-34C3F30FF234}.ReleaseTypeScriptStrict|x86.Build.0 = Release|Any CPU {AC3D8125-AE21-49FC-A217-D96C7B585FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC3D8125-AE21-49FC-A217-D96C7B585FF9}.Debug|x64.ActiveCfg = Debug|Any CPU {AC3D8125-AE21-49FC-A217-D96C7B585FF9}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1116,16 +1036,12 @@ Global {B715070B-E76E-4959-894A-623EB7639E5F} = {F0F26A35-C4B6-42D0-A1DF-98CA46A5C560} {E90E9C77-7983-40D0-AAB3-91D16DC639CE} = {F0F26A35-C4B6-42D0-A1DF-98CA46A5C560} {810AF444-D713-4CEE-BC9F-13D7875AE69B} = {634E4ABD-29EC-4EB2-81EF-7E41D6D6F6E0} - {B60E7723-91F4-412B-9EB3-4050B71B0DAA} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} - {F109D48B-A2FF-497D-8374-FEA60C5F2365} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} {FDD41017-91E2-4BD8-B827-F851BDEC6B6E} = {634E4ABD-29EC-4EB2-81EF-7E41D6D6F6E0} {1853262B-6D39-477B-872A-8B5473FE74BB} = {634E4ABD-29EC-4EB2-81EF-7E41D6D6F6E0} {E6E40935-0C79-480B-BF29-8C493AC7E518} = {DDBB05AC-B066-48C4-933C-034F401EBB6A} {B6467D5A-7B13-4B06-89BE-2BC7B6615956} = {634E4ABD-29EC-4EB2-81EF-7E41D6D6F6E0} {F237A592-2D74-4C38-B222-2C91029B87F8} = {634E4ABD-29EC-4EB2-81EF-7E41D6D6F6E0} {4BCF42CE-A289-4B6D-92DB-ED95F8ED4B19} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} - {37563171-4C09-4BCD-B2FB-08F786198909} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} - {60438B13-8111-44C3-B5E5-34C3F30FF234} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} {AC3D8125-AE21-49FC-A217-D96C7B585FF9} = {6F5E4FDF-0A82-42D5-94AC-A9CD43CC931D} {DE82965A-6935-43E0-A9A1-F3F35B4487EB} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} {24693FBC-445E-4360-A1E8-B6F136C563FB} = {D8CC0D1C-8DAC-49FE-AA78-C028DC124DD5} diff --git a/src/NSwagStudio/App.config b/src/NSwagStudio/App.config index 57b0b8bb1f..a5cce42e99 100644 --- a/src/NSwagStudio/App.config +++ b/src/NSwagStudio/App.config @@ -1,7 +1,7 @@  - + diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj index 29c8d8f869..2fb29ae3be 100644 --- a/src/NSwagStudio/NSwagStudio.csproj +++ b/src/NSwagStudio/NSwagStudio.csproj @@ -1,7 +1,7 @@  WinExe - net461 + net462 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true true diff --git a/src/NSwagStudio/nswag.cmd b/src/NSwagStudio/nswag.cmd index ed0aa436ec..cd7b5018eb 100644 --- a/src/NSwagStudio/nswag.cmd +++ b/src/NSwagStudio/nswag.cmd @@ -6,21 +6,11 @@ IF NOT "%args:/runtime:winx86=%" == "%args%" ( GOTO end ) -IF NOT "%args:/runtime:netcore21=%" == "%args%" ( - dotnet "%~dp0/NetCore21/dotnet-nswag.dll" %* - GOTO end -) - IF NOT "%args:/runtime:netcore31=%" == "%args%" ( dotnet "%~dp0/NetCore31/dotnet-nswag.dll" %* GOTO end ) -IF NOT "%args:/runtime:net50=%" == "%args%" ( - dotnet "%~dp0/Net50/dotnet-nswag.dll" %* - GOTO end -) - IF NOT "%args:/runtime:net60=%" == "%args%" ( dotnet "%~dp0/Net60/dotnet-nswag.dll" %* GOTO end