Skip to content

Commit dddbe60

Browse files
committed
Upgrade to ABP v3.0.0-rc2.
1 parent e010078 commit dddbe60

File tree

7 files changed

+13
-28
lines changed

7 files changed

+13
-28
lines changed

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

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

2020
<ItemGroup>
21-
<PackageReference Include="Abp" Version="3.0.0-beta3" />
22-
<PackageReference Include="Abp.AutoMapper" Version="3.0.0-beta3" />
23-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.0.0-beta3" />
21+
<PackageReference Include="Abp" Version="3.0.0-rc2" />
22+
<PackageReference Include="Abp.AutoMapper" Version="3.0.0-rc2" />
23+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.0.0-rc2" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />

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="3.0.0-beta3" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0-rc2" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
3333
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.0" />
3434
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
35-
<PackageReference Include="Abp.AspNetCore" Version="3.0.0-beta3" />
36-
<PackageReference Include="Abp.ZeroCore" Version="3.0.0-beta3" />
35+
<PackageReference Include="Abp.AspNetCore" Version="3.0.0-rc2" />
36+
<PackageReference Include="Abp.ZeroCore" Version="3.0.0-rc2" />
3737
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
3838
</ItemGroup>
3939

4040
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
4141
<Reference Include="System" />
4242
<Reference Include="Microsoft.CSharp" />
4343

44-
<PackageReference Include="Abp.Web.SignalR" Version="3.0.0-beta3" />
45-
<PackageReference Include="Abp.Owin" Version="3.0.0-beta3" />
44+
<PackageReference Include="Abp.Web.SignalR" Version="3.0.0-rc2" />
45+
<PackageReference Include="Abp.Owin" Version="3.0.0-rc2" />
4646
</ItemGroup>
4747

4848
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
4747
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0-beta3" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0-rc2" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@
5151
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
5252
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
5353
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
54-
<PackageReference Include="Abp.HangFire" Version="3.0.0-beta3" />
55-
<PackageReference Include="Abp.RedisCache" Version="3.0.0-beta3" />
56-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0-beta3" />
54+
<PackageReference Include="Abp.HangFire" Version="3.0.0-rc2" />
55+
<PackageReference Include="Abp.RedisCache" Version="3.0.0-rc2" />
56+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0-rc2" />
5757
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" PrivateAssets="All" />
58-
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
5958
</ItemGroup>
6059

6160
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using Microsoft.Extensions.Logging;
1515
using Microsoft.AspNetCore.Authentication;
1616
using Microsoft.AspNetCore.Authentication.JwtBearer;
17-
using Swashbuckle.AspNetCore.Swagger;
1817

1918
#if FEATURE_SIGNALR
2019
using Owin;
@@ -46,12 +45,6 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
4645

4746
services.AddScoped<IWebResourceManager, WebResourceManager>();
4847

49-
services.AddSwaggerGen(options =>
50-
{
51-
options.SwaggerDoc("v1", new Info { Title = "AbpZeroTemplate API", Version = "v1" });
52-
options.DocInclusionPredicate((docName, description) => true);
53-
});
54-
5548
//Configure Abp and Dependency Injection
5649
return services.AddAbp<AbpProjectNameWebMvcModule>(options =>
5750
{
@@ -80,13 +73,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
8073
app.UseAuthentication();
8174
app.UseJwtTokenMiddleware();
8275

83-
app.UseSwagger();
84-
//Enable middleware to serve swagger - ui assets(HTML, JS, CSS etc.)
85-
app.UseSwaggerUI(options =>
86-
{
87-
options.SwaggerEndpoint("/swagger/v1/swagger.json", "AbpZeroTemplate API V1");
88-
}); //URL: /swagger
89-
9076
#if FEATURE_SIGNALR
9177
//Integrate to OWIN
9278
app.UseAppBuilder(ConfigureOwinServices);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="xunit" Version="2.2.0" />
2525
<PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
2626
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
27-
<PackageReference Include="Abp.TestBase" Version="3.0.0-beta3" />
27+
<PackageReference Include="Abp.TestBase" Version="3.0.0-rc2" />
2828
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.0" />
2929
<PackageReference Include="Castle.Core" Version="4.1.1" />
3030
</ItemGroup>

0 commit comments

Comments
 (0)