Merge branch 'dev'

Author: hikalkan

appveyor.yml

@@ -1,5 +1,5 @@
 configuration: Release
-version: 2.0.0-beta{build}
+version: 2.1.0-beta{build}
 image: Visual Studio 2017
 
 nuget:

common.props

@@ -1,11 +1,16 @@
 <Project>
   <PropertyGroup>
-    <Version>2.0.2</Version>
+    <Version>2.1.0-beta1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>http://www.aspnetboilerplate.com/</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/aspnetboilerplate/aspnetboilerplate/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/aspnetboilerplate/aspnetboilerplate</RepositoryUrl>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.1.2" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>

doc/WebSite/Repositories.html

@@ -107,7 +107,7 @@ <h5 id="DocGettingSingleEntity">
 than an Id. So, you can write a lambda expression to get an Entity. Example 
 usages:</p>
 			<pre>var person = _personRepository.Get(42);
-var person = _personRepository.Single(p =&gt; p.Name == "Halil İbrahim Kalkan");</pre>
+var person = _personRepository.Single(p =&gt; p.Name == "John");</pre>
 			<p>Notice that <strong>Single </strong>method throws 
 exception if there is no entity with given conditions or there are more 
 than one entity.</p>

nupkg/pack.ps1

@@ -33,13 +33,12 @@ $projects = (
     "Abp.Castle.Log4Net",
     "Abp.TestBase",
     "Abp.AspNetCore.TestBase",
-    "Abp.Web.Resources"    
+    "Abp.Web.Resources"  
 )
 
 # Rebuild solution
 Set-Location $slnPath
 & dotnet restore
-& dotnet msbuild /t:Rebuild /p:Configuration=Release
 
 # Copy all nuget packages to the pack folder
 foreach($project in $projects) {
@@ -48,7 +47,8 @@ foreach($project in $projects) {
 
     # Create nuget pack
     Set-Location $projectFolder
-    & dotnet msbuild /t:pack /p:Configuration=Release /p:IncludeSymbols=true
+    Remove-Item -Recurse (Join-Path $projectFolder "bin/Release")
+    & dotnet msbuild /t:pack /p:Configuration=Release /p:IncludeSymbols=true /p:SourceLinkCreate=true
 
     # Copy nuget package
     $projectPackPath = Join-Path $projectFolder ("/bin/Release/" + $project + ".*.nupkg")

src/Abp.AspNetCore.TestBase/Abp.AspNetCore.TestBase.csproj

@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

src/Abp.AspNetCore/Abp.AspNetCore.csproj

@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
     <PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
   </ItemGroup>
@@ -46,4 +46,8 @@
     <Reference Include="System.Transactions" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Localization\AspNetCore\" />
+  </ItemGroup>
+
 </Project>

src/Abp.AspNetCore/AspNetCore/AbpApplicationBuilderExtensions.cs

@@ -1,32 +1,48 @@
-using System.Globalization;
+using System;
 using System.Linq;
 using Abp.AspNetCore.EmbeddedResources;
 using Abp.AspNetCore.Localization;
-using Abp.AspNetCore.Mvc.Views;
 using Abp.Dependency;
 using Abp.Localization;
 using Castle.LoggingFacility.MsLogging;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Abp.AspNetCore
 {
-    public static class AbpApplicationBuilderExtensions
+	public static class AbpApplicationBuilderExtensions
     {
         public static void UseAbp(this IApplicationBuilder app)
         {
-            AddCastleLoggerFactory(app);
+            app.UseAbp(null);
+        }
 
-            InitializeAbp(app);
+	    public static void UseAbp([NotNull] this IApplicationBuilder app, Action<AbpApplicationBuilderOptions> optionsAction)
+	    {
+		    Check.NotNull(app, nameof(app));
 
-            ConfigureRequestLocalization(app);
-        }
+	        var options = new AbpApplicationBuilderOptions();
+            optionsAction?.Invoke(options);
+
+            if (options.UseCastleLoggerFactory)
+		    {
+			    app.UseCastleLoggerFactory();
+			}
+
+			InitializeAbp(app);
 
-        public static void UseEmbeddedFiles(this IApplicationBuilder app)
+		    if (options.UseAbpRequestLocalization)
+		    {
+                //TODO: This should be added later than authorization middleware!
+			    app.UseAbpRequestLocalization();
+		    }
+	    }
+
+		public static void UseEmbeddedFiles(this IApplicationBuilder app)
         {
-            //TODO: Can improve it or create a custom middleware?
             app.UseStaticFiles(
                 new StaticFileOptions
                 {
@@ -43,7 +59,7 @@ private static void InitializeAbp(IApplicationBuilder app)
             abpBootstrapper.Initialize();
         }
 
-        private static void AddCastleLoggerFactory(IApplicationBuilder app)
+        public static void UseCastleLoggerFactory(this IApplicationBuilder app)
         {
             var castleLoggerFactory = app.ApplicationServices.GetService<Castle.Core.Logging.ILoggerFactory>();
             if (castleLoggerFactory == null)
@@ -56,35 +72,32 @@ private static void AddCastleLoggerFactory(IApplicationBuilder app)
                 .AddCastleLogger(castleLoggerFactory);
         }
 
-        private static void ConfigureRequestLocalization(IApplicationBuilder app)
+        public static void UseAbpRequestLocalization(this IApplicationBuilder app, Action<RequestLocalizationOptions> optionsAction = null)
         {
             var iocResolver = app.ApplicationServices.GetRequiredService<IIocResolver>();
             using (var languageManager = iocResolver.ResolveAsDisposable<ILanguageManager>())
             {
-                var defaultLanguage = languageManager.Object
-                    .GetLanguages()
-                    .FirstOrDefault(l => l.IsDefault);
-
-                if (defaultLanguage == null)
-                {
-                    return;
-                }
-
                 var supportedCultures = languageManager.Object
                     .GetLanguages()
                     .Select(l => CultureInfoHelper.Get(l.Name))
                     .ToArray();
 
-                var defaultCulture = new RequestCulture(defaultLanguage.Name);
-
                 var options = new RequestLocalizationOptions
                 {
-                    DefaultRequestCulture = defaultCulture,
                     SupportedCultures = supportedCultures,
                     SupportedUICultures = supportedCultures
                 };
 
+                var userProvider = new UserRequestCultureProvider();
+
                 options.RequestCultureProviders.Insert(0, new AbpLocalizationHeaderRequestCultureProvider());
+                options.RequestCultureProviders.Insert(2, userProvider);
+                options.RequestCultureProviders.Insert(4, new DefaultRequestCultureProvider());
+
+                optionsAction?.Invoke(options);
+
+                //TODO: Find cookie provider, set to UserRequestCultureProvider to set user's setting!!!
+                userProvider.CookieProvider = options.RequestCultureProviders.FirstOrDefault(p => p is CookieRequestCultureProvider);
 
                 app.UseRequestLocalization(options);
             }

src/Abp.AspNetCore/AspNetCore/AbpApplicationBuilderOptions.cs

@@ -0,0 +1,21 @@
+namespace Abp.AspNetCore
+{
+	public class AbpApplicationBuilderOptions
+	{
+		/// <summary>
+		/// Default: true.
+		/// </summary>
+		public bool UseCastleLoggerFactory { get; set; }
+
+		/// <summary>
+		/// Default: true.
+		/// </summary>
+		public bool UseAbpRequestLocalization { get; set; }
+
+		public AbpApplicationBuilderOptions()
+		{
+			UseCastleLoggerFactory = true;
+			UseAbpRequestLocalization = true;
+		}
+	}
+}

src/Abp.AspNetCore/AspNetCore/AbpAspNetCoreModule.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Reflection;
 using Abp.AspNetCore.Configuration;
 using Abp.AspNetCore.MultiTenancy;
 using Abp.AspNetCore.Mvc.Auditing;
@@ -12,7 +11,6 @@
 using Abp.Reflection.Extensions;
 using Abp.Runtime.Session;
 using Abp.Web;
-using Abp.Web.MultiTenancy;
 using Abp.Web.Security.AntiForgery;
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Http;

src/Abp.AspNetCore/AspNetCore/Localization/DefaultRequestCultureProvider.cs

@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using Abp.Configuration;
+using Abp.Extensions;
+using Abp.Localization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Abp.AspNetCore.Localization
+{
+    public class DefaultRequestCultureProvider : RequestCultureProvider
+    {
+        public override async Task<ProviderCultureResult> DetermineProviderCultureResult(HttpContext httpContext)
+        {
+            var settingManager = httpContext.RequestServices.GetRequiredService<ISettingManager>();
+
+            var culture = await settingManager.GetSettingValueAsync(LocalizationSettingNames.DefaultLanguage);
+
+            if (culture.IsNullOrEmpty())
+            {
+                return null;
+            }
+
+            return new ProviderCultureResult(culture, culture);
+        }
+    }
+}