Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump some NuGet packages #2868

Merged
merged 5 commits into from
May 13, 2024
Merged

Bump some NuGet packages #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc43b12
Bump xunit to 2.8.0
martincostello May 12, 2024
96e3d5d
Remove unused project
martincostello May 12, 2024
386fd51
Bump ReportGenerator
martincostello May 12, 2024
963a4a5
Bump Mvc.Testing and TestHost
martincostello May 12, 2024
d8397c7
Use simple using statement
martincostello May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
<PackageVersion Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.28" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.29" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
<PackageVersion Include="Microsoft.AspNetCore.Routing" Version="2.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.28" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.29" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.0" />
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.14" />
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.14" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="Nswag.MSbuild" Version="14.0.7" />
<PackageVersion Include="ReportGenerator" Version="5.2.2" />
<PackageVersion Include="ReportGenerator" Version="5.2.5" />
<PackageVersion Include="System.Text.Json" Version="4.6.0" />
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="xunit.core" Version="2.7.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageVersion Include="xunit" Version="2.8.0" />
<PackageVersion Include="xunit.core" Version="2.8.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
</ItemGroup>
</Project>
37 changes: 5 additions & 32 deletions Swashbuckle.AspNetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericControllers", "test\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipleVersions", "test\WebSites\MultipleVersions\MultipleVersions.csproj", "{1D31109C-377C-40C7-9A06-DB078FC24578}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore21", "test\WebSites\NetCore21\NetCore21.csproj", "{E46D07EE-5EA6-4630-8FD2-B2150F35D33A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NswagClientExample", "test\WebSites\NswagClientExample\NswagClientExample.csproj", "{8CA201CD-7F59-4B7D-8888-76528F2DF3C8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OAuth2Integration", "test\WebSites\OAuth2Integration\OAuth2Integration.csproj", "{0DA4F00E-D365-4D27-B8C4-F6D4577F2093}"
Expand All @@ -91,7 +89,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Swashbuckle.AspNetCore.Test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalApp", "test\WebSites\MinimalApp\MinimalApp.csproj", "{3D0126CB-5439-483C-B2D5-4B4BE111D15C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopLevelSwaggerDoc", "test\WebSites\TopLevelSwaggerDoc\TopLevelSwaggerDoc.csproj", "{6EA75DA8-9B1F-468E-9425-37F01A129B0F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TopLevelSwaggerDoc", "test\WebSites\TopLevelSwaggerDoc\TopLevelSwaggerDoc.csproj", "{6EA75DA8-9B1F-468E-9425-37F01A129B0F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{3BA087DA-788C-43D6-9D8B-1EF017014A4A}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -193,10 +191,6 @@ Global
{1D31109C-377C-40C7-9A06-DB078FC24578}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D31109C-377C-40C7-9A06-DB078FC24578}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D31109C-377C-40C7-9A06-DB078FC24578}.Release|Any CPU.Build.0 = Release|Any CPU
{E46D07EE-5EA6-4630-8FD2-B2150F35D33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E46D07EE-5EA6-4630-8FD2-B2150F35D33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E46D07EE-5EA6-4630-8FD2-B2150F35D33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E46D07EE-5EA6-4630-8FD2-B2150F35D33A}.Release|Any CPU.Build.0 = Release|Any CPU
{8CA201CD-7F59-4B7D-8888-76528F2DF3C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CA201CD-7F59-4B7D-8888-76528F2DF3C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CA201CD-7F59-4B7D-8888-76528F2DF3C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -249,42 +243,22 @@ Global
{3D0126CB-5439-483C-B2D5-4B4BE111D15C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D0126CB-5439-483C-B2D5-4B4BE111D15C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D0126CB-5439-483C-B2D5-4B4BE111D15C}.Release|Any CPU.Build.0 = Release|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Release|Any CPU.Build.0 = Release|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Release|Any CPU.Build.0 = Release|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Release|x64.ActiveCfg = Release|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Release|x64.Build.0 = Release|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Release|x86.ActiveCfg = Release|Any CPU
{6EA75DA8-9B1F-468E-9425-37F01A129B0F}.Release|x86.Build.0 = Release|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6037A37-4A4F-438D-B18A-0C9D1408EAB2}.Release|Any CPU.Build.0 = Release|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Debug|x64.ActiveCfg = Debug|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Debug|x64.Build.0 = Debug|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Debug|x86.ActiveCfg = Debug|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Debug|x86.Build.0 = Debug|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Release|Any CPU.Build.0 = Release|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Release|x64.ActiveCfg = Release|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Release|x64.Build.0 = Release|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Release|x86.ActiveCfg = Release|Any CPU
{DE1D77F8-3916-4DEE-A57D-6DDC357F64C6}.Release|x86.Build.0 = Release|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Debug|x64.ActiveCfg = Debug|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Debug|x64.Build.0 = Debug|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Debug|x86.ActiveCfg = Debug|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Debug|x86.Build.0 = Debug|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Release|Any CPU.Build.0 = Release|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Release|x64.ActiveCfg = Release|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Release|x64.Build.0 = Release|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Release|x86.ActiveCfg = Release|Any CPU
{07BB09CF-6C6F-4D00-A459-93586345C921}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -309,7 +283,6 @@ Global
{C6F447A4-ED99-4932-AC29-950BD794D0B3} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
{62B46064-24F0-417A-8EA0-34684720A379} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
{1D31109C-377C-40C7-9A06-DB078FC24578} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
{E46D07EE-5EA6-4630-8FD2-B2150F35D33A} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
{8CA201CD-7F59-4B7D-8888-76528F2DF3C8} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
{0DA4F00E-D365-4D27-B8C4-F6D4577F2093} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
{48634D50-2680-4103-8CDA-8B6D99291AC5} = {DB3F57FC-1472-4F03-B551-43394DA3C5EB}
Expand Down
50 changes: 24 additions & 26 deletions test/Swashbuckle.AspNetCore.IntegrationTests/CustomDocumentSerializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Swashbuckle.AspNetCore.IntegrationTests
public class CustomDocumentSerializerTests
{
[Fact]
public async void TestSite_Writes_Custom_V3_Document()
public async Task TestSite_Writes_Custom_V3_Document()
{
var testSite = new TestSite(typeof(CustomDocumentSerializer.Startup));
var client = testSite.BuildClient();
Expand All @@ -31,7 +31,7 @@ public async void TestSite_Writes_Custom_V3_Document()
}

[Fact]
public async void TestSite_Writes_Custom_V2_Document()
public async Task TestSite_Writes_Custom_V2_Document()
{
var testSite = new TestSite(typeof(CustomDocumentSerializer.Startup));
var client = testSite.BuildClient();
Expand All @@ -55,22 +55,21 @@ public async Task DocumentProvider_Writes_Custom_V3_Document()
var services = server.Host.Services;

var documentProvider = services.GetService<IDocumentProvider>();
using (var stream = new MemoryStream())
using var stream = new MemoryStream();

using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 2048, leaveOpen: true))
{
using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 2048, leaveOpen: true))
{
await documentProvider.GenerateAsync("v1", writer);
await writer.FlushAsync();
}
await documentProvider.GenerateAsync("v1", writer);
await writer.FlushAsync();
}

stream.Position = 0L;
stream.Position = 0L;

using var document = JsonDocument.Parse(stream);
using var document = JsonDocument.Parse(stream);

// verify that the custom serializer wrote the swagger info
var swaggerInfo = document.RootElement.GetProperty("swagger").GetString();
Assert.Equal("DocumentSerializerTest3.0", swaggerInfo);
}
// verify that the custom serializer wrote the swagger info
var swaggerInfo = document.RootElement.GetProperty("swagger").GetString();
Assert.Equal("DocumentSerializerTest3.0", swaggerInfo);
}

[Fact]
Expand All @@ -84,22 +83,21 @@ public async Task DocumentProvider_Writes_Custom_V2_Document()
var options = services.GetService<IOptions<SwaggerOptions>>();
options.Value.SerializeAsV2 = true;

using (var stream = new MemoryStream())
using var stream = new MemoryStream();

using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 2048, leaveOpen: true))
{
using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 2048, leaveOpen: true))
{
await documentProvider.GenerateAsync("v1", writer);
await writer.FlushAsync();
}
await documentProvider.GenerateAsync("v1", writer);
await writer.FlushAsync();
}

stream.Position = 0L;
stream.Position = 0L;

using var document = JsonDocument.Parse(stream);
using var document = JsonDocument.Parse(stream);

// verify that the custom serializer wrote the swagger info
var swaggerInfo = document.RootElement.GetProperty("swagger").GetString();
Assert.Equal("DocumentSerializerTest2.0", swaggerInfo);
}
// verify that the custom serializer wrote the swagger info
var swaggerInfo = document.RootElement.GetProperty("swagger").GetString();
Assert.Equal("DocumentSerializerTest2.0", swaggerInfo);
}
}
}
1 change: 0 additions & 1 deletion test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class SwaggerIntegrationTests
[InlineData(typeof(GenericControllers.Startup), "/swagger/v1/swagger.json")]
[InlineData(typeof(MultipleVersions.Startup), "/swagger/1.0/swagger.json")]
[InlineData(typeof(MultipleVersions.Startup), "/swagger/2.0/swagger.json")]
//[InlineData(typeof(NetCore21.Startup), "/swagger/v1/swagger.json")]
[InlineData(typeof(OAuth2Integration.Startup), "/resource-server/swagger/v1/swagger.json")]
[InlineData(typeof(ReDocApp.Startup), "/swagger/v1/swagger.json")]
[InlineData(typeof(TestFirst.Startup), "/swagger/v1-generated/openapi.json")]
Expand Down
6 changes: 5 additions & 1 deletion test/Swashbuckle.AspNetCore.IntegrationTests/Swashbuckle.AspNetCore.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<ProjectReference Include="..\WebSites\CustomUIIndex\CustomUIIndex.csproj" />
<ProjectReference Include="..\WebSites\GenericControllers\GenericControllers.csproj" />
<ProjectReference Include="..\WebSites\MultipleVersions\MultipleVersions.csproj" />
<ProjectReference Include="..\WebSites\NetCore21\NetCore21.csproj" />
<ProjectReference Include="..\WebSites\OAuth2Integration\OAuth2Integration.csproj" />
<ProjectReference Include="..\WebSites\ReDoc\ReDoc.csproj" />
<ProjectReference Include="..\WebSites\TestFirst\TestFirst.csproj" />
Expand All @@ -40,4 +39,9 @@
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="8.0.4" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="8.0.4" />
</ItemGroup>

</Project>
37 changes: 0 additions & 37 deletions test/WebSites/NetCore21/Controllers/ProductsController.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions test/WebSites/NetCore21/NetCore21.csproj
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions test/WebSites/NetCore21/Program.cs
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions test/WebSites/NetCore21/Properties/launchSettings.json
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions test/WebSites/NetCore21/Startup.cs
View file
Open in desktop

This file was deleted.

Loading
Loading