Update to .NET 7.0

domaindrivendev · Nov 10, 2022 · 3d5159c · 3d5159c
1 parent 4a28652
commit 3d5159c
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 36 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ init:
 - git config --global core.autocrlf true
 
 environment:
- DOTNET_VERSION: "6.0.100-rc.2.21505.57"
+ DOTNET_VERSION: "7.0.0"
 
 build_script:
 - ps: dotnet pack -c Release -o artifacts

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
  "sdk": {
- "version": "6.0.100-rc.2.21505.57",
+ "version": "7.0.0",
  "rollForward": "latestMajor"
  }
  }
diff --git a/src/Swashbuckle.AspNetCore.Annotations/Swashbuckle.AspNetCore.Annotations.csproj b/src/Swashbuckle.AspNetCore.Annotations/Swashbuckle.AspNetCore.Annotations.csproj
@@ -7,7 +7,7 @@
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore;annotations</PackageTags>
  <SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/Swashbuckle.AspNetCore.ApiTesting.Xunit/Swashbuckle.AspNetCore.ApiTesting.Xunit.csproj b/src/Swashbuckle.AspNetCore.ApiTesting.Xunit/Swashbuckle.AspNetCore.ApiTesting.Xunit.csproj
@@ -6,7 +6,7 @@
  <IsTestProject>false</IsTestProject>
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;openapi;test-first;spec-first;testing;aspnetcore;xunit</PackageTags>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/Swashbuckle.AspNetCore.ApiTesting/ResponseValidator.cs b/src/Swashbuckle.AspNetCore.ApiTesting/ResponseValidator.cs
@@ -68,7 +68,7 @@ private void ValidateContent(
  OpenApiDocument openApiDocument,
  HttpContent content)
  {
- if (content == null)
+ if (content == null || content?.Headers?.ContentLength == 0)
  throw new RequestDoesNotMatchSpecException("Expected content is not present");
 
  if (!contentSpecs.TryGetValue(content.Headers.ContentType.MediaType, out OpenApiMediaType mediaTypeSpec))

diff --git a/src/Swashbuckle.AspNetCore.ApiTesting/Swashbuckle.AspNetCore.ApiTesting.csproj b/src/Swashbuckle.AspNetCore.ApiTesting/Swashbuckle.AspNetCore.ApiTesting.csproj
@@ -5,7 +5,7 @@
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;openapi;test-first;spec-first;testing;aspnetcore</PackageTags>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -24,6 +24,10 @@
  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0-rc.1.21452.15" />
  </ItemGroup>
 
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
+ </ItemGroup>
+
  <ItemGroup>
  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  <PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />

diff --git a/src/Swashbuckle.AspNetCore.Cli/Swashbuckle.AspNetCore.Cli.csproj b/src/Swashbuckle.AspNetCore.Cli/Swashbuckle.AspNetCore.Cli.csproj
@@ -6,7 +6,7 @@
  <OutputType>Exe</OutputType>
  <PackAsTool>true</PackAsTool>
  <PackageId>Swashbuckle.AspNetCore.Cli</PackageId>
- <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  <ToolCommandName>swagger</ToolCommandName>
  </PropertyGroup>
 

diff --git a/src/Swashbuckle.AspNetCore.Newtonsoft/Swashbuckle.AspNetCore.Newtonsoft.csproj b/src/Swashbuckle.AspNetCore.Newtonsoft/Swashbuckle.AspNetCore.Newtonsoft.csproj
@@ -5,7 +5,7 @@
  <Description>Swagger Generator opt-in component to support Newtonsoft.Json serializer behaviors</Description>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore;newtonsoft</PackageTags>
  <SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>
@@ -28,4 +28,8 @@
  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21452.15" />
  </ItemGroup>
 
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
+ </ItemGroup>
+
 </Project>
diff --git a/src/Swashbuckle.AspNetCore.ReDoc/Swashbuckle.AspNetCore.ReDoc.csproj b/src/Swashbuckle.AspNetCore.ReDoc/Swashbuckle.AspNetCore.ReDoc.csproj
@@ -7,7 +7,7 @@
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore;redoc</PackageTags>
  <SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/Swashbuckle.AspNetCore.Swagger/Swashbuckle.AspNetCore.Swagger.csproj b/src/Swashbuckle.AspNetCore.Swagger/Swashbuckle.AspNetCore.Swagger.csproj
@@ -7,7 +7,7 @@
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore</PackageTags>
  <SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/Swashbuckle.AspNetCore.SwaggerGen.csproj b/src/Swashbuckle.AspNetCore.SwaggerGen/Swashbuckle.AspNetCore.SwaggerGen.csproj
@@ -7,7 +7,7 @@
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore</PackageTags>
  <SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/Swashbuckle.AspNetCore.SwaggerUI/Swashbuckle.AspNetCore.SwaggerUI.csproj b/src/Swashbuckle.AspNetCore.SwaggerUI/Swashbuckle.AspNetCore.SwaggerUI.csproj
@@ -7,7 +7,7 @@
  <NoWarn>$(NoWarn);1591</NoWarn>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore</PackageTags>
  <SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/Swashbuckle.AspNetCore/Swashbuckle.AspNetCore.csproj b/src/Swashbuckle.AspNetCore/Swashbuckle.AspNetCore.csproj
@@ -12,7 +12,7 @@
  <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
  <PackageId>Swashbuckle.AspNetCore</PackageId>
  <PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore</PackageTags>
- <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <Target Name="PopulateNuspec">

diff --git a/test/Swashbuckle.AspNetCore.Annotations.Test/Swashbuckle.AspNetCore.Annotations.Test.csproj b/test/Swashbuckle.AspNetCore.Annotations.Test/Swashbuckle.AspNetCore.Annotations.Test.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
  <LangVersion>10</LangVersion>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/Swashbuckle.AspNetCore.ApiTesting.Test/Swashbuckle.AspNetCore.ApiTesting.Test.csproj b/test/Swashbuckle.AspNetCore.ApiTesting.Test/Swashbuckle.AspNetCore.ApiTesting.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/Swashbuckle.AspNetCore.Cli.Test/Swashbuckle.AspNetCore.Cli.Test.csproj b/test/Swashbuckle.AspNetCore.Cli.Test/Swashbuckle.AspNetCore.Cli.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net6.0</TargetFrameworks>
+ <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/Swashbuckle.AspNetCore.IntegrationTests/Swashbuckle.AspNetCore.IntegrationTests.csproj b/test/Swashbuckle.AspNetCore.IntegrationTests/Swashbuckle.AspNetCore.IntegrationTests.csproj
@@ -4,7 +4,7 @@
  <AssemblyOriginatorKeyFile>Swashbuckle.AspNetCore.IntegrationTests.snk</AssemblyOriginatorKeyFile>
  <NoWarn>$(NoWarn);8002</NoWarn>
  <SignAssembly>true</SignAssembly>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Swashbuckle.AspNetCore.Newtonsoft.Test.csproj b/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Swashbuckle.AspNetCore.Newtonsoft.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/Swashbuckle.AspNetCore.SwaggerGen.Test/Swashbuckle.AspNetCore.SwaggerGen.Test.csproj b/test/Swashbuckle.AspNetCore.SwaggerGen.Test/Swashbuckle.AspNetCore.SwaggerGen.Test.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
  <DocumentationFile>Swashbuckle.AspNetCore.SwaggerGen.Test.xml</DocumentationFile>
  <NoWarn>1701;1702;1591</NoWarn>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/Swashbuckle.AspNetCore.TestSupport/Swashbuckle.AspNetCore.TestSupport.csproj b/test/Swashbuckle.AspNetCore.TestSupport/Swashbuckle.AspNetCore.TestSupport.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  <IsPackable>false</IsPackable>
  <IsTestProject>false</IsTestProject>
  </PropertyGroup>

diff --git a/test/WebSites/Basic/Basic.csproj b/test/WebSites/Basic/Basic.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <NoWarn>$(NoWarn);1591</NoWarn>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/CliExample/CliExample.csproj b/test/WebSites/CliExample/CliExample.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <DotNetSwaggerPath>$([System.IO.Path]::Combine("..", "..", "..", "src", "Swashbuckle.AspNetCore.Cli", "bin", $(Configuration), "netcoreapp3.0", "dotnet-swagger.dll"))</DotNetSwaggerPath>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/CliExampleWithFactory/CliExampleWithFactory.csproj b/test/WebSites/CliExampleWithFactory/CliExampleWithFactory.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <DotNetSwaggerPath>$([System.IO.Path]::Combine("..", "..", "..", "src", "Swashbuckle.AspNetCore.Cli", "bin", $(Configuration), "netcoreapp3.0", "dotnet-swagger.dll"))</DotNetSwaggerPath>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/ConfigFromFile/ConfigFromFile.csproj b/test/WebSites/ConfigFromFile/ConfigFromFile.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/CustomUIConfig/CustomUIConfig.csproj b/test/WebSites/CustomUIConfig/CustomUIConfig.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/CustomUIIndex/CustomUIIndex.csproj b/test/WebSites/CustomUIIndex/CustomUIIndex.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/GenericControllers/GenericControllers.csproj b/test/WebSites/GenericControllers/GenericControllers.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <NoWarn>$(NoWarn);1591</NoWarn>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/MinimalApp/MinimalApp.csproj b/test/WebSites/MinimalApp/MinimalApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
  <DotNetSwaggerPath>$([System.IO.Path]::Combine("..", "..", "..", "src", "Swashbuckle.AspNetCore.Cli", "bin", $(Configuration), "net5.0", "dotnet-swagger"))</DotNetSwaggerPath>

diff --git a/test/WebSites/MultipleVersions/MultipleVersions.csproj b/test/WebSites/MultipleVersions/MultipleVersions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/NswagClientExample/NswagClientExample.csproj b/test/WebSites/NswagClientExample/NswagClientExample.csproj
@@ -2,7 +2,7 @@
 
  <PropertyGroup>
  <DotNetSwaggerPath>$([System.IO.Path]::Combine("..", "..", "..", "src", "Swashbuckle.AspNetCore.Cli", "bin", $(Configuration), "netcoreapp3.0", "dotnet-swagger.dll"))</DotNetSwaggerPath>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/OAuth2Integration/OAuth2Integration.csproj b/test/WebSites/OAuth2Integration/OAuth2Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/ReDoc/ReDoc.csproj b/test/WebSites/ReDoc/ReDoc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/test/WebSites/TestFirst.IntegrationTests/TestFirst.IntegrationTests.csproj b/test/WebSites/TestFirst.IntegrationTests/TestFirst.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>
@@ -22,7 +22,12 @@
  <ProjectReference Include="..\..\..\src\Swashbuckle.AspNetCore.ApiTesting.Xunit\Swashbuckle.AspNetCore.ApiTesting.Xunit.csproj" />
  </ItemGroup>
 
- <ItemGroup>
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
  <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
  </ItemGroup>
+
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
+ </ItemGroup>
+
 </Project>
diff --git a/test/WebSites/TestFirst/TestFirst.csproj b/test/WebSites/TestFirst/TestFirst.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>