Upgraded to ABP v0.10.0.

aspnetboilerplate · Jul 17, 2016 · 329a84f · 329a84f
1 parent 2b095ef
commit 329a84f
Show file tree

Hide file tree

Showing 16 changed files with 59 additions and 63 deletions.
diff --git a/src/Abp.Zero.EntityFramework/project.json b/src/Abp.Zero.EntityFramework/project.json
@@ -1,9 +1,9 @@
 {
-  "version": "0.9.6.0-*",
+  "version": "0.10.0.0-*",
 
   "dependencies": {
-    "Abp.EntityFramework": "0.9.7",
-    "Abp.Zero": "0.9.6.0-*"
+    "Abp.EntityFramework": "0.10.0.1",
+    "Abp.Zero": "0.10.0.0-*"
   },
 
   "frameworks": {

diff --git a/src/Abp.Zero.Ldap/project.json b/src/Abp.Zero.Ldap/project.json
@@ -1,8 +1,8 @@
 {
-  "version": "0.9.6.0-*",
+  "version": "0.10.0.0-*",
 
   "dependencies": {
-    "Abp.Zero": "0.9.6.0-*"
+    "Abp.Zero": "0.10.0.0-*"
   },
 
   "frameworks": {

diff --git a/src/Abp.Zero.NHibernate/project.json b/src/Abp.Zero.NHibernate/project.json
@@ -1,10 +1,10 @@
 {
-  "version": "0.9.6.0-*",
+  "version": "0.10.0.0-*",
 
   "dependencies": {
-    "Abp.FluentMigrator": "0.9.7",
-    "Abp.NHibernate": "0.9.7",
-    "Abp.Zero": "0.9.6.0-*"
+    "Abp.FluentMigrator": "0.10.0.1",
+    "Abp.NHibernate": "0.10.0.1",
+    "Abp.Zero": "0.10.0.0-*"
   },
 
   "frameworks": {

diff --git a/src/Abp.Zero/Abp.Zero.xproj b/src/Abp.Zero/Abp.Zero.xproj
@@ -16,4 +16,9 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties project_1json__JSONSchema="" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
diff --git a/src/Abp.Zero/Localization/MultiTenantLocalizationSource.cs b/src/Abp.Zero/Localization/MultiTenantLocalizationSource.cs
@@ -41,7 +41,7 @@ public string GetString(int? tenantId, string name, CultureInfo culture)
 
             if (value == null)
             {
-                return ReturnGivenNameOrThrowException(name);
+                return ReturnGivenNameOrThrowException(name, culture);
             }
 
             return value;

diff --git a/src/Abp.Zero/project.json b/src/Abp.Zero/project.json
@@ -1,8 +1,8 @@
 {
-  "version": "0.9.6.0-*",
+  "version": "0.10.0.0-*",
 
   "dependencies": {
-    "Abp": "0.9.7",
+    "Abp": "0.10.0.1",
     "Microsoft.AspNet.Identity.Core": "2.2.1"
   },
 

diff --git a/test/Abp.Zero.SampleApp.EntityFramework/project.json b/test/Abp.Zero.SampleApp.EntityFramework/project.json
@@ -1,9 +1,9 @@
 {
-  "version": "0.9.6.0-*",
+  "version": "0.10.0.0-*",
 
   "dependencies": {
-    "Abp.Zero.SampleApp": "0.9.6.0-*",
-    "Abp.Zero.EntityFramework": "0.9.6.0-*"
+    "Abp.Zero.SampleApp": "0.10.0.0-*",
+    "Abp.Zero.EntityFramework": "0.10.0.0-*"
   },
 
   "frameworks": {

diff --git a/test/Abp.Zero.SampleApp.NHibernateTests/NHibernate/NHibernateTestBase.cs b/test/Abp.Zero.SampleApp.NHibernateTests/NHibernate/NHibernateTestBase.cs
@@ -2,8 +2,6 @@
 using System.Data;
 using System.Data.SQLite;
 using System.Linq;
-using Abp.Collections;
-using Abp.Modules;
 using Abp.TestBase;
 using Abp.Zero.SampleApp.MultiTenancy;
 using Abp.Zero.SampleApp.NHibernate.TestDatas;
@@ -13,7 +11,7 @@
 
 namespace Abp.Zero.SampleApp.NHibernate
 {
-    public abstract class NHibernateTestBase : AbpIntegratedTestBase
+    public abstract class NHibernateTestBase : AbpIntegratedTestBase<SampleAppNHibernateModule>
     {
         private SQLiteConnection _connection;
 
@@ -32,12 +30,6 @@ protected override void PreInitialize()
                 );
         }
 
-        protected override void AddModules(ITypeList<AbpModule> modules)
-        {
-            base.AddModules(modules);
-            modules.Add<SampleAppNHibernateModule>();
-        }
-
         public void UsingSession(Action<ISession> action)
         {
             using (var session = LocalIocManager.Resolve<ISessionFactory>().OpenSession(_connection))

diff --git a/test/Abp.Zero.SampleApp.NHibernateTests/project.json b/test/Abp.Zero.SampleApp.NHibernateTests/project.json
@@ -9,11 +9,11 @@
     "xunit.runner.visualstudio": "2.2.0-beta2-build1149",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "NSubstitute": "1.10.0",
-    "Abp.Zero.SampleApp": "0.9.6.0-*",
-    "Abp.Zero.NHibernate": "0.9.6.0-*",
+    "Abp.Zero.SampleApp": "0.10.0.0-*",
+    "Abp.Zero.NHibernate": "0.10.0.0-*",
     "Shouldly": "2.8.0",
-    "Abp.TestBase": "0.9.7",
-    "System.Data.SQLite.Core": "1.0.102"
+    "System.Data.SQLite.Core": "1.0.102",
+    "Abp.TestBase": "0.10.0.1"
   },
 
   "frameworks": {

diff --git a/test/Abp.Zero.SampleApp.Tests/Ldap/LdapAuthenticationSource_Tests.cs b/test/Abp.Zero.SampleApp.Tests/Ldap/LdapAuthenticationSource_Tests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Abp.Authorization.Users;
-using Abp.Collections;
 using Abp.Configuration;
 using Abp.Dependency;
 using Abp.Modules;
@@ -15,7 +14,7 @@
 
 namespace Abp.Zero.SampleApp.Tests.Ldap
 {
-    public class LdapAuthenticationSource_Tests : SampleAppTestBase
+    public class LdapAuthenticationSource_Tests : SampleAppTestBase<LdapAuthenticationSource_Tests.MyUserLoginTestModule>
     {
         private readonly UserManager _userManager;
 
@@ -24,12 +23,6 @@ public LdapAuthenticationSource_Tests()
             _userManager = Resolve<UserManager>();
         }
 
-        protected override void AddModules(ITypeList<AbpModule> modules)
-        {
-            base.AddModules(modules);
-            modules.Add<MyUserLoginTestModule>();
-        }
-
         //[Fact]
         public async Task Should_Login_From_Ldap_Without_Any_Configuration()
         {
@@ -76,7 +69,7 @@ public async Task Should_Not_Login_From_Ldap_With_Wrong_Configuration()
             await Assert.ThrowsAnyAsync<Exception>(() => _userManager.LoginAsync("testuser", "testpass", Tenant.DefaultTenantName));
         }
 
-        [DependsOn(typeof(AbpZeroLdapModule))]
+        [DependsOn(typeof(AbpZeroLdapModule), typeof(SampleAppTestModule))]
         public class MyUserLoginTestModule : AbpModule
         {
             public override void PreInitialize()

diff --git a/test/Abp.Zero.SampleApp.Tests/Localization/ApplicationLanguageManager_Tests.cs b/test/Abp.Zero.SampleApp.Tests/Localization/ApplicationLanguageManager_Tests.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Abp.Localization;
 using Abp.Zero.SampleApp.MultiTenancy;

diff --git a/test/Abp.Zero.SampleApp.Tests/SampleAppTestBase.cs b/test/Abp.Zero.SampleApp.Tests/SampleAppTestBase.cs
@@ -4,11 +4,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Abp.Authorization;
-using Abp.Collections;
 using Abp.IdentityFramework;
 using Abp.Modules;
 using Abp.TestBase;
-using Abp.Zero.Ldap;
 using Abp.Zero.SampleApp.EntityFramework;
 using Abp.Zero.SampleApp.MultiTenancy;
 using Abp.Zero.SampleApp.Roles;
@@ -20,7 +18,13 @@
 
 namespace Abp.Zero.SampleApp.Tests
 {
-    public abstract class SampleAppTestBase : AbpIntegratedTestBase
+    public abstract class SampleAppTestBase : SampleAppTestBase<SampleAppTestModule>
+    {
+
+    }
+
+    public abstract class SampleAppTestBase<TModule> : AbpIntegratedTestBase<TModule> 
+        where TModule : AbpModule
     {
         protected readonly RoleManager RoleManager;
         protected readonly UserManager UserManager;
@@ -54,14 +58,6 @@ private void CreateInitialData()
             UsingDbContext(context => new InitialTestDataBuilder(context).Build());
         }
 
-        protected override void AddModules(ITypeList<AbpModule> modules)
-        {
-            base.AddModules(modules);
-
-            modules.Add<AbpZeroLdapModule>();
-            modules.Add<SampleAppEntityFrameworkModule>();
-        }
-
         public void UsingDbContext(Action<AppDbContext> action)
         {
             using (var context = LocalIocManager.Resolve<AppDbContext>())

diff --git a/test/Abp.Zero.SampleApp.Tests/SampleAppTestModule.cs b/test/Abp.Zero.SampleApp.Tests/SampleAppTestModule.cs
@@ -0,0 +1,16 @@
+using Abp.Modules;
+using Abp.TestBase;
+using Abp.Zero.Ldap;
+using Abp.Zero.SampleApp.EntityFramework;
+
+namespace Abp.Zero.SampleApp.Tests
+{
+    [DependsOn(
+        typeof(SampleAppEntityFrameworkModule),
+        typeof(AbpZeroLdapModule),
+        typeof(AbpTestBaseModule))]
+    public class SampleAppTestModule : AbpModule
+    {
+
+    }
+}
diff --git a/test/Abp.Zero.SampleApp.Tests/Users/UserLogin_ExternalAuthenticationSources_Test.cs b/test/Abp.Zero.SampleApp.Tests/Users/UserLogin_ExternalAuthenticationSources_Test.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Abp.Authorization.Users;
-using Abp.Collections;
 using Abp.Dependency;
 using Abp.Modules;
 using Abp.Zero.Configuration;
@@ -11,7 +10,7 @@
 
 namespace Abp.Zero.SampleApp.Tests.Users
 {
-    public class UserLogin_ExternalAuthenticationSources_Test : SampleAppTestBase
+    public class UserLogin_ExternalAuthenticationSources_Test : SampleAppTestBase<UserLogin_ExternalAuthenticationSources_Test.MyUserLoginTestModule>
     {
         private readonly UserManager _userManager;
 
@@ -21,12 +20,6 @@ public UserLogin_ExternalAuthenticationSources_Test()
             _userManager = LocalIocManager.Resolve<UserManager>();
         }
 
-        protected override void AddModules(ITypeList<AbpModule> modules)
-        {
-            base.AddModules(modules);
-            modules.Add<MyUserLoginTestModule>();
-        }
-
         [Fact]
         public async Task Should_Login_From_Fake_Authentication_Source()
         {
@@ -42,7 +35,7 @@ public async Task Should_Fallback_To_Default_Login_Users()
             loginResult.Result.ShouldBe(AbpLoginResultType.Success);
         }
 
-        [DependsOn(typeof(AbpZeroCoreModule))]
+        [DependsOn(typeof(SampleAppTestModule))]
         public class MyUserLoginTestModule : AbpModule
         {
             public override void PreInitialize()

diff --git a/test/Abp.Zero.SampleApp.Tests/project.json b/test/Abp.Zero.SampleApp.Tests/project.json
@@ -10,11 +10,11 @@
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "NSubstitute": "1.10.0",
     "Effort.EF6": "1.1.5",
-    "Abp.Zero.SampleApp": "0.9.6.0-*",
-    "Abp.Zero.SampleApp.EntityFramework": "0.9.6.0-*",
-    "Abp.Zero.Ldap": "0.9.6.0-*",
+    "Abp.Zero.SampleApp": "0.10.0.0-*",
+    "Abp.Zero.SampleApp.EntityFramework": "0.10.0.0-*",
+    "Abp.Zero.Ldap": "0.10.0.0-*",
     "Shouldly": "2.8.0",
-    "Abp.TestBase": "0.9.7"
+    "Abp.TestBase": "0.10.0.1"
   },
 
   "frameworks": {

diff --git a/test/Abp.Zero.SampleApp/project.json b/test/Abp.Zero.SampleApp/project.json
@@ -1,8 +1,8 @@
 {
-  "version": "0.9.6.0-*",
+  "version": "0.10.0.0-*",
 
   "dependencies": {
-    "Abp.Zero": "0.9.6.0-*"
+    "Abp.Zero": "0.10.0.0-*"
   },
 
   "frameworks": {