Merge branch 'dev'

Author: ismcagdas

common.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>3.8.0</Version>
+    <Version>3.8.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>http://www.aspnetboilerplate.com/</PackageProjectUrl>

src/Abp.AspNetCore/AspNetCore/Configuration/AbpAspNetCoreConfiguration.cs

@@ -26,6 +26,8 @@ public class AbpAspNetCoreConfiguration : IAbpAspNetCoreConfiguration
 
         public bool SetNoCacheForAjaxResponses { get; set; }
 
+        public bool UseMvcDateTimeFormatForAppServices { get; set; }
+
         public List<Action<IRouteBuilder>> RouteConfiguration { get; }
 
         public AbpAspNetCoreConfiguration()
@@ -39,6 +41,7 @@ public AbpAspNetCoreConfiguration()
             IsValidationEnabledForControllers = true;
             SetNoCacheForAjaxResponses = true;
             IsAuditingEnabled = true;
+            UseMvcDateTimeFormatForAppServices = false;
         }
 
         public AbpControllerAssemblySettingBuilder CreateControllersForAppServices(

src/Abp.AspNetCore/AspNetCore/Configuration/IAbpAspNetCoreConfiguration.cs

@@ -33,7 +33,12 @@ public interface IAbpAspNetCoreConfiguration
         /// Default: true.
         /// </summary>
         bool SetNoCacheForAjaxResponses { get; set; }
-        
+
+        /// <summary>
+        /// Default: false.
+        /// </summary>
+        bool UseMvcDateTimeFormatForAppServices { get; set; }
+
         /// <summary>
         /// Used to add route config for modules.
         /// </summary>

src/Abp.AspNetCore/Json/AbpMvcContractResolver.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Reflection;
+using Abp.AspNetCore.Configuration;
 using Abp.Dependency;
+using Abp.Extensions;
 using Abp.Reflection;
 using Abp.Timing;
 using Microsoft.AspNetCore.Mvc;
@@ -13,12 +15,17 @@ namespace Abp.Json
     public class AbpMvcContractResolver : DefaultContractResolver
     {
         private readonly IIocResolver _iocResolver;
-        private bool _isDateTimeFormatResolved { get; set; } = false;
+        private bool _useMvcDateTimeFormat { get; set; }
         private string _datetimeFormat { get; set; } = null;
 
         public AbpMvcContractResolver(IIocResolver iocResolver)
         {
             _iocResolver = iocResolver;
+            using (var configuration = _iocResolver.ResolveAsDisposable<IAbpAspNetCoreConfiguration>())
+            {
+                _useMvcDateTimeFormat = configuration.Object.UseMvcDateTimeFormatForAppServices;
+            }
+
         }
 
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
@@ -42,7 +49,7 @@ protected virtual void ModifyProperty(MemberInfo member, JsonProperty property)
                 var converter = new AbpDateTimeConverter();
 
                 // try to resolve MvcJsonOptions
-                if (!_isDateTimeFormatResolved)
+                if (_useMvcDateTimeFormat)
                 {
                     using (var mvcJsonOptions = _iocResolver.ResolveAsDisposable<IOptions<MvcJsonOptions>>())
                     {
@@ -51,7 +58,7 @@ protected virtual void ModifyProperty(MemberInfo member, JsonProperty property)
                 }
 
                 // apply DateTimeFormat only if not empty
-                if (!string.IsNullOrWhiteSpace(_datetimeFormat))
+                if (!_datetimeFormat.IsNullOrWhiteSpace())
                 {
                     converter.DateTimeFormat = _datetimeFormat;
                 }

src/Abp.Castle.Log4Net/Castle/Logging/Log4Net/Log4NetLoggerFactory.cs

@@ -19,7 +19,19 @@ public Log4NetLoggerFactory()
         {
         }
 
-        public Log4NetLoggerFactory(string configFileName, bool reloadOnChange = false)
+        public Log4NetLoggerFactory(string configFileName)
+        {
+            _loggerRepository = LogManager.CreateRepository(
+                typeof(Log4NetLoggerFactory).GetAssembly(),
+                typeof(log4net.Repository.Hierarchy.Hierarchy)
+            );
+
+            var log4NetConfig = new XmlDocument();
+            log4NetConfig.Load(File.OpenRead(configFileName));
+            XmlConfigurator.Configure(_loggerRepository, log4NetConfig["log4net"]);
+        }
+
+        public Log4NetLoggerFactory(string configFileName, bool reloadOnChange)
         {
             _loggerRepository = LogManager.CreateRepository(
                 typeof(Log4NetLoggerFactory).GetAssembly(),

src/Abp.Web.Resources/Abp/Framework/scripts/abp.d.ts

@@ -293,17 +293,17 @@
 
         //TODO: these methods return jQuery.Promise instead of any. fix it.
 
-        function info(message: string, title?: string): any;
+        function info(message: string, title?: string, isHtml?: boolean): any;
 
-        function success(message: string, title?: string): any;
+        function success(message: string, title?: string, isHtml?: boolean): any;
 
-        function warn(message: string, title?: string): any;
+        function warn(message: string, title?: string, isHtml?: boolean): any;
 
-        function error(message: string, title?: string): any;
+        function error(message: string, title?: string, isHtml?: boolean): any;
 
         function confirm(message: string, callback?: (result: boolean) => void): any;
 
-        function confirm(message: string, title?: string, callback?: (result: boolean) => void): any;
+        function confirm(message: string, title?: string, callback?: (result: boolean) => void, isHtml?: boolean): any;
 
     }
 

src/Abp.ZeroCore.IdentityServer4/IdentityServer4/AbpResourceOwnerPasswordValidator.cs

@@ -2,6 +2,7 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Abp.Authorization.Users;
+using Abp.Domain.Uow;
 using Abp.Runtime.Security;
 using IdentityModel;
 using IdentityServer4.AspNetIdentity;
@@ -38,6 +39,7 @@ public AbpResourceOwnerPasswordValidator(
             Logger = logger;
         }
 
+        [UnitOfWork]
         public override async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
         {
             var user = await UserManager.FindByNameAsync(context.UserName);

src/Abp.ZeroCore/Authorization/Users/UserToken.cs

@@ -14,7 +14,7 @@ public class UserToken : Entity<long>, IMayHaveTenant
         /// <summary>
         /// Maximum length of the <see cref="LoginProvider"/> property.
         /// </summary>
-        public const int MaxLoginProviderLength = 64;
+        public const int MaxLoginProviderLength = 128;
 
         /// <summary>
         /// Maximum length of the <see cref="Name"/> property.
@@ -68,4 +68,4 @@ protected internal UserToken(AbpUserBase user, [NotNull] string loginProvider, [
             Value = value;
         }
     }
-}
+}