Upgraded to ABP v0.10.0.

Author: hikalkan

src/AbpCompanyName.AbpProjectName.Application/project.json

@@ -2,7 +2,7 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp.AutoMapper": "0.9.7",
+    "Abp.AutoMapper": "0.10.0",
     "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*"
   },
 

src/AbpCompanyName.AbpProjectName.Core/project.json

@@ -2,7 +2,7 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp": "0.9.7"
+    "Abp": "0.10.0"
   },
 
   "frameworks": {

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json

@@ -2,7 +2,7 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp.EntityFrameworkCore": "0.9.7",
+    "Abp.EntityFrameworkCore": "0.10.0",
     "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
     "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
     "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"

src/AbpCompanyName.AbpProjectName.Web/Startup.cs

@@ -38,10 +38,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             });
 
             //Configure Abp and Dependency Injection
-            return services.AddAbp(abpBootstrapper =>
+            return services.AddAbp<AbpProjectNameWebModule>(options =>
             {
                 //Configure Log4Net logging
-                abpBootstrapper.IocManager.IocContainer.AddFacility<LoggingFacility>(
+                options.IocManager.IocContainer.AddFacility<LoggingFacility>(
                     f => f.UseLog4Net().WithConfig("log4net.config")
                 );
             });

src/AbpCompanyName.AbpProjectName.Web/project.json

@@ -3,8 +3,6 @@
     "Castle.Windsor-log4net": "3.3.0",
     "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
     "AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
-    "Castle.LoggingFacility.MsLogging": "0.1.0",
-    "Abp.AspNetCore": "0.9.7",
     "Microsoft.AspNetCore.Diagnostics": "1.0.0",
     "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
     "Microsoft.AspNetCore.Mvc": "1.0.0",
@@ -19,7 +17,9 @@
     "Microsoft.Extensions.Logging": "1.0.0",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
     "Microsoft.VisualStudio.Web.CodeGeneration.Tools": "1.0.0-preview2-final",
-    "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": "1.0.0-preview2-final"
+    "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": "1.0.0-preview2-final",
+    "Abp.AspNetCore": "0.10.0",
+    "Castle.LoggingFacility.MsLogging": "1.0.0"
   },
 
   "tools": {

test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs

@@ -1,26 +1,18 @@
 using System;
 using System.Threading.Tasks;
-using Abp.Collections;
-using Abp.Modules;
 using Abp.TestBase;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using AbpCompanyName.AbpProjectName.Tests.TestDatas;
 
 namespace AbpCompanyName.AbpProjectName.Tests
 {
-    public class AbpProjectNameTestBase : AbpIntegratedTestBase
+    public class AbpProjectNameTestBase : AbpIntegratedTestBase<AbpProjectNameTestModule>
     {
         public AbpProjectNameTestBase()
         {
             UsingDbContext(context => new TestDataBuilder(context).Build());
         }
 
-        protected override void AddModules(ITypeList<AbpModule> modules)
-        {
-            base.AddModules(modules);
-            modules.Add<AbpProjectNameTestModule>();
-        }
-
         protected virtual void UsingDbContext(Action<AbpProjectNameDbContext> action)
         {
             using (var context = LocalIocManager.Resolve<AbpProjectNameDbContext>())

test/AbpCompanyName.AbpProjectName.Tests/project.json

@@ -8,13 +8,13 @@
     "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
     "AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
     "Shouldly": "2.8.0",
-    "Castle.Windsor.MsDependencyInjection": "0.2.0",
-    "Abp.TestBase": "0.9.7",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Microsoft.EntityFrameworkCore.InMemory": "1.0.0",
     "xunit": "2.2.0-beta2-build3300",
     "xunit.extensibility.execution": "2.2.0-beta2-build3300",
-    "xunit.runner.visualstudio": "2.2.0-beta2-build1149"
+    "xunit.runner.visualstudio": "2.2.0-beta2-build1149",
+    "Abp.TestBase": "0.10.0",
+    "Castle.Windsor.MsDependencyInjection": "1.0.0"
   },
 
   "frameworks": {

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

@@ -4,34 +4,21 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Abp.Dependency;
+using Abp.AspNetCore.TestBase;
 using Abp.Extensions;
-using Abp.TestBase.Runtime.Session;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using AbpCompanyName.AbpProjectName.Tests.TestDatas;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.TestHost;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Shouldly;
-using Microsoft.Extensions.DependencyInjection;
 using Abp.Collections.Extensions;
 
 namespace AbpCompanyName.AbpProjectName.Web.Tests
 {
-    public abstract class AbpProjectNameWebTestBase
+    public abstract class AbpProjectNameWebTestBase :AbpAspNetCoreIntegratedTestBase<Startup>
     {
-        protected TestServer Server { get; private set; }
-
-        protected HttpClient Client { get; private set; }
-
-        protected IServiceProvider ServiceProvider { get; private set; }
-
-        protected IIocManager IocManager { get; private set; }
-
-        protected TestAbpSession AbpSession { get; private set; }
-
         protected static readonly Lazy<string> ContentRootFolder;
 
         static AbpProjectNameWebTestBase()
@@ -41,25 +28,14 @@ static AbpProjectNameWebTestBase()
 
         protected AbpProjectNameWebTestBase()
         {
-            
-
-            var builder = new WebHostBuilder()
-                .UseContentRoot(ContentRootFolder.Value)
-                .UseStartup<Startup>();
-
-            Server = new TestServer(builder);
-            Client = Server.CreateClient();
-
-            ServiceProvider = Server.Host.Services;
-            IocManager = ServiceProvider.GetRequiredService<IIocManager>();
-            AbpSession = ServiceProvider.GetRequiredService<TestAbpSession>();
-
             UsingDbContext(context => new TestDataBuilder(context).Build());
         }
 
-        private static bool DirectoryContains(string directory, string fileName)
+        protected override IWebHostBuilder CreateWebHostBuilder()
         {
-            return Directory.GetFiles(directory).Any(filePath => string.Equals(Path.GetFileName(filePath), fileName));
+            return base
+                .CreateWebHostBuilder()
+                .UseContentRoot(ContentRootFolder.Value);
         }
 
         #region GetUrl
@@ -190,6 +166,11 @@ private static string CalculateContentRootFolder()
             return Path.Combine(directoryInfo.FullName, @"src\AbpCompanyName.AbpProjectName.Web");
         }
 
+        private static bool DirectoryContains(string directory, string fileName)
+        {
+            return Directory.GetFiles(directory).Any(filePath => string.Equals(Path.GetFileName(filePath), fileName));
+        }
+
         #endregion
     }
 }

test/AbpCompanyName.AbpProjectName.Web.Tests/Startup.cs

@@ -34,12 +34,9 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             mvc.AddControllersAsServices();
 
             //Configure Abp and Dependency Injection
-            return services.AddAbp(options =>
+            return services.AddAbp<AbpProjectNameWebTestModule>(options =>
             {
-                options.SetupTest(testOptions =>
-                {
-                    testOptions.Modules.Add<AbpProjectNameWebTestModule>();
-                });
+                options.SetupTest();
             });
         }
 

test/AbpCompanyName.AbpProjectName.Web.Tests/project.json

@@ -4,7 +4,7 @@
   "testRunner": "xunit",
 
   "dependencies": {
-    "Abp.AspNetCore.TestBase": "0.9.7",
+    "Abp.AspNetCore.TestBase": "0.10.0",
     "AbpCompanyName.AbpProjectName.Tests": "1.0.0.0-*",
     "AbpCompanyName.AbpProjectName.Web": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0"