Skip to content

Commit 884b945

Browse files
ismcagdasismcagdas
authored
Merge pull request #530 from do-it-ger/master
Update to Abp 5.6 & Fix Swagger UI for Kestrel web server
2 parents ab062bb + 1be7ee1 commit 884b945

File tree

11 files changed

+45
-32
lines changed

11 files changed

+45
-32
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="5.4.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="5.4.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="5.6.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="5.6.0" />
2323
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
2424
</ItemGroup>
2525

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

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

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.3">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="5.4.0" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="5.6.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
29-
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
30-
<PackageReference Include="Abp.AspNetCore" Version="5.4.0" />
31-
<PackageReference Include="Abp.ZeroCore" Version="5.4.0" />
32-
<PackageReference Include="Abp.AspNetCore.SignalR" Version="5.4.0" />
28+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
29+
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.0" />
30+
<PackageReference Include="Abp.AspNetCore" Version="5.6.0" />
31+
<PackageReference Include="Abp.ZeroCore" Version="5.6.0" />
32+
<PackageReference Include="Abp.AspNetCore.SignalR" Version="5.6.0" />
3333
</ItemGroup>
3434

3535
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="Abp.Castle.Log4Net" Version="5.4.0" />
40-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
39+
<PackageReference Include="Abp.Castle.Log4Net" Version="5.6.0" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
4141
<PrivateAssets>all</PrivateAssets>
4242
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4343
</PackageReference>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using Microsoft.AspNetCore;
22
using Microsoft.AspNetCore.Hosting;
3+
using Microsoft.Extensions.Configuration;
4+
using System.IO;
35

46
namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
57
{

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class Startup
2525
{
2626
private const string _defaultCorsPolicyName = "localhost";
2727

28+
private const string _apiVersion = "v1";
29+
2830
private readonly IConfigurationRoot _appConfiguration;
2931

3032
public Startup(IWebHostEnvironment env)
@@ -76,9 +78,9 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
7678
// Swagger - Enable this line and the related lines in Configure method to enable swagger UI
7779
services.AddSwaggerGen(options =>
7880
{
79-
options.SwaggerDoc("v1", new OpenApiInfo
81+
options.SwaggerDoc(_apiVersion, new OpenApiInfo
8082
{
81-
Version = "v1",
83+
Version = _apiVersion,
8284
Title = "AbpProjectName API",
8385
Description = "AbpProjectName",
8486
// uncomment if needed TermsOfService = new Uri("https://example.com/terms"),
@@ -136,13 +138,15 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
136138
endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
137139
endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
138140
});
139-
141+
140142
// Enable middleware to serve generated Swagger as a JSON endpoint
141-
app.UseSwagger();
143+
app.UseSwagger(c => { c.RouteTemplate = "swagger/{documentName}/swagger.json"; });
144+
142145
// Enable middleware to serve swagger-ui assets (HTML, JS, CSS etc.)
143146
app.UseSwaggerUI(options =>
144147
{
145-
options.SwaggerEndpoint(_appConfiguration["App:ServerRootAddress"].EnsureEndsWith('/') + "swagger/v1/swagger.json", "AbpProjectName API V1");
148+
// specifying the Swagger JSON endpoint.
149+
options.SwaggerEndpoint($"/swagger/{_apiVersion}/swagger.json", $"AbpProjectName API {_apiVersion}");
146150
options.IndexStream = () => Assembly.GetExecutingAssembly()
147151
.GetManifestResourceStream("AbpCompanyName.AbpProjectName.Web.Host.wwwroot.swagger.ui.index.html");
148152
options.DisplayRequestDuration(); // Controls the display of the request duration (in milliseconds) for "Try it out" requests.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/appsettings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,12 @@
1414
"Issuer": "AbpProjectName",
1515
"Audience": "AbpProjectName"
1616
}
17+
},
18+
"Kestrel": {
19+
"Endpoints": {
20+
"Http": {
21+
"Url": "http://localhost:21021/"
22+
}
23+
}
1724
}
1825
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="BuildBundlerMinifier" Version="3.2.435" />
39-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" />
40-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
38+
<PackageReference Include="BuildBundlerMinifier" Version="3.2.447" />
39+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.3" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
4141
<PrivateAssets>all</PrivateAssets>
4242
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4343
</PackageReference>
44-
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.1" />
45-
<PackageReference Include="Abp.HangFire" Version="5.4.0" />
46-
<PackageReference Include="Abp.RedisCache" Version="5.4.0" />
47-
<PackageReference Include="Abp.Castle.Log4Net" Version="5.4.0" />
44+
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.2" />
45+
<PackageReference Include="Abp.HangFire" Version="5.6.0" />
46+
<PackageReference Include="Abp.RedisCache" Version="5.6.0" />
47+
<PackageReference Include="Abp.Castle.Log4Net" Version="5.6.0" />
4848
</ItemGroup>
4949

5050
<ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
2222
<PackageReference Include="NSubstitute" Version="4.2.1" />
2323
<PackageReference Include="Shouldly" Version="3.0.2" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
@@ -27,8 +27,8 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="Abp.TestBase" Version="5.4.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
30+
<PackageReference Include="Abp.TestBase" Version="5.6.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.3" />
3232
<PackageReference Include="Castle.Core" Version="4.4.0" />
3333
</ItemGroup>
3434

0 commit comments

Comments
 (0)