Merge branch 'aspnetcore-3.0' into dev

common.test.props

@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+</Project>

framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Authentication.JwtBearer</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Authentication.JwtBearer</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53450/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.Authentication.OAuth": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53451/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Authentication.OAuth</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 
@@ -17,8 +19,4 @@
     <ProjectReference Include="..\Volo.Abp.Security\Volo.Abp.Security.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+</Project>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.2.0" />
-  </ItemGroup>
-
-</Project>

framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo/Abp/AspNetCore/Authentication/OAuth/Claims/MultipleClaimAction.cs

@@ -1,6 +1,6 @@
 using System.Security.Claims;
+using System.Text.Json;
 using Microsoft.AspNetCore.Authentication.OAuth.Claims;
-using Newtonsoft.Json.Linq;
 
 namespace Volo.Abp.AspNetCore.Authentication.OAuth.Claims
 {
@@ -9,31 +9,30 @@ namespace Volo.Abp.AspNetCore.Authentication.OAuth.Claims
         public MultipleClaimAction(string claimType, string jsonKey)
             : base(claimType, jsonKey)
         {
+
         }
 
-        public override void Run(JObject userData, ClaimsIdentity identity, string issuer)
+        public override void Run(JsonElement userData, ClaimsIdentity identity, string issuer)
-        {
+        {            
-            var prop = userData?.Property(ValueType);
+            var prop = userData.GetProperty(ValueType);
-            if (prop == null)
+            if (prop.ValueKind == JsonValueKind.Null)
             {
                 return;
             }
 
-            var propValue = prop.Value;
+            switch (prop.ValueKind)
-
-            switch (propValue.Type)
             {
-                case JTokenType.String:
+                case JsonValueKind.String:
-                    identity.AddClaim(new Claim(ClaimType, propValue.Value<string>(), ValueType, issuer));
+                    identity.AddClaim(new Claim(ClaimType, prop.GetString(), ValueType, issuer));
                     break;
-                case JTokenType.Array:
+                case JsonValueKind.Array:
-                    foreach (var innterValue in propValue.Values<string>())
+                    foreach (var arramItem in prop.EnumerateArray())
                     {
-                        identity.AddClaim(new Claim(ClaimType, innterValue, ValueType, issuer));
+                        identity.AddClaim(new Claim(ClaimType, arramItem.GetString(), ValueType, issuer));
                     }
                     break;
                 default:
-                    throw new AbpException("Unhandled JTokenType: " + propValue.Type);
+                    throw new AbpException("Unhandled JsonValueKind: " + prop.ValueKind);
             }
         }
     }

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53760/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.MultiTenancy": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53763/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.MultiTenancy</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.MultiTenancy</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:52302/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.Mvc.Client": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:52303/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.Client</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.Client</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs

@@ -13,8 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 {
     public class CachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
     {
-        public IHttpContextAccessor HttpContextAccessor { get; set; }
+        protected IHttpContextAccessor HttpContextAccessor { get; }
-
         protected IHttpClientProxy<IAbpApplicationConfigurationAppService> Proxy { get; }
         protected ICurrentUser CurrentUser { get; }
         protected IDistributedCache<ApplicationConfigurationDto> Cache { get; }
@@ -42,11 +41,11 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             }
 
             configuration = await Cache.GetOrAddAsync(
-                CreateCacheKey(),
+                cacheKey,
                 async () => await Proxy.Service.GetAsync(),
                 () => new DistributedCacheEntryOptions
                 {
-                    AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(60) //TODO: Should be configurable. Default value should be higher (5 mins would be good).
+                    AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(120) //TODO: Should be configurable. Default value should be higher (5 mins would be good).
                 }
             );
 

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteTenantStore.cs

@@ -0,0 +1,116 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Distributed;
+using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
+using Volo.Abp.Caching;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Http.Client.DynamicProxying;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Threading;
+
+namespace Volo.Abp.AspNetCore.Mvc.Client
+{
+    public class RemoteTenantStore : ITenantStore, ITransientDependency
+    {
+        protected IHttpClientProxy<IAbpTenantAppService> Proxy { get; }
+        protected IHttpContextAccessor HttpContextAccessor { get; }
+        protected IDistributedCache<TenantConfiguration> Cache { get; }
+
+        public RemoteTenantStore(
+            IHttpClientProxy<IAbpTenantAppService> proxy,
+            IHttpContextAccessor httpContextAccessor,
+            IDistributedCache<TenantConfiguration> cache)
+        {
+            Proxy = proxy;
+            HttpContextAccessor = httpContextAccessor;
+            Cache = cache;
+        }
+
+        public async Task<TenantConfiguration> FindAsync(string name)
+        {
+            var cacheKey = CreateCacheKey(name);
+            var httpContext = HttpContextAccessor?.HttpContext;
+
+            if (httpContext != null && httpContext.Items[cacheKey] is TenantConfiguration tenantConfiguration)
+            {
+                return tenantConfiguration;
+            }
+
+            tenantConfiguration = await Cache.GetOrAddAsync(
+                cacheKey,
+                async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByNameAsync(name)),
+                () => new DistributedCacheEntryOptions
+                {
+                    AbsoluteExpirationRelativeToNow =
+                        TimeSpan.FromMinutes(5) //TODO: Should be configurable.
+                }
+            );
+
+            if (httpContext != null)
+            {
+                httpContext.Items[cacheKey] = tenantConfiguration;
+            }
+
+            return tenantConfiguration;
+        }
+
+        public async Task<TenantConfiguration> FindAsync(Guid id)
+        {
+            var cacheKey = CreateCacheKey(id);
+            var httpContext = HttpContextAccessor?.HttpContext;
+
+            if (httpContext != null && httpContext.Items[cacheKey] is TenantConfiguration tenantConfiguration)
+            {
+                return tenantConfiguration;
+            }
+
+            tenantConfiguration = await Cache.GetOrAddAsync(
+                cacheKey,
+                async () => CreateTenantConfiguration(await Proxy.Service.FindTenantByIdAsync(id)),
+                () => new DistributedCacheEntryOptions
+                {
+                    AbsoluteExpirationRelativeToNow =
+                        TimeSpan.FromMinutes(5) //TODO: Should be configurable.
+                }
+            );
+
+            if (httpContext != null)
+            {
+                httpContext.Items[cacheKey] = tenantConfiguration;
+            }
+
+            return tenantConfiguration;
+        }
+
+        public TenantConfiguration Find(string name)
+        {
+            return AsyncHelper.RunSync(() => FindAsync(name));
+        }
+
+        public TenantConfiguration Find(Guid id)
+        {
+            return AsyncHelper.RunSync(() => FindAsync(id));
+        }
+
+        protected virtual TenantConfiguration CreateTenantConfiguration(FindTenantResultDto tenantResultDto)
+        {
+            if (!tenantResultDto.Success || tenantResultDto.TenantId == null)
+            {
+                return null;
+            }
+
+            return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name);
+        }
+
+        protected virtual string CreateCacheKey(string tenantName)
+        {
+            return $"RemoteTenantStore_Name_{tenantName}";
+        }
+
+        protected virtual string CreateCacheKey(Guid tenantId)
+        {
+            return $"RemoteTenantStore_Id_{tenantId:N}";
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.Contracts</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.Contracts</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/FindTenantResultDto.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.Mvc.MultiTenancy
+{
+    [Serializable]
+    public class FindTenantResultDto
+    {
+        public bool Success { get; set; }
+
+        public Guid? TenantId { get; set; }
+
+        public string Name { get; set; }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/IAbpTenantAppService.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Volo.Abp.AspNetCore.Mvc.MultiTenancy
+{
+    public interface IAbpTenantAppService : IApplicationService
+    {
+        Task<FindTenantResultDto> FindTenantByNameAsync(string name);
+
+        Task<FindTenantResultDto> FindTenantByIdAsync(Guid id);
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj

@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</PackageId>
-    <IsPackable>true</IsPackable>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53762/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Bundling": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53765/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj

@@ -1,11 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs

@@ -4,6 +4,7 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -23,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
         protected readonly BundlingOptions Options;
         protected readonly BundleContributorOptions ContributorOptions;
         protected readonly IWebContentFileProvider WebContentFileProvider;
-        protected readonly IHostingEnvironment HostingEnvironment;
+        protected readonly IWebHostEnvironment HostingEnvironment;
         protected readonly IScriptBundler ScriptBundler;
         protected readonly IStyleBundler StyleBundler;
         protected readonly IServiceProvider ServiceProvider;
@@ -36,7 +37,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
             IOptions<BundleContributorOptions> contributorOptions,
             IScriptBundler scriptBundler,
             IStyleBundler styleBundler,
-            IHostingEnvironment hostingEnvironment,
+            IWebHostEnvironment hostingEnvironment,
             IServiceProvider serviceProvider,
             IDynamicFileProvider dynamicFileProvider,
             IBundleCache bundleCache,

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/Styles/StyleBundler.cs

@@ -8,10 +8,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Styles
 {
     public class StyleBundler : BundlerBase, IStyleBundler
     {
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IWebHostEnvironment _hostingEnvironment;
         public override string FileExtension => "css";
 
-        public StyleBundler(IWebContentFileProvider webContentFileProvider, ICssMinifier minifier, IHostingEnvironment hostingEnvironment) 
+        public StyleBundler(IWebContentFileProvider webContentFileProvider, ICssMinifier minifier, IWebHostEnvironment hostingEnvironment) 
             : base(webContentFileProvider, minifier)
         {
             _hostingEnvironment = hostingEnvironment;

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs

@@ -19,14 +19,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
 
         protected IBundleManager BundleManager { get; }
         protected IWebContentFileProvider WebContentFileProvider { get; }
-        protected IHostingEnvironment HostingEnvironment { get; }
+        protected IWebHostEnvironment HostingEnvironment { get; }
         protected readonly BundlingOptions Options;
         
         protected AbpTagHelperResourceService(
             IBundleManager bundleManager,
             IWebContentFileProvider webContentFileProvider,
-            IOptions<BundlingOptions> options, 
+            IOptions<BundlingOptions> options,
-            IHostingEnvironment hostingEnvironment)
+            IWebHostEnvironment hostingEnvironment)
         {
             BundleManager = bundleManager;
             WebContentFileProvider = webContentFileProvider;

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.VirtualFileSystem;
 
@@ -14,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             IBundleManager bundleManager,
             IWebContentFileProvider webContentFileProvider,
             IOptions<BundlingOptions> options,
-            IHostingEnvironment hostingEnvironment
+            IWebHostEnvironment hostingEnvironment
             ) : base(
                 bundleManager,
                 webContentFileProvider,

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.VirtualFileSystem;
 
@@ -14,7 +15,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers
             IBundleManager bundleManager,
             IWebContentFileProvider webContentFileProvider,
             IOptions<BundlingOptions> options,
-            IHostingEnvironment hostingEnvironment
+            IWebHostEnvironment hostingEnvironment
             ) : base(
                 bundleManager,
                 webContentFileProvider,

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantAppService.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
+using Volo.Abp.MultiTenancy;
+
+namespace Pages.Abp.MultiTenancy
+{
+    public class AbpTenantAppService : ApplicationService, IAbpTenantAppService
+    {
+        protected ITenantStore TenantStore { get; }
+
+        public AbpTenantAppService(ITenantStore tenantStore)
+        {
+            TenantStore = tenantStore;
+        }
+
+        public async Task<FindTenantResultDto> FindTenantByNameAsync(string name)
+        {
+            var tenant = await TenantStore.FindAsync(name);
+
+            if (tenant == null)
+            {
+                return new FindTenantResultDto { Success = false };
+            }
+
+            return new FindTenantResultDto
+            {
+                Success = true,
+                TenantId = tenant.Id,
+                Name = tenant.Name
+            };
+        }
+        
+        public async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id)
+        {
+            var tenant = await TenantStore.FindAsync(id);
+
+            if (tenant == null)
+            {
+                return new FindTenantResultDto { Success = false };
+            }
+
+            return new FindTenantResultDto
+            {
+                Success = true,
+                TenantId = tenant.Id,
+                Name = tenant.Name
+            };
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/AbpTenantController.cs

@@ -1,37 +1,34 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.MultiTenancy;
+using Volo.Abp.AspNetCore.Mvc.MultiTenancy;
 
 namespace Pages.Abp.MultiTenancy
 {
     [Route("api/abp/multi-tenancy")]
-    public class AbpTenantController : AbpController
+    public class AbpTenantController : AbpController, IAbpTenantAppService
     {
+        private readonly IAbpTenantAppService _abpTenantAppService;
 
-        protected ITenantStore TenantStore { get; }
+        public AbpTenantController(IAbpTenantAppService abpTenantAppService)
-
-        public AbpTenantController(ITenantStore tenantStore)
         {
-            TenantStore = tenantStore;
+            _abpTenantAppService = abpTenantAppService;
         }
 
         [HttpGet]
-        [Route("find-tenant/{name}")]
+        [Route("find-tenant/{name}")] //TODO: Remove on v1.0
-        public async Task<FindTenantResult> FindTenantAsync(string name)
+        [Route("tenants/by-name/{name}")]
+        public async Task<FindTenantResultDto> FindTenantByNameAsync(string name)
         {
-            var tenant = await TenantStore.FindAsync(name);
+            return await _abpTenantAppService.FindTenantByNameAsync(name);
-
+        }
-            if (tenant == null)
-            {
-                return new FindTenantResult{Success = false};
-            }
 
-            return new FindTenantResult
+        [HttpGet]
-            {
+        [Route("tenants/by-id/{id}")]
-                Success = true,
+        public async Task<FindTenantResultDto> FindTenantByIdAsync(Guid id)
-                TenantId = tenant.Id
+        {
-            };
+            return await _abpTenantAppService.FindTenantByIdAsync(id);
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/FindTenantResult.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Pages.Abp.MultiTenancy
-{
-    public class FindTenantResult
-    {
-        public bool Success { get; set; }
-
-        public Guid? TenantId { get; set; }
-    }
-}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53766/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Packages": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53768/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj

@@ -1,11 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Packages</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Packages</PackageId>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -32,10 +32,6 @@
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
-  </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj" />

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53761/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.Mvc.UI.Widgets": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53764/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj

@@ -1,11 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Widgets</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Widgets</PackageId>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

@@ -1,12 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.AspNetCore.Mvc/Microsoft/AspNetCore/Builder/AbpAspNetCoreMvcApplicationBuilderExtensions.cs

@@ -17,19 +17,15 @@ namespace Microsoft.AspNetCore.Builder
         /// <returns>A reference to this instance after the operation has completed.</returns>
         public static IApplicationBuilder UseMvcWithDefaultRouteAndArea(
             this IApplicationBuilder app, 
-            Action<IRouteBuilder> additionalConfigurationAction = null)
+            Action<IEndpointRouteBuilder> additionalConfigurationAction = null)
         {
-            return app.UseMvc(routes =>
+            return app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
+                endpoints.MapControllerRoute("defaultWithArea", "{area}/{controller=Home}/{action=Index}/{id?}");
-                    name: "defaultWithArea",
+                endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
+                endpoints.MapRazorPages();
 
-                routes.MapRoute(
+                additionalConfigurationAction?.Invoke(endpoints);
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-
-                additionalConfigurationAction?.Invoke(routes);
             });
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53767/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.Mvc": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53769/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 
@@ -22,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0-preview9.19424.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="3.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.0.0-preview8.19405.7" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs

@@ -3,12 +3,11 @@ using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json.Serialization;
+using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +15,6 @@ using System.Reflection;
 using Volo.Abp.ApiVersioning;
 using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.DependencyInjection;
-using Volo.Abp.AspNetCore.Mvc.Json;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.VirtualFileSystem;
 using Volo.Abp.DependencyInjection;
@@ -45,8 +43,8 @@ namespace Volo.Abp.AspNetCore.Mvc
         {
             //Configure Razor
             context.Services.Insert(0,
-                ServiceDescriptor.Singleton<IConfigureOptions<RazorViewEngineOptions>>(
+                ServiceDescriptor.Singleton<IConfigureOptions<MvcRazorRuntimeCompilationOptions>>(
-                    new ConfigureOptions<RazorViewEngineOptions>(options =>
+                    new ConfigureOptions<MvcRazorRuntimeCompilationOptions>(options =>
                         {
                             options.FileProviders.Add(
                                 new RazorViewEngineVirtualFileProvider(
@@ -78,6 +76,7 @@ namespace Volo.Abp.AspNetCore.Mvc
                 );
 
             var mvcBuilder = context.Services.AddMvc()
+                .AddRazorRuntimeCompilation()
                 .AddDataAnnotationsLocalization(options =>
                 {
 
@@ -86,7 +85,7 @@ namespace Volo.Abp.AspNetCore.Mvc
                         var resourceType = abpMvcDataAnnotationsLocalizationOptions.AssemblyResources.GetOrDefault(type.Assembly);
                         return factory.Create(resourceType ?? type);
                     };
-                })
+                })                
                 .AddViewLocalization(); //TODO: How to configure from the application? Also, consider to move to a UI module since APIs does not care about it.
 
             context.Services.ExecutePreConfiguredActions(mvcBuilder);
@@ -112,10 +111,10 @@ namespace Volo.Abp.AspNetCore.Mvc
                 mvcOptions.AddAbp(context.Services);
             });
 
-            Configure<MvcJsonOptions>(jsonOptions =>
+            //Configure<MvcJsonOptions>(jsonOptions => @3.0.0!
-            {
+            //{
-                jsonOptions.SerializerSettings.ContractResolver = new AbpMvcJsonContractResolver(context.Services);
+            //    jsonOptions.SerializerSettings.ContractResolver = new AbpMvcJsonContractResolver(context.Services);
-            });
+            //});
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpServiceConvention.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ActionConstraints;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Application.Services;

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/DependencyInjection/AbpAspNetCoreMvcConventionalDependencyRegistrar.cs

@@ -7,10 +7,15 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc.DependencyInjection
 {
-    public class AbpAspNetCoreMvcConventionalRegistrar : DefaultConventionalRegistrar
+    public class AbpAspNetCoreMvcConventionalRegistrar : ConventionalRegistrarBase
     {
         public override void AddType(IServiceCollection services, Type type)
         {
+            if (IsConventionalRegistrationDisabled(type))
+            {
+                return;
+            }
+
             if (!IsMvcService(type))
             {
                 return;

framework/src/Volo.Abp.AspNetCore.TestBase/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53783/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore.TestBase": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53784/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore.TestBase</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.TestBase</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 
@@ -20,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/DynamicProxying/AspNetCoreTestDynamicProxyHttpClientFactory.cs

@@ -8,11 +8,11 @@ namespace Volo.Abp.AspNetCore.TestBase.DynamicProxying
     public class AspNetCoreTestDynamicProxyHttpClientFactory : IDynamicProxyHttpClientFactory, ITransientDependency
     {
         private readonly ITestServerAccessor _testServerAccessor;
-        private readonly IHttpClientFactory _httpClientFactory;
 
-        public AspNetCoreTestDynamicProxyHttpClientFactory(ITestServerAccessor testServerAccessor, IHttpClientFactory httpClientFactory) {
+        public AspNetCoreTestDynamicProxyHttpClientFactory(
+            ITestServerAccessor testServerAccessor)
+        {
             _testServerAccessor = testServerAccessor;
-            _httpClientFactory = httpClientFactory;
         }
 
         public HttpClient Create()
@@ -20,7 +20,8 @@ namespace Volo.Abp.AspNetCore.TestBase.DynamicProxying
             return _testServerAccessor.Server.CreateClient();
         }
 
-        public HttpClient Create(string name) {
+        public HttpClient Create(string name)
+        {
             return Create();
         }
     }

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.RequestLocalization;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
@@ -12,9 +8,6 @@ using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Tracing;
 using Volo.Abp.AspNetCore.Uow;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Localization;
-using Volo.Abp.Settings;
-using Volo.Abp.Threading;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -51,7 +44,10 @@ namespace Microsoft.AspNetCore.Builder
 
         public static IApplicationBuilder UseAbpRequestLocalization(this IApplicationBuilder app, Action<RequestLocalizationOptions> optionsAction = null)
         {
-            app.ApplicationServices.GetRequiredService<IAbpRequestLocalizationOptionsProvider>().InitLocalizationOptions(optionsAction);
+            app.ApplicationServices
+                .GetRequiredService<IAbpRequestLocalizationOptionsProvider>()
+                .InitLocalizationOptions(optionsAction);
+
             return app.UseMiddleware<AbpRequestLocalizationMiddleware>();
         }
 

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs

@@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Hosting
     public static class AbpHostingEnvironmentExtensions
     {
         public static IConfigurationRoot BuildConfiguration(
-            this IHostingEnvironment env,
+            this IWebHostEnvironment env,
             ConfigurationBuilderOptions options = null)
         {
             options = options ?? new ConfigurationBuilderOptions();

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/AbpRequestLocalizationMiddleware.cs

@@ -1,6 +1,8 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
@@ -9,17 +11,24 @@ namespace Microsoft.AspNetCore.RequestLocalization
     public class AbpRequestLocalizationMiddleware : IMiddleware, ITransientDependency
     {
         private readonly IAbpRequestLocalizationOptionsProvider _requestLocalizationOptionsProvider;
+        private readonly ILoggerFactory _loggerFactory;
 
         public AbpRequestLocalizationMiddleware(
-            IAbpRequestLocalizationOptionsProvider requestLocalizationOptionsProvider)
+            IAbpRequestLocalizationOptionsProvider requestLocalizationOptionsProvider,
+            ILoggerFactory loggerFactory)
         {
             _requestLocalizationOptionsProvider = requestLocalizationOptionsProvider;
+            _loggerFactory = loggerFactory;
         }
 
         public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         {
-            var options = Options.Create(_requestLocalizationOptionsProvider.GetLocalizationOptions());
+            var middleware = new RequestLocalizationMiddleware(
-            var middleware = new RequestLocalizationMiddleware(next, options);
+                next,
+                new OptionsWrapper<RequestLocalizationOptions>(_requestLocalizationOptionsProvider.GetLocalizationOptions()),
+                _loggerFactory
+            );
+
             await middleware.Invoke(context);
         }
     }

framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs

@@ -5,9 +5,9 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class AbpAspNetCoreServiceCollectionExtensions
     {
-        public static IHostingEnvironment GetHostingEnvironment(this IServiceCollection services)
+        public static IWebHostEnvironment GetHostingEnvironment(this IServiceCollection services)
         {
-            return services.GetSingletonInstance<IHostingEnvironment>();
+            return services.GetSingletonInstance<IWebHostEnvironment>();
         }
 
         public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null)

framework/src/Volo.Abp.AspNetCore/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:53374/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.AspNetCore": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:53375/"
+    }
+  }
+}

framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.AspNetCore</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 
@@ -26,13 +28,4 @@
     <ProjectReference Include="..\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
-  </ItemGroup>
-
 </Project>

framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs

@@ -13,9 +13,9 @@ namespace Volo.Abp
             return context.ServiceProvider.GetRequiredService<IObjectAccessor<IApplicationBuilder>>().Value;
         }
 
-        public static IHostingEnvironment GetEnvironment(this ApplicationInitializationContext context)
+        public static IWebHostEnvironment GetEnvironment(this ApplicationInitializationContext context)
         {
-            return context.ServiceProvider.GetRequiredService<IHostingEnvironment>();
+            return context.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
         }
 
         public static ILoggerFactory GetLoggerFactory(this ApplicationInitializationContext context)

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs

@@ -14,14 +14,14 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem
     {
         private readonly IVirtualFileProvider _virtualFileProvider;
         private readonly IFileProvider _fileProvider;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IWebHostEnvironment _hostingEnvironment;
         private string _rootPath = "/wwwroot"; //TODO: How to handle wwwroot naming?
 
         protected AspNetCoreContentOptions Options { get; }
 
         public WebContentFileProvider(
-            IVirtualFileProvider virtualFileProvider, 
+            IVirtualFileProvider virtualFileProvider,
-            IHostingEnvironment hostingEnvironment,
+            IWebHostEnvironment hostingEnvironment,
             IOptions<AspNetCoreContentOptions> options)
         {
             _virtualFileProvider = virtualFileProvider;

framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs

@@ -25,7 +25,7 @@ namespace Volo.Abp.Authorization
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAuthorization();
+            context.Services.AddAuthorizationCore();
 
             context.Services.AddSingleton<IAuthorizationHandler, PermissionRequirementHandler>();
 

framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\common.props" />
 
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview9.19423.4" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/UpdateNuGetConfigStep.cs

@@ -29,7 +29,10 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 return;
             }
 
-            file.ReplaceText("{api-key}", apiKey);
+            const string placeHolder = "<!-- {ABP_COMMERCIAL_NUGET_SOURCE} -->";
+            var nugetSourceTag = $"<add key=\"ABP Commercial NuGet Source\" value=\"https://nuget.abp.io/{apiKey}/v3/index.json\" />";
+
+            file.ReplaceText(placeHolder, nugetSourceTag);
         }
     }
 }

framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>abp</ToolCommandName>
     <RootNamespace />

framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs

@@ -30,5 +30,10 @@ namespace Microsoft.Extensions.Configuration
         /// Base path to read the configuration file indicated by <see cref="FileName"/>.
         /// </summary>
         public string BasePath { get; set; }
+
+        /// <summary>
+        /// Prefix for the environment variables.
+        /// </summary>
+        public string EnvironmentVariablesPrefix { get; set; }
     }
 }

framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Extensions.Configuration
                 builder = builder.AddJsonFile($"{options.FileName}.{options.EnvironmentName}.json", optional: true, reloadOnChange: true);
             }
             
-            builder = builder.AddEnvironmentVariables();
+            builder = builder.AddEnvironmentVariables(options.EnvironmentVariablesPrefix);
 
             if (options.EnvironmentName == "Development")
             {

framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

@@ -11,18 +11,18 @@
     <RootNamespace />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0-preview9.19421.4" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.6.0-preview9.19421.4" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0-preview9.19423.4" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.18" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.19" />
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0" />
     <PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0" />

framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
@@ -31,5 +32,23 @@ namespace Volo.Abp.DependencyInjection
         }
 
         public abstract void AddType(IServiceCollection services, Type type);
+
+        protected virtual bool IsConventionalRegistrationDisabled(Type type)
+        {
+            return type.IsDefined(typeof(DisableConventionalRegistrationAttribute), true);
+        }
+
+        protected virtual void TriggerServiceExposing(IServiceCollection services, Type implementationType, List<Type> serviceTypes)
+        {
+            var exposeActions = services.GetExposingActionList();
+            if (exposeActions.Any())
+            {
+                var args = new OnServiceExposingContext(implementationType, serviceTypes);
+                foreach (var action in exposeActions)
+                {
+                    action(args);
+                }
+            }
+        }
     }
 }

framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
@@ -48,25 +46,7 @@ namespace Volo.Abp.DependencyInjection
                 }
             }
         }
-
+        
-        protected virtual void TriggerServiceExposing(IServiceCollection services, Type type, List<Type> serviceTypes)
-        {
-            var exposeActions = services.GetExposingActionList();
-            if (exposeActions.Any())
-            {
-                var args = new OnServiceExposingContext(type, serviceTypes);
-                foreach (var action in exposeActions)
-                {
-                    action(args);
-                }
-            }
-        }
-
-        protected virtual bool IsConventionalRegistrationDisabled(Type type)
-        {
-            return type.IsDefined(typeof(DisableConventionalRegistrationAttribute), true);
-        }
-
         protected virtual DependencyAttribute GetDependencyAttributeOrNull(Type type)
         {
             return type.GetCustomAttribute<DependencyAttribute>(true);

framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs

@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.Modularity
 {
-    public interface IAbpModule : ISingletonDependency
+    public interface IAbpModule
     {
         void ConfigureServices(ServiceConfigurationContext context);
     }

framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Volo.Abp.Dapper</AssemblyName>
     <PackageId>Volo.Abp.Dapper</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppService.cs

@@ -289,7 +289,11 @@ namespace Volo.Abp.Application.Services
                 return;
             }
 
-            entityWithGuidId.Id = GuidGenerator.Create();
+            EntityHelper.TrySetId(
+                entityWithGuidId,
+                () => GuidGenerator.Create(),
+                true
+            );
         }
 
         /// <summary>

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRoot.cs

@@ -28,5 +28,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual Guid? LastModifierId { get; set; }
+
+        protected AuditedAggregateRoot()
+        {
+
+        }
+
+        protected AuditedAggregateRoot(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs

@@ -32,5 +32,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual TUser LastModifier { get; set; }
+
+        protected AuditedAggregateRootWithUser()
+        {
+
+        }
+
+        protected AuditedAggregateRootWithUser(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntity.cs

@@ -28,5 +28,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual Guid? LastModifierId { get; set; }
+
+        protected AuditedEntity()
+        {
+
+        }
+
+        protected AuditedEntity(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs

@@ -32,5 +32,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual TUser LastModifier { get; set; }
+
+        protected AuditedEntityWithUser()
+        {
+
+        }
+
+        protected AuditedEntityWithUser(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRoot.cs

@@ -28,5 +28,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual Guid? CreatorId { get; set; }
+
+        protected CreationAuditedAggregateRoot()
+        {
+
+        }
+
+        protected CreationAuditedAggregateRoot(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedAggregateRootWithUser.cs

@@ -24,5 +24,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
     {
         /// <inheritdoc />
         public virtual TUser Creator { get; set; }
+
+        protected CreationAuditedAggregateRootWithUser()
+        {
+
+        }
+
+        protected CreationAuditedAggregateRootWithUser(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntity.cs

@@ -28,5 +28,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual Guid? CreatorId { get; set; }
+
+        protected CreationAuditedEntity()
+        {
+
+        }
+
+        protected CreationAuditedEntity(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/CreationAuditedEntityWithUser.cs

@@ -24,5 +24,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
     {
         /// <inheritdoc />
         public virtual TUser Creator { get; set; }
+
+        protected CreationAuditedEntityWithUser()
+        {
+
+        }
+
+        protected CreationAuditedEntityWithUser(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRoot.cs

@@ -34,5 +34,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual DateTime? DeletionTime { get; set; }
+
+        protected FullAuditedAggregateRoot()
+        {
+            
+        }
+
+        protected FullAuditedAggregateRoot(TKey id)
+        : base(id)
+        {
+            
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedAggregateRootWithUser.cs

@@ -38,5 +38,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public TUser LastModifier { get; set; }
+
+        protected FullAuditedAggregateRootWithUser()
+        {
+
+        }
+
+        protected FullAuditedAggregateRootWithUser(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntity.cs

@@ -34,5 +34,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
 
         /// <inheritdoc />
         public virtual DateTime? DeletionTime { get; set; }
+
+        protected FullAuditedEntity()
+        {
+
+        }
+
+        protected FullAuditedEntity(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs

@@ -38,5 +38,16 @@ namespace Volo.Abp.Domain.Entities.Auditing
         
         /// <inheritdoc />
         public TUser LastModifier { get; set; }
+
+        protected FullAuditedEntityWithUser()
+        {
+
+        }
+
+        protected FullAuditedEntityWithUser(TKey id)
+            : base(id)
+        {
+
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/DisableIdGenerationAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Volo.Abp.Domain.Entities
+{
+    public class DisableIdGenerationAttribute : Attribute
+    {
+
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs

@@ -23,7 +23,7 @@ namespace Volo.Abp.Domain.Entities
     public abstract class Entity<TKey> : Entity, IEntity<TKey>
     {
         /// <inheritdoc/>
-        public virtual TKey Id { get; set; }
+        public virtual TKey Id { get; protected set; }
 
         protected Entity()
         {
@@ -35,8 +35,7 @@ namespace Volo.Abp.Domain.Entities
             Id = id;
         }
 
-        /// <inheritdoc/>
+        public bool EntityEquals(object obj)
-        public override bool Equals(object obj)
         {
             if (obj == null || !(obj is Entity<TKey>))
             {
@@ -73,33 +72,7 @@ namespace Volo.Abp.Domain.Entities
 
             return Id.Equals(other.Id);
         }
-
+        
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            if (Id == null)
-            {
-                return 0;
-            }
-
-            return Id.GetHashCode();
-        }
-
-        public static bool operator ==(Entity<TKey> left, Entity<TKey> right)
-        {
-            if (Equals(left, null))
-            {
-                return Equals(right, null);
-            }
-
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(Entity<TKey> left, Entity<TKey> right)
-        {
-            return !(left == right);
-        }
-
         public override object[] GetKeys()
         {
             return new object[] {Id};

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/EntityHelper.cs

@@ -81,5 +81,32 @@ namespace Volo.Abp.Domain.Entities
             var lambdaBody = Expression.Equal(leftExpression, rightExpression);
             return Expression.Lambda<Func<TEntity, bool>>(lambdaBody, lambdaParam);
         }
+
+        public static void TrySetId<TKey>(
+            IEntity<TKey> entity, 
+            Func<TKey> idFactory, 
+            bool checkForDisableGuidGenerationAttribute = false)
+        {
+            //TODO: Can be optimized (by caching per entity type)?
+            var entityType = entity.GetType();
+            var idProperty = entityType.GetProperty(
+                nameof(entity.Id)
+            );
+
+            if (idProperty == null)
+            {
+                return;
+            }
+
+            if (checkForDisableGuidGenerationAttribute)
+            {
+                if (idProperty.IsDefined(typeof(DisableIdGenerationAttribute), true))
+                {
+                    return;
+                }
+            }
+
+            idProperty.SetValue(entity, idFactory());
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs

@@ -22,6 +22,6 @@
         /// <summary>
         /// Unique identifier for this entity.
         /// </summary>
-        TKey Id { get; set; }
+        TKey Id { get; }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs

@@ -7,23 +7,9 @@ namespace Volo.Abp.Domain.Values
 
     public abstract class ValueObject
     {
-        protected static bool EqualOperator(ValueObject left, ValueObject right)
-        {
-            if (ReferenceEquals(left, null) ^ ReferenceEquals(right, null))
-            {
-                return false;
-            }
-            return ReferenceEquals(left, null) || left.Equals(right);
-        }
-
-        protected static bool NotEqualOperator(ValueObject left, ValueObject right)
-        {
-            return !(EqualOperator(left, right));
-        }
-
         protected abstract IEnumerable<object> GetAtomicValues();
 
-        public override bool Equals(object obj)
+        public bool ValueEquals(object obj)
         {
             if (obj == null || obj.GetType() != GetType())
             {
@@ -31,8 +17,10 @@ namespace Volo.Abp.Domain.Values
             }
 
             ValueObject other = (ValueObject)obj;
+
             IEnumerator<object> thisValues = GetAtomicValues().GetEnumerator();
             IEnumerator<object> otherValues = other.GetAtomicValues().GetEnumerator();
+
             while (thisValues.MoveNext() && otherValues.MoveNext())
             {
                 if (ReferenceEquals(thisValues.Current, null) ^
@@ -47,15 +35,8 @@ namespace Volo.Abp.Domain.Values
                     return false;
                 }
             }
-            return !thisValues.MoveNext() && !otherValues.MoveNext();
-        }
 
-        public override int GetHashCode()
+            return !thisValues.MoveNext() && !otherValues.MoveNext();
-        {
-            return GetAtomicValues()
-                .Select(x => x != null ? x.GetHashCode() : 0)
-                .Aggregate((x, y) => x ^ y);
         }
-        // Other utilility methods
     }
 }

framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
    
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Volo.Abp.EntityFrameworkCore.MySQL</AssemblyName>
     <PackageId>Volo.Abp.EntityFrameworkCore.MySQL</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Volo.Abp.EntityFrameworkCore.PostgreSql</AssemblyName>
     <PackageId>Volo.Abp.EntityFrameworkCore.PostgreSql</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.0-preview9" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Volo.Abp.EntityFrameworkCore.SqlServer</AssemblyName>
     <PackageId>Volo.Abp.EntityFrameworkCore.SqlServer</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview9.19423.6" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
   
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Volo.Abp.EntityFrameworkCore.Sqlite</AssemblyName>
     <PackageId>Volo.Abp.EntityFrameworkCore.Sqlite</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -14,7 +14,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview9.19423.6" />
   </ItemGroup>
   
   <ItemGroup>

framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Volo.Abp.EntityFrameworkCore</AssemblyName>
     <PackageId>Volo.Abp.EntityFrameworkCore</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview9.19423.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview9.19423.6" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs

@@ -258,14 +258,14 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
         public virtual TEntity Find(TKey id, bool includeDetails = true)
         {
             return includeDetails
-                ? WithDetails().FirstOrDefault(EntityHelper.CreateEqualityExpressionForId<TEntity, TKey>(id))
+                ? WithDetails().FirstOrDefault(e => e.Id.Equals(id))
                 : DbSet.Find(id);
         }
 
         public virtual async Task<TEntity> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default)
         {
             return includeDetails
-                ? await WithDetails().FirstOrDefaultAsync(EntityHelper.CreateEqualityExpressionForId<TEntity, TKey>(id), GetCancellationToken(cancellationToken))
+                ? await WithDetails().FirstOrDefaultAsync(e => e.Id.Equals(id), GetCancellationToken(cancellationToken))
                 : await DbSet.FindAsync(new object[] { id }, GetCancellationToken(cancellationToken));
         }
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs

@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Newtonsoft.Json;
@@ -282,20 +281,37 @@ namespace Volo.Abp.EntityFrameworkCore
 
         protected virtual void CheckAndSetId(EntityEntry entry)
         {
-            //Set GUID Ids
+            if (entry.Entity is IEntity<Guid> entityWithGuidId)
-            var entity = entry.Entity as IEntity<Guid>;
-            if (entity != null && entity.Id == Guid.Empty)
             {
-                var dbGeneratedAttr = ReflectionHelper
+                TrySetGuidId(entry, entityWithGuidId);
-                    .GetSingleAttributeOrDefault<DatabaseGeneratedAttribute>(
+            }
-                        entry.Property("Id").Metadata.PropertyInfo
+        }
-                    );
 
-                if (dbGeneratedAttr == null || dbGeneratedAttr.DatabaseGeneratedOption == DatabaseGeneratedOption.None)
+        protected virtual void TrySetGuidId(EntityEntry entry, IEntity<Guid> entity)
-                {
+        {
-                    entity.Id = GuidGenerator.Create();
+            if (entity.Id != default)
-                }
+            {
+                return;
             }
+
+            var idProperty = entry.Property("Id").Metadata.PropertyInfo;
+
+            //Check for DatabaseGeneratedAttribute
+            var dbGeneratedAttr = ReflectionHelper
+                .GetSingleAttributeOrDefault<DatabaseGeneratedAttribute>(
+                    idProperty
+                );
+
+            if (dbGeneratedAttr != null && dbGeneratedAttr.DatabaseGeneratedOption != DatabaseGeneratedOption.None)
+            {
+                return;
+            }
+
+            EntityHelper.TrySetId(
+                entity,
+                () => GuidGenerator.Create(),
+                true
+            );
         }
 
         protected virtual void SetCreationAuditProperties(EntityEntry entry)
@@ -494,12 +510,12 @@ namespace Volo.Abp.EntityFrameworkCore
 
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)))
             {
-                expression = e => !IsSoftDeleteFilterEnabled || !((ISoftDelete) e).IsDeleted;
+                expression = e => !IsSoftDeleteFilterEnabled || !EF.Property<bool>(e, "IsDeleted");
             }
 
             if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity)))
             {
-                Expression<Func<TEntity, bool>> multiTenantFilter = e => !IsMultiTenantFilterEnabled || ((IMultiTenant) e).TenantId == CurrentTenantId;
+                Expression<Func<TEntity, bool>> multiTenantFilter = e => !IsMultiTenantFilterEnabled || EF.Property<Guid>(e, "TenantId") == CurrentTenantId;
                 expression = expression == null ? multiTenantFilter : CombineExpressions(expression, multiTenantFilter);
             }
 

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/IEfCoreDbContext.cs

@@ -35,9 +35,9 @@ namespace Volo.Abp.EntityFrameworkCore
 
         EntityEntry<TEntity> Add<TEntity>([NotNull] TEntity entity) where TEntity : class;
 
-        Task<EntityEntry> AddAsync([NotNull] object entity, CancellationToken cancellationToken = default);
+        ValueTask<EntityEntry> AddAsync([NotNull] object entity, CancellationToken cancellationToken = default);
 
-        Task<EntityEntry<TEntity>> AddAsync<TEntity>([NotNull] TEntity entity, CancellationToken cancellationToken = default) where TEntity : class;
+        ValueTask<EntityEntry<TEntity>> AddAsync<TEntity>([NotNull] TEntity entity, CancellationToken cancellationToken = default) where TEntity : class;
 
         void AddRange([NotNull] IEnumerable<object> entities);
 
@@ -59,13 +59,13 @@ namespace Volo.Abp.EntityFrameworkCore
 
         TEntity Find<TEntity>([NotNull] params object[] keyValues) where TEntity : class;
 
-        Task<object> FindAsync([NotNull] Type entityType, [NotNull] object[] keyValues, CancellationToken cancellationToken);
+        ValueTask<object> FindAsync([NotNull] Type entityType, [NotNull] object[] keyValues, CancellationToken cancellationToken);
 
-        Task<TEntity> FindAsync<TEntity>([NotNull] object[] keyValues, CancellationToken cancellationToken) where TEntity : class;
+        ValueTask<TEntity> FindAsync<TEntity>([NotNull] object[] keyValues, CancellationToken cancellationToken) where TEntity : class;
 
-        Task<TEntity> FindAsync<TEntity>([NotNull] params object[] keyValues) where TEntity : class;
+        ValueTask<TEntity> FindAsync<TEntity>([NotNull] params object[] keyValues) where TEntity : class;
 
-        Task<object> FindAsync([NotNull] Type entityType, [NotNull] params object[] keyValues);
+        ValueTask<object> FindAsync([NotNull] Type entityType, [NotNull] params object[] keyValues);
 
         EntityEntry<TEntity> Remove<TEntity>([NotNull] TEntity entity) where TEntity : class;
 

framework/src/Volo.Abp.FluentValidation/Volo/Abp/FluentValidation/AbpFluentValidationConventionalRegistrar.cs

@@ -1,14 +1,20 @@
 using System;
+using System.Collections.Generic;
 using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.FluentValidation
 {
-    public class AbpFluentValidationConventionalRegistrar : DefaultConventionalRegistrar
+    public class AbpFluentValidationConventionalRegistrar : ConventionalRegistrarBase
     {
         public override void AddType(IServiceCollection services, Type type)
         {
+            if (IsConventionalRegistrationDisabled(type))
+            {
+                return;
+            }
+
             if (!typeof(IValidator).IsAssignableFrom(type))
             {
                 return;
@@ -20,8 +26,12 @@ namespace Volo.Abp.FluentValidation
                 return;
             }
 
+            var serviceType = typeof(IValidator<>).MakeGenericType(validatingType);
+
+            TriggerServiceExposing(services, type, new List<Type>{ serviceType });
+
             services.AddTransient(
-                typeof(IValidator<>).MakeGenericType(validatingType),
+                serviceType,
                 type
             );
         }

framework/src/Volo.Abp.Http.Client.IdentityModel/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:52306/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.Http.Client.IdentityModel": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:52307/"
+    }
+  }
+}

framework/src/Volo.Abp.Http.Client.IdentityModel/Volo.Abp.Http.Client.IdentityModel.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.Http.Client.IdentityModel</AssemblyName>
     <PackageId>Volo.Abp.Http.Client.IdentityModel</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 

framework/src/Volo.Abp.Http.Client/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:52208/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.Abp.Http.Client": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:52209/"
+    }
+  }
+}

framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.csproj

@@ -1,21 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Volo.Abp.Http.Client</AssemblyName>
     <PackageId>Volo.Abp.Http.Client</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.0.0-preview9.19423.4" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/ApiDescriptionFinder.cs

@@ -92,7 +92,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
                 if (!response.IsSuccessStatusCode)
                 {
-                    throw new AbpException("Remote service returns error!");
+                    throw new AbpException("Remote service returns error! StatusCode = " + response.StatusCode);
                 }
 
                 var content = await response.Content.ReadAsStringAsync();

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/VirtualFiles/VirtualFileLocalizationResourceContributorBase.cs

@@ -84,7 +84,7 @@ namespace Volo.Abp.Localization.VirtualFiles
                 var dictionary = CreateDictionaryFromFile(file);
                 if (dictionaries.ContainsKey(dictionary.CultureName))
                 {
-                    throw new AbpException($"{file.PhysicalPath} dictionary has a culture name '{dictionary.CultureName}' which is already defined!");
+                    throw new AbpException($"{file.GetVirtualOrPhysicalPathOrNull()} dictionary has a culture name '{dictionary.CultureName}' which is already defined!");
                 }
 
                 dictionaries[dictionary.CultureName] = dictionary;

framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="2.2.0" />
+    <PackageReference Include="MailKit" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs

@@ -75,18 +75,20 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
 
         protected virtual void SetIdIfNeeded(TEntity entity)
         {
-            if (typeof(TKey) == typeof(int) || typeof(TKey) == typeof(long) || typeof(TKey) == typeof(Guid))
+            if (typeof(TKey) == typeof(int) || 
+                typeof(TKey) == typeof(long) || 
+                typeof(TKey) == typeof(Guid))
             {
                 if (EntityHelper.HasDefaultId(entity))
                 {
-                    entity.Id = Database.GenerateNextId<TEntity, TKey>();
+                    EntityHelper.TrySetId(entity, () => Database.GenerateNextId<TEntity, TKey>());
                 }
             }
         }
 
         public virtual TEntity Find(TKey id, bool includeDetails = true)
         {
-            return GetQueryable().FirstOrDefault(EntityHelper.CreateEqualityExpressionForId<TEntity, TKey>(id));
+            return GetQueryable().FirstOrDefault(e => e.Id.Equals(id));
         }
 
         public virtual TEntity Get(TKey id, bool includeDetails = true)

framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/Utf8JsonMemoryDbSerializer.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Reflection;
 using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Json;
 
@@ -7,21 +10,43 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
 {
     public class Utf8JsonMemoryDbSerializer : IMemoryDbSerializer, ITransientDependency
     {
-        private readonly IJsonSerializer _jsonSerializer;
+        private static readonly JsonSerializerSettings MemoryDbSerializerSettings;
 
-        public Utf8JsonMemoryDbSerializer(IJsonSerializer jsonSerializer)
+        static Utf8JsonMemoryDbSerializer()
         {
-            _jsonSerializer = jsonSerializer;
+            MemoryDbSerializerSettings = new JsonSerializerSettings
+            {
+                ContractResolver = new ResolverWithPrivateSetters(),
+                ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
+            };
         }
 
         byte[] IMemoryDbSerializer.Serialize(object obj)
         {
-            return Encoding.UTF8.GetBytes(_jsonSerializer.Serialize(obj));
+            var jsonString = JsonConvert.SerializeObject(obj, MemoryDbSerializerSettings);
+            return Encoding.UTF8.GetBytes(jsonString);
         }
 
         public object Deserialize(byte[] value, Type type)
         {
-            return _jsonSerializer.Deserialize(type, Encoding.UTF8.GetString(value));
+            var jsonString = Encoding.UTF8.GetString(value);
+            return JsonConvert.DeserializeObject(jsonString, type, MemoryDbSerializerSettings);
+        }
+
+        public class ResolverWithPrivateSetters : DefaultContractResolver
+        {
+            protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+            {
+                var prop = base.CreateProperty(member, memberSerialization);
+                if (prop.Writable)
+                {
+                    return prop;
+                }
+
+                prop.Writable = member.As<PropertyInfo>()?.GetSetMethod(true) != null;
+
+                return prop;
+            }
         }
     }
 }

framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs

@@ -15,6 +15,7 @@ using Volo.Abp.EventBus.Local;
 using Volo.Abp.Guids;
 using Volo.Abp.MongoDB;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Reflection;
 using Volo.Abp.Threading;
 
 namespace Volo.Abp.Domain.Repositories.MongoDB
@@ -315,12 +316,26 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
 
         protected virtual void CheckAndSetId(TEntity entity)
         {
-            if (entity is IEntity<Guid> entityWithGuidId && entityWithGuidId.Id == default)
+            if (entity is IEntity<Guid> entityWithGuidId)
             {
-                entityWithGuidId.Id = GuidGenerator.Create();
+                TrySetGuidId(entityWithGuidId);
             }
         }
 
+        protected virtual void TrySetGuidId(IEntity<Guid> entity)
+        {
+            if (entity.Id != default)
+            {
+                return;
+            }
+
+            EntityHelper.TrySetId(
+                entity,
+                () => GuidGenerator.Create(),
+                true
+            );
+        }
+
         protected virtual void SetCreationAuditProperties(TEntity entity)
         {
             AuditPropertySetter.SetCreationProperties(entity);