Skip to content

Commit 6481e90

Browse files
hikalkanhikalkan
authored
Merge pull request #43 from aspnetboilerplate/netcore2.0
Netcore2.0
2 parents 055a892 + 3b161c0 commit 6481e90

File tree

8 files changed

+59
-53
lines changed

8 files changed

+59
-53
lines changed

Diff for: ‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

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

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
6-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
5+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>
99
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.0.2" />
21-
<PackageReference Include="Abp.AutoMapper" Version="2.0.2" />
20+
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.0.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="3.0.0" />
2222
</ItemGroup>
2323

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

Diff for: ‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

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

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
6-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
5+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
99
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -17,9 +17,9 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp" Version="2.0.2" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
20+
<PackageReference Include="Abp" Version="3.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2323
</ItemGroup>
2424

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

Diff for: ‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

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

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
6-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
5+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.EntityFrameworkCore</AssemblyName>
88
<OutputType>Library</OutputType>
99
<PackageId>AbpCompanyName.AbpProjectName.EntityFrameworkCore</PackageId>
@@ -21,10 +21,11 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Abp.EntityFrameworkCore" Version="2.0.2" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.1" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.0">
24+
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.0.0" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0">
2829
<PrivateAssets>All</PrivateAssets>
2930
</PackageReference>
3031
</ItemGroup>
@@ -35,7 +36,7 @@
3536
</ItemGroup>
3637

3738
<ItemGroup>
38-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
39+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
3940
</ItemGroup>
4041

4142
</Project>

Diff for: ‎src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
using AbpCompanyName.AbpProjectName.Configuration;
22
using AbpCompanyName.AbpProjectName.Web;
33
using Microsoft.EntityFrameworkCore;
4-
using Microsoft.EntityFrameworkCore.Infrastructure;
4+
using Microsoft.EntityFrameworkCore.Design;
55
using Microsoft.Extensions.Configuration;
66

77
namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
88
{
99
/* This class is needed to run EF Core PMC commands. Not used anywhere else */
10-
public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>
10+
public class AbpProjectNameDbContextFactory : IDesignTimeDbContextFactory<AbpProjectNameDbContext>
1111
{
12-
public AbpProjectNameDbContext Create(DbContextFactoryOptions options)
12+
public AbpProjectNameDbContext CreateDbContext(string[] args)
1313
{
1414
var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
1515
var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder());
1616

1717
DbContextOptionsConfigurer.Configure(
18-
builder,
18+
builder,
1919
configuration.GetConnectionString(AbpProjectNameConsts.ConnectionStringName)
20-
);
20+
);
2121

2222
return new AbpProjectNameDbContext(builder.Options);
2323
}

Diff for: ‎src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj

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

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
6-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
5+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
<AssemblyName>AbpCompanyName.AbpProjectName.Web</AssemblyName>
99
<OutputType>Exe</OutputType>
@@ -30,24 +30,27 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
34-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
35-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.1" />
36-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
37-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
38-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
39-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
40-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
41-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.1" />
42-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
43-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
44-
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
45-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.0" />
46-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.0">
33+
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
34+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
35+
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="3.0.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.0" />
38+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
39+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
40+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
41+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
42+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
43+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
46+
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
47+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0">
4749
<PrivateAssets>All</PrivateAssets>
4850
</PackageReference>
49-
<PackageReference Include="Abp.AspNetCore" Version="2.0.2" />
50-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.0.2" />
51+
<PackageReference Include="Abp.AspNetCore" Version="3.0.0" />
52+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.0.0" />
53+
<PackageReference Include="Castle.Core" Version="4.1.1" />
5154
</ItemGroup>
5255

5356
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -56,7 +59,7 @@
5659
</ItemGroup>
5760

5861
<ItemGroup>
59-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
62+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
6063
</ItemGroup>
6164

6265
</Project>

Diff for: ‎test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

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

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
6-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
5+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -20,16 +20,17 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
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="Shouldly" Version="2.8.2" />
28-
<PackageReference Include="Abp.TestBase" Version="2.0.2" />
27+
<PackageReference Include="Shouldly" Version="2.8.3" />
28+
<PackageReference Include="Abp.TestBase" Version="3.0.0" />
2929
<PackageReference Include="NSubstitute" Version="2.0.3" />
30-
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="1.1.1" />
30+
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.0.0" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.0" />
3232
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
33+
<PackageReference Include="Castle.Core" Version="4.1.1" />
3334
</ItemGroup>
3435

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

Diff for: ‎test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Version>1.0.0.0</Version>
5-
<TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
6-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
5+
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
6+
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<PreserveCompilationContext>true</PreserveCompilationContext>
88
<AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
99
<PackageId>AbpCompanyName.AbpProjectName.Web.Tests</PackageId>
@@ -21,12 +21,13 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2525
<PackageReference Include="xunit" Version="2.2.0" />
2626
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
28-
<PackageReference Include="Abp.AspNetCore.TestBase" Version="2.0.2" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
28+
<PackageReference Include="Abp.AspNetCore.TestBase" Version="3.0.0" />
2929
<PackageReference Include="AngleSharp" Version="0.9.9" />
30+
<PackageReference Include="Castle.Core" Version="4.1.1" />
3031
</ItemGroup>
3132

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

Diff for: ‎test/AbpCompanyName.AbpProjectName.Web.Tests/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
5151
private void UseInMemoryDb(IServiceProvider serviceProvider)
5252
{
5353
var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
54-
builder.UseInMemoryDatabase().UseInternalServiceProvider(serviceProvider);
54+
builder.UseInMemoryDatabase(Guid.NewGuid().ToString()).UseInternalServiceProvider(serviceProvider);
5555
var options = builder.Options;
5656

5757
var iocManager = serviceProvider.GetRequiredService<IIocManager>();

0 commit comments

Comments
 (0)