Skip to content

Commit e883672

Browse files
ismcagdasismcagdas
authored
Merge pull request #81 from aspnetboilerplate/upgrade-to-abp-5-1-0
Upgraded to abp 5.1.0 and aspnet core 3.1
2 parents 61af9a5 + c241a09 commit e883672

File tree

12 files changed

+73
-103
lines changed

12 files changed

+73
-103
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

+3-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>
@@ -17,13 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp.EntityFrameworkCore" Version="4.9.0" />
21-
<PackageReference Include="Abp.AutoMapper" Version="4.9.0" />
22-
</ItemGroup>
23-
24-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
25-
<Reference Include="System" />
26-
<Reference Include="Microsoft.CSharp" />
20+
<PackageReference Include="Abp.EntityFrameworkCore" Version="5.1.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="5.1.0" />
2722
</ItemGroup>
2823

2924
</Project>

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
@@ -17,14 +17,9 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp" Version="4.9.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.4" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
23-
</ItemGroup>
24-
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
26-
<Reference Include="System" />
27-
<Reference Include="Microsoft.CSharp" />
20+
<PackageReference Include="Abp" Version="5.1.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
2823
</ItemGroup>
2924

3025
</Project>

‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

+11-20
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.EntityFrameworkCore</AssemblyName>
88
<OutputType>Library</OutputType>
@@ -17,40 +17,31 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<Compile Remove="Migrations\20180726084415_Upgrade_ABP_3.8.0.cs" />
21-
<Compile Remove="Migrations\20180726084415_Upgrade_ABP_3.8.0.Designer.cs" />
22-
<Compile Remove="Migrations\20181015085310_Upgraded_To_ABP_v3_9_0.cs" />
23-
<Compile Remove="Migrations\20181015085310_Upgraded_To_ABP_v3_9_0.Designer.cs" />
24-
<Compile Remove="Migrations\20190719145525_Upgraded_To_Abp_4_8_0.cs" />
25-
<Compile Remove="Migrations\20190719145525_Upgraded_To_Abp_4_8_0.Designer.cs" />
20+
<Compile Remove="Migrations\**" />
21+
<EmbeddedResource Remove="Migrations\**" />
22+
<None Remove="Migrations\**" />
2623
</ItemGroup>
2724

2825
<ItemGroup>
2926
<ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
3027
</ItemGroup>
3128

3229
<ItemGroup>
33-
<PackageReference Include="Abp.EntityFrameworkCore" Version="4.9.0" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
30+
<PackageReference Include="Abp.EntityFrameworkCore" Version="5.1.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
3636
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
37-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
37+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
3838
<PrivateAssets>all</PrivateAssets>
3939
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4040
</PackageReference>
4141
</ItemGroup>
4242

43-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
44-
<Reference Include="System" />
45-
<Reference Include="Microsoft.CSharp" />
46-
</ItemGroup>
47-
4843
<ItemGroup>
4944
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
5045
</ItemGroup>
5146

52-
<ItemGroup>
53-
<Folder Include="Migrations\" />
54-
</ItemGroup>
55-
5647
</Project>

‎src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj

+10-24
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
<AssemblyName>AbpCompanyName.AbpProjectName.Web</AssemblyName>
@@ -11,6 +11,9 @@
1111
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1212
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1313
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
14+
<LangVersion>7.2</LangVersion>
15+
<PreserveCompilationReferences>true</PreserveCompilationReferences>
16+
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
1417
</PropertyGroup>
1518

1619
<ItemGroup>
@@ -30,33 +33,16 @@
3033
</ItemGroup>
3134

3235
<ItemGroup>
36+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.0" />
3337
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
3438
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
3539
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.1.0" />
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
37-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.1" />
38-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
39-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
43-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.6" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
45-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
46-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
47-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
49-
<PrivateAssets>all</PrivateAssets>
50-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
51-
</PackageReference>
40+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
41+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.0" />
42+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
5243
<PackageReference Include="Castle.Core" Version="4.4.0" />
53-
<PackageReference Include="Abp.AspNetCore" Version="4.9.0" />
54-
<PackageReference Include="Abp.Castle.Log4Net" Version="4.9.0" />
55-
</ItemGroup>
56-
57-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
58-
<Reference Include="System" />
59-
<Reference Include="Microsoft.CSharp" />
44+
<PackageReference Include="Abp.AspNetCore" Version="5.1.0" />
45+
<PackageReference Include="Abp.Castle.Log4Net" Version="5.1.0" />
6046
</ItemGroup>
6147

6248
<ItemGroup>

‎src/AbpCompanyName.AbpProjectName.Web/Startup/AbpProjectNameWebModule.cs

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using AbpCompanyName.AbpProjectName.Configuration;
66
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
77
using Microsoft.AspNetCore.Hosting;
8+
using Microsoft.AspNetCore.Mvc.ApplicationParts;
89
using Microsoft.Extensions.Configuration;
910

1011
namespace AbpCompanyName.AbpProjectName.Web.Startup
@@ -38,5 +39,11 @@ public override void Initialize()
3839
{
3940
IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebModule).GetAssembly());
4041
}
42+
43+
public override void PostInitialize()
44+
{
45+
IocManager.Resolve<ApplicationPartManager>()
46+
.AddApplicationPartsIfNotAddedBefore(typeof(AbpProjectNameWebModule).Assembly);
47+
}
4148
}
4249
}

‎src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.AspNetCore.Hosting;
99
using Microsoft.AspNetCore.Mvc;
1010
using Microsoft.Extensions.DependencyInjection;
11+
using Microsoft.Extensions.Hosting;
1112
using Microsoft.Extensions.Logging;
1213

1314
namespace AbpCompanyName.AbpProjectName.Web.Startup
@@ -22,10 +23,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
2223
DbContextOptionsConfigurer.Configure(options.DbContextOptions, options.ConnectionString);
2324
});
2425

25-
services.AddMvc(options =>
26+
services.AddControllersWithViews(options =>
2627
{
2728
options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
28-
});
29+
}).AddNewtonsoftJson();
2930

3031
//Configure Abp and Dependency Injection
3132
return services.AddAbp<AbpProjectNameWebModule>(options =>
@@ -37,7 +38,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
3738
});
3839
}
3940

40-
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
41+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
4142
{
4243
app.UseAbp(); //Initializes ABP framework.
4344

@@ -52,12 +53,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
5253
}
5354

5455
app.UseStaticFiles();
56+
app.UseRouting();
5557

56-
app.UseMvc(routes =>
58+
app.UseEndpoints(endpoints =>
5759
{
58-
routes.MapRoute(
59-
name: "default",
60-
template: "{controller=Home}/{action=Index}/{id?}");
60+
endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
6161
});
6262
}
6363
}

‎src/AbpCompanyName.AbpProjectName.Web/web.config

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<!--
4-
Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
5-
-->
63
<system.webServer>
74
<handlers>
85
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
96
</handlers>
10-
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false">
11-
<environmentVariables />
7+
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" startupTimeLimit="3600" requestTimeout="23:00:00">
8+
<environmentVariables>
9+
<environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
10+
<environmentVariable name="COMPLUS_ForceENC" value="1" />
11+
</environmentVariables>
1212
</aspNetCore>
13+
<httpProtocol>
14+
<customHeaders>
15+
<remove name="X-Powered-By" />
16+
</customHeaders>
17+
</httpProtocol>
1318
</system.webServer>
1419
</configuration>

‎test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

+5-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
@@ -21,24 +21,18 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Castle.Core" Version="4.4.0" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
2525
<PackageReference Include="xunit" Version="2.4.1" />
2626
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
2727
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3030
</PackageReference>
3131
<PackageReference Include="Shouldly" Version="3.0.2" />
32-
<PackageReference Include="Abp.TestBase" Version="4.9.0" />
33-
<PackageReference Include="NSubstitute" Version="4.2.0" />
32+
<PackageReference Include="Abp.TestBase" Version="5.1.0" />
33+
<PackageReference Include="NSubstitute" Version="4.2.1" />
3434
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.4" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
3636
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
3737
</ItemGroup>
38-
39-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
40-
<Reference Include="System" />
41-
<Reference Include="Microsoft.CSharp" />
42-
</ItemGroup>
43-
4438
</Project>

‎test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestModule.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private void SetupInMemoryDb()
3939
);
4040

4141
var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
42-
builder.UseInMemoryDatabase().UseInternalServiceProvider(serviceProvider);
42+
builder.UseInMemoryDatabase("Test").UseInternalServiceProvider(serviceProvider);
4343

4444
IocManager.IocContainer.Register(
4545
Component

‎test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj

+5-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
@@ -22,20 +22,16 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Castle.Core" Version="4.4.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
2627
<PackageReference Include="xunit" Version="2.4.1" />
2728
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
2829
<PrivateAssets>all</PrivateAssets>
2930
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3031
</PackageReference>
3132
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
32-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="4.9.0" />
33-
<PackageReference Include="AngleSharp" Version="0.12.1" />
34-
</ItemGroup>
35-
36-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
37-
<Reference Include="System" />
38-
<Reference Include="Microsoft.CSharp" />
33+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="5.1.0" />
34+
<PackageReference Include="AngleSharp" Version="0.13.0" />
3935
</ItemGroup>
4036

4137
<ItemGroup>

‎test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
using System;
22
using System.Net;
33
using System.Net.Http;
4+
using System.Reflection;
45
using System.Threading.Tasks;
56
using Abp.AspNetCore.TestBase;
67
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
78
using AbpCompanyName.AbpProjectName.Tests.TestDatas;
9+
using AbpCompanyName.AbpProjectName.Web.Controllers;
10+
using AbpCompanyName.AbpProjectName.Web.Startup;
11+
using AbpCompanyName.AbpProjectName.Web.Tests.Controllers;
812
using AngleSharp.Html.Dom;
913
using AngleSharp.Html.Parser;
1014
using Microsoft.AspNetCore.Hosting;
@@ -32,7 +36,8 @@ protected override IWebHostBuilder CreateWebHostBuilder()
3236
{
3337
return base
3438
.CreateWebHostBuilder()
35-
.UseContentRoot(ContentRootFolder.Value);
39+
.UseContentRoot(ContentRootFolder.Value)
40+
.UseSetting(WebHostDefaults.ApplicationKey, typeof(AbpProjectNameWebModule).Assembly.FullName);
3641
}
3742

3843
#region Get response

0 commit comments

Comments
 (0)