Skip to content

Commit 0a81cc8

Browse files
Update Swashbuckle.AspNetCore to latest version Fixed #337
1 parent 3771917 commit 0a81cc8

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.3" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.3">
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.4" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.3" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.4" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<ItemGroup>
2626
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
2727
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
28-
<PackageReference Include="Swashbuckle.AspNetCore" Version="2.5.0" />
28+
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
2929
<PackageReference Include="Abp.AspNetCore" Version="3.8.3" />
3030
<PackageReference Include="Abp.ZeroCore" Version="3.8.3" />
31-
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.3" />
31+
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
3232
<PackageReference Include="Abp.AspNetCore.SignalR" Version="3.8.3" />
3333
</ItemGroup>
3434

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.4">
36+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.5">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
3939
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
4040
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
41-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
41+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
4242
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
4343
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
4444
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
47-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
47+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
4848
<PackageReference Include="Abp.Castle.Log4Net" Version="3.8.3" />
4949
</ItemGroup>
5050

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/SecurityRequirementsOperationFilter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using System.Reflection;
34
using Swashbuckle.AspNetCore.Swagger;
45
using Swashbuckle.AspNetCore.SwaggerGen;
56
using Abp.Authorization;
@@ -10,13 +11,13 @@ public class SecurityRequirementsOperationFilter : IOperationFilter
1011
{
1112
public void Apply(Operation operation, OperationFilterContext context)
1213
{
13-
var actionAttrs = context.ControllerActionDescriptor.MethodInfo.GetCustomAttributes(true).ToList();
14+
var actionAttrs = context.MethodInfo.GetCustomAttributes(true).ToList();
1415
if (actionAttrs.OfType<AbpAllowAnonymousAttribute>().Any())
1516
{
1617
return;
1718
}
1819

19-
var controllerAttrs = context.ControllerActionDescriptor.ControllerTypeInfo.GetCustomAttributes(true);
20+
var controllerAttrs = context.MethodInfo.DeclaringType.GetTypeInfo().GetCustomAttributes(true);
2021
var actionAbpAuthorizeAttrs = actionAttrs.OfType<AbpAuthorizeAttribute>().ToList();
2122

2223
if (!actionAbpAuthorizeAttrs.Any() && controllerAttrs.OfType<AbpAllowAnonymousAttribute>().Any())

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using Abp.AspNetCore;
1313
using Abp.Castle.Logging.Log4Net;
1414
using Abp.Extensions;
15-
using AbpCompanyName.AbpProjectName.Authentication.JwtBearer;
1615
using AbpCompanyName.AbpProjectName.Configuration;
1716
using AbpCompanyName.AbpProjectName.Identity;
1817

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
34-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.4">
34+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.5">
3535
<PrivateAssets>All</PrivateAssets>
3636
</PackageReference>
3737
<PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.2" />
@@ -40,13 +40,13 @@
4040
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
4141
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="2.1.2" />
4242
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
43-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
43+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
4444
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
4545
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
4646
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
4747
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
4848
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
49-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
49+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
5050
<PackageReference Include="Abp.HangFire" Version="3.8.3" />
5151
<PackageReference Include="Abp.RedisCache" Version="3.8.3" />
5252
<PackageReference Include="Abp.Castle.Log4Net" Version="3.8.3" />

aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
2626
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
2727
<PackageReference Include="Abp.TestBase" Version="3.8.3" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.3" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.4" />
2929
<PackageReference Include="Castle.Core" Version="4.3.1" />
3030
</ItemGroup>
3131

0 commit comments

Comments
 (0)