Merge pull request aspnetboilerplate#2 from aspnetboilerplate/master

get all updates

nupkg/pack_abp.bat

@@ -5,6 +5,7 @@
 "..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.MemoryDb\Abp.MemoryDb.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols
 "..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.MongoDB\Abp.MongoDB.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols
 "..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.NHibernate\Abp.NHibernate.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols
+"..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.RedisCache\Abp.RedisCache.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols
 "..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.Web\Abp.Web.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols
 "..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.Web.Api\Abp.Web.Api.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols
 "..\src\.nuget\NuGet.exe" "pack" "..\src\Abp.Web.Mvc\Abp.Web.Mvc.csproj" -Properties Configuration=Release -IncludeReferencedProjects -Symbols

src/Abp.RedisCache/Abp.RedisCache.csproj

@@ -47,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AbpRedisCacheConfig.cs" />
     <Compile Include="RedisCache\AbpRedisCacheModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RedisCache\AbpRedisCache.cs" />

src/Abp.RedisCache/AbpRedisCacheConfig.cs

@@ -0,0 +1,33 @@
+using Abp.Configuration.Startup;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Abp
+{
+    public class AbpRedisCacheConfig
+    {
+        private string connectionStringKey = "Abp.Redis.Cache";
+
+        public string ConnectionStringKey
+        {
+            get { return connectionStringKey; }
+            set { connectionStringKey = value; }
+        }
+
+
+    } 
+
+    public static class AbpRedisCacheConfigEctensions
+    {
+        public static AbpRedisCacheConfig AbpRedisCacheModule(this IModuleConfigurations moduleConfigurations)
+        {
+            return moduleConfigurations.AbpConfiguration
+                .GetOrCreate("AbpRedisCacheModule",
+                    () => moduleConfigurations.AbpConfiguration.IocManager.Resolve<AbpRedisCacheConfig>()
+                );
+        }
+    }
+}

src/Abp.RedisCache/RedisCache/AbpRedisCache.cs

@@ -8,9 +8,9 @@ namespace Abp.RedisCache
 {
     public class AbpRedisCache : CacheBase
     {
-        public const string ConnectionStringKey = "Abp.Redis.Cache";
 
         private readonly ConnectionMultiplexer _connectionMultiplexer;
+        private readonly AbpRedisCacheConfig _config;
 
         public IDatabase Database
         {
@@ -23,10 +23,11 @@ public IDatabase Database
         /// <summary>
         /// Constructor.
         /// </summary>
-        public AbpRedisCache(string name, IAbpRedisConnectionProvider redisConnectionProvider)
+        public AbpRedisCache(string name, IAbpRedisConnectionProvider redisConnectionProvider, AbpRedisCacheConfig config)
             : base(name)
         {
-            var connectionString = redisConnectionProvider.GetConnectionString(ConnectionStringKey);
+            _config = config;
+            var connectionString = redisConnectionProvider.GetConnectionString(_config.ConnectionStringKey);
             _connectionMultiplexer = redisConnectionProvider.GetConnection(connectionString);
         }
         public override object GetOrDefault(string key)

src/Abp.Web/Web/Localization/LocalizationScriptManager.cs

@@ -1,29 +1,23 @@
 using System;
 using System.Globalization;
 using System.Linq;
-using System.Runtime.Caching;
 using System.Text;
 using System.Threading;
 using Abp.Dependency;
 using Abp.Localization;
-using Abp.Runtime.Caching.Memory;
+using Abp.Runtime.Caching;
 
 namespace Abp.Web.Localization
 {
     internal class LocalizationScriptManager : ILocalizationScriptManager, ISingletonDependency
     {
         private readonly ILocalizationManager _localizationManager;
+        private readonly ICacheManager _cacheManager;
 
-        private readonly ThreadSafeObjectCache<string> _cache;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Abp.Web.Localization.LocalizationScriptManager"/> class.
-        /// </summary>
-        /// <param name="localizationManager">Localization manager.</param>
-        public LocalizationScriptManager(ILocalizationManager localizationManager)
+        public LocalizationScriptManager(ILocalizationManager localizationManager, ICacheManager cacheManager)
         {
             _localizationManager = localizationManager;
-            _cache = new ThreadSafeObjectCache<string>(new MemoryCache("__LocalizationScriptManager"), TimeSpan.FromDays(1));
+            _cacheManager = cacheManager;
         }
 
         /// <inheritdoc/>
@@ -35,7 +29,9 @@ public string GetScript()
         /// <inheritdoc/>
         public string GetScript(CultureInfo cultureInfo)
         {
-            return _cache.Get(cultureInfo.Name, () => BuildAll(cultureInfo));
+            return _cacheManager
+                .GetCache<string, string>("AbpLocalizationScripts")
+                .Get(cultureInfo.Name, () => BuildAll(cultureInfo));
         }
 
         private string BuildAll(CultureInfo cultureInfo)

src/Abp/AbpConsts.cs

@@ -8,7 +8,7 @@ public static class AbpConsts
         /// <summary>
         /// Current version of the ABP.
         /// </summary>
-        public const string CurrentVersion = "0.7.0.5";
+        public const string CurrentVersion = "0.7.1.0";
 
         /// <summary>
         /// Localization source name of ASP.NET Boilerplate framework.

src/Abp/Application/Navigation/MenuItemDefinition.cs

@@ -68,7 +68,15 @@ public bool IsLeaf
         /// <summary>
         /// Creates a new <see cref="MenuItemDefinition"/> object.
         /// </summary>
-        public MenuItemDefinition(string name, ILocalizableString displayName, string icon = null, string url = null, bool requiresAuthentication = false, string requiredPermissionName = null, int order = 0, object customData = null)
+        public MenuItemDefinition(
+            string name, 
+            ILocalizableString displayName, 
+            string icon = null, 
+            string url = null, 
+            bool requiresAuthentication = false, 
+            string requiredPermissionName = null, 
+            int order = 0, 
+            object customData = null)
         {
             if (string.IsNullOrEmpty(name))
             {

src/Abp/Configuration/SettingDefinition.cs

@@ -54,6 +54,11 @@ public class SettingDefinition
         /// </summary>
         public bool IsVisibleToClients { get; private set; }
 
+        /// <summary>
+        /// Can be used to store a custom object related to this setting.
+        /// </summary>
+        public object CustomData { get; set; }
+
         /// <summary>
         /// Creates a new <see cref="SettingDefinition"/> object.
         /// </summary>
@@ -65,7 +70,17 @@ public class SettingDefinition
         /// <param name="scopes">Scopes of this setting. Default value: <see cref="SettingScopes.Application"/>.</param>
         /// <param name="isVisibleToClients">Can clients see this setting and it's value. Default: false</param>
         /// <param name="isInherited">Is this setting inherited from parent scopes. Default: True.</param>
-        public SettingDefinition(string name, string defaultValue, ILocalizableString displayName = null, SettingDefinitionGroup group = null, ILocalizableString description = null, SettingScopes scopes = SettingScopes.Application, bool isVisibleToClients = false, bool isInherited = true)
+        /// <param name="customData">Can be used to store a custom object related to this setting</param>
+        public SettingDefinition(
+            string name, 
+            string defaultValue, 
+            ILocalizableString displayName = null, 
+            SettingDefinitionGroup group = null, 
+            ILocalizableString description = null, 
+            SettingScopes scopes = SettingScopes.Application, 
+            bool isVisibleToClients = false, 
+            bool isInherited = true,
+            object customData = null)
         {
             if (string.IsNullOrEmpty(name))
             {
@@ -80,6 +95,7 @@ public SettingDefinition(string name, string defaultValue, ILocalizableString di
             Scopes = scopes;
             IsVisibleToClients = isVisibleToClients;
             IsInherited = isInherited;
+            CustomData = customData;
         }
     }
 }

src/TestBase/Abp.TestBase/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.1.0")]
-[assembly: AssemblyFileVersion("0.2.1.0")]
+[assembly: AssemblyVersion("0.2.2.0")]
+[assembly: AssemblyFileVersion("0.2.2.0")]

src/Tests/Abp.RedisCache.Tests/RedisCacheManager_Test.cs

@@ -14,6 +14,7 @@ public class RedisCacheManager_Test : TestBaseWithLocalIocManager
 
         public RedisCacheManager_Test()
         {
+            LocalIocManager.Register<AbpRedisCacheConfig, AbpRedisCacheConfig>();
             LocalIocManager.Register<ICachingConfiguration, CachingConfiguration>();
             LocalIocManager.Register<IAbpRedisConnectionProvider, AbpRedisConnectionProvider>();
             LocalIocManager.Register<ICacheManager, AbpRedisCacheManager>();