Skip to content

Commit 93fe279

Browse files
Merge pull request #2542 from eslamisepehr/master
Update to .NET 7.0
2 parents e98e4aa + d707679 commit 93fe279

File tree

34 files changed

+49
-36
lines changed

34 files changed

+49
-36
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ init:
88
- git config --global core.autocrlf true
99

1010
environment:
11-
DOTNET_VERSION: "6.0.100-rc.2.21505.57"
11+
DOTNET_VERSION: "7.0.100"
1212

1313
build_script:
1414
- ps: dotnet pack -c Release -o artifacts

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-rc.2.21505.57",
3+
"version": "7.0.100",
44
"rollForward": "latestMajor"
55
}
66
}

src/Swashbuckle.AspNetCore.Annotations/Swashbuckle.AspNetCore.Annotations.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NoWarn>$(NoWarn);1591</NoWarn>
88
<PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore;annotations</PackageTags>
99
<SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
10-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

src/Swashbuckle.AspNetCore.ApiTesting.Xunit/Swashbuckle.AspNetCore.ApiTesting.Xunit.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<IsTestProject>false</IsTestProject>
77
<NoWarn>$(NoWarn);1591</NoWarn>
88
<PackageTags>swagger;openapi;test-first;spec-first;testing;aspnetcore;xunit</PackageTags>
9-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
1010
</PropertyGroup>
1111

1212
<ItemGroup>

src/Swashbuckle.AspNetCore.ApiTesting/ResponseValidator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private void ValidateContent(
6868
OpenApiDocument openApiDocument,
6969
HttpContent content)
7070
{
71-
if (content == null)
71+
if (content == null || content?.Headers?.ContentLength == 0)
7272
throw new RequestDoesNotMatchSpecException("Expected content is not present");
7373

7474
if (!contentSpecs.TryGetValue(content.Headers.ContentType.MediaType, out OpenApiMediaType mediaTypeSpec))

src/Swashbuckle.AspNetCore.ApiTesting/Swashbuckle.AspNetCore.ApiTesting.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<NoWarn>$(NoWarn);1591</NoWarn>
77
<PackageTags>swagger;openapi;test-first;spec-first;testing;aspnetcore</PackageTags>
8-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -24,6 +24,10 @@
2424
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0-rc.1.21452.15" />
2525
</ItemGroup>
2626

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
28+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
29+
</ItemGroup>
30+
2731
<ItemGroup>
2832
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2933
<PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />

src/Swashbuckle.AspNetCore.Cli/Swashbuckle.AspNetCore.Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<OutputType>Exe</OutputType>
77
<PackAsTool>true</PackAsTool>
88
<PackageId>Swashbuckle.AspNetCore.Cli</PackageId>
9-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
9+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
1010
<ToolCommandName>swagger</ToolCommandName>
1111
</PropertyGroup>
1212

src/Swashbuckle.AspNetCore.Newtonsoft/Swashbuckle.AspNetCore.Newtonsoft.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>Swagger Generator opt-in component to support Newtonsoft.Json serializer behaviors</Description>
66
<PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore;newtonsoft</PackageTags>
77
<SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
8-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<ItemGroup>
@@ -28,4 +28,8 @@
2828
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21452.15" />
2929
</ItemGroup>
3030

31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
33+
</ItemGroup>
34+
3135
</Project>

src/Swashbuckle.AspNetCore.ReDoc/Swashbuckle.AspNetCore.ReDoc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NoWarn>$(NoWarn);1591</NoWarn>
88
<PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore;redoc</PackageTags>
99
<SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
10-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

src/Swashbuckle.AspNetCore.Swagger/Swashbuckle.AspNetCore.Swagger.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NoWarn>$(NoWarn);1591</NoWarn>
88
<PackageTags>swagger;documentation;discovery;help;webapi;aspnet;aspnetcore</PackageTags>
99
<SignAssembly Condition="'$(OS)'=='Windows_NT'">true</SignAssembly>
10-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net6.0;net7.0</TargetFrameworks>
1111
</PropertyGroup>
1212

1313
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

0 commit comments

Comments
 (0)