diff --git a/build/03_RunIntegrationTests.bat b/build/03_RunIntegrationTests.bat index 757c04954..fc9fb6b43 100644 --- a/build/03_RunIntegrationTests.bat +++ b/build/03_RunIntegrationTests.bat @@ -1,3 +1,3 @@ pushd "%~dp0\.." -cmd /c call build.cmd integrationtest --configuration Release +cmd /c call build.cmd integrationtest --configuration Release popd diff --git a/build/_build.csproj b/build/_build.csproj index 5287711c7..08e95e0e0 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -1,23 +1,23 @@ - - Exe - net8.0 - - CS0649;CS0169 - .. - .. - 1 - true - + + Exe + net8.0 + + CS0649;CS0169 + .. + .. + 1 + true + - - - + + + - - - - + + + + diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj index 25b025f30..212e485a1 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.csproj @@ -1,100 +1,100 @@  - - net461;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 - Swagger Documentation AspNetCore NetCore TypeScript CodeGen - $(MSBuildProjectName).nuspec - symbols.nupkg + + net461;netstandard1.6;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + Swagger Documentation AspNetCore NetCore TypeScript CodeGen + $(MSBuildProjectName).nuspec + symbols.nupkg - - $(GenerateNuspecDependsOn);PopulateNuspec + + $(GenerateNuspecDependsOn);PopulateNuspec - 1.0.6 - 1.0.6 - 1.0.4 - 6.0.3 - [1.0.1, 6.0) - [3.1, 4.0) - [5, 6.0) - [6.0.0, 7.0) - [7.0.0, 8.0) - [8.0.0, 8.0.100) - 1.6.1 - 4.3.0 - 4.0.1 - - - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1.0.6 + 1.0.6 + 1.0.4 + 6.0.3 + [1.0.1, 6.0) + [3.1, 4.0) + [5, 6.0) + [6.0.0, 7.0) + [7.0.0, 8.0) + [8.0.0, 8.0.100) + 1.6.1 + 4.3.0 + 4.0.1 + + + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - id=$(PackageId); - authors=$(Authors); - configuration=$(Configuration); - description=$(PackageDescription); - version=$(PackageVersion); + + + + id=$(PackageId); + authors=$(Authors); + configuration=$(Configuration); + description=$(PackageDescription); + version=$(PackageVersion); - microsoftAspNetCoreMvcCorePackageVersion=$(MicrosoftAspNetCoreMvcCorePackageVersion); - microsoftAspNetCoreMvcFormattersJsonPackageVersion=$(MicrosoftAspNetCoreMvcFormattersJsonPackageVersion); - microsoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion); - microsoftExtensionsApiDescriptionServerPackageVersion=$(MicrosoftExtensionsApiDescriptionServerPackageVersion); - microsoftExtensionsFileProvidersEmbeddedPackageVersion=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion); - microsoftExtensionsFileProvidersEmbeddedPackageVersionCore31=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31); - microsoftExtensionsFileProvidersEmbeddedPackageVersionNet5=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5); - microsoftExtensionsFileProvidersEmbeddedPackageVersionNet6=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6); - microsoftExtensionsFileProvidersEmbeddedPackageVersionNet7=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7); - microsoftExtensionsFileProvidersEmbeddedPackageVersionNet8=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8); - netStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion); - systemIOFileSystemPackageVersion=$(SystemIOFileSystemPackageVersion); - systemXmlXPathXDocumentPackageVersion=$(SystemXmlXPathXDocumentPackageVersion); - - - + microsoftAspNetCoreMvcCorePackageVersion=$(MicrosoftAspNetCoreMvcCorePackageVersion); + microsoftAspNetCoreMvcFormattersJsonPackageVersion=$(MicrosoftAspNetCoreMvcFormattersJsonPackageVersion); + microsoftAspNetCoreStaticFilesPackageVersion=$(MicrosoftAspNetCoreStaticFilesPackageVersion); + microsoftExtensionsApiDescriptionServerPackageVersion=$(MicrosoftExtensionsApiDescriptionServerPackageVersion); + microsoftExtensionsFileProvidersEmbeddedPackageVersion=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion); + microsoftExtensionsFileProvidersEmbeddedPackageVersionCore31=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionCore31); + microsoftExtensionsFileProvidersEmbeddedPackageVersionNet5=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet5); + microsoftExtensionsFileProvidersEmbeddedPackageVersionNet6=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet6); + microsoftExtensionsFileProvidersEmbeddedPackageVersionNet7=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet7); + microsoftExtensionsFileProvidersEmbeddedPackageVersionNet8=$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersionNet8); + netStandardLibraryPackageVersion=$(NETStandardLibraryPackageVersion); + systemIOFileSystemPackageVersion=$(SystemIOFileSystemPackageVersion); + systemXmlXPathXDocumentPackageVersion=$(SystemXmlXPathXDocumentPackageVersion); + + + diff --git a/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec b/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec index e7cf66b98..87cd45c1b 100644 --- a/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec +++ b/src/NSwag.AspNetCore/NSwag.AspNetCore.nuspec @@ -1,93 +1,93 @@ - - $id$ - $version$ - $authors$ - $description$ - OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet - https://github.com/RicoSuter/NSwag - MIT - NuGetIcon.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + $id$ + $version$ + $authors$ + $description$ + OpenAPI Swagger AspNetCore Documentation CodeGen TypeScript WebApi AspNet + https://github.com/RicoSuter/NSwag + MIT + NuGetIcon.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,27 +97,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs b/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs index 6e5c76ef3..8d1daf392 100644 --- a/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs +++ b/src/NSwag.Commands/Commands/Generation/AspNetCore/AspNetCoreToOpenApiCommand.cs @@ -180,6 +180,7 @@ public override async Task RunAsync(CommandLineProcessor processor, ICon } if (projectMetadata.TargetFrameworkIdentifier == ".NETCoreApp" || + projectMetadata.TargetFrameworkIdentifier == "net5.0" || projectMetadata.TargetFrameworkIdentifier == "net6.0" || projectMetadata.TargetFrameworkIdentifier == "net7.0" || projectMetadata.TargetFrameworkIdentifier == "net8.0") 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 fddaec576..a06e99586 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,7 +1,6 @@  - netcoreapp2.1 net5.0;net6.0;net7.0;net8.0;netcoreapp2.1;netcoreapp3.1 true $(NoWarn),618,1591