Updated ABP to version 2.7.0

EasyAbp · May 11, 2020 · cf0a132 · cf0a132
1 parent 97f958f
commit cf0a132
Show file tree

Hide file tree

Showing 42 changed files with 2,397 additions and 441 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.2.1</Version>
+    <Version>0.2.2</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/host/EasyAbp.PrivateMessaging.Host.Shared/EasyAbp.PrivateMessaging.Host.Shared.csproj b/host/EasyAbp.PrivateMessaging.Host.Shared/EasyAbp.PrivateMessaging.Host.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 

diff --git a/host/EasyAbp.PrivateMessaging.HttpApi.Host/EasyAbp.PrivateMessaging.HttpApi.Host.csproj b/host/EasyAbp.PrivateMessaging.HttpApi.Host/EasyAbp.PrivateMessaging.HttpApi.Host.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\common.props" />
 
@@ -17,13 +17,13 @@
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.3.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.7.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/host/EasyAbp.PrivateMessaging.IdentityServer/EasyAbp.PrivateMessaging.IdentityServer.csproj b/host/EasyAbp.PrivateMessaging.IdentityServer/EasyAbp.PrivateMessaging.IdentityServer.csproj
@@ -15,30 +15,30 @@
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.Account.Application" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.Identity.Application" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.3.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.3.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.Account.Application" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.Identity.Application" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.7.0" />
+    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.7.0" />
     <ProjectReference Include="..\..\src\EasyAbp.PrivateMessaging.Application.Contracts\EasyAbp.PrivateMessaging.Application.Contracts.csproj" />
     <ProjectReference Include="..\EasyAbp.PrivateMessaging.Host.Shared\EasyAbp.PrivateMessaging.Host.Shared.csproj" />
   </ItemGroup>

diff --git a/host/EasyAbp.PrivateMessaging.IdentityServer/package.json b/host/EasyAbp.PrivateMessaging.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~2.7.0"
   }
 }
diff --git a/host/EasyAbp.PrivateMessaging.IdentityServer/wwwroot/libs/abp/core/abp.js b/host/EasyAbp.PrivateMessaging.IdentityServer/wwwroot/libs/abp/core/abp.js
@@ -76,10 +76,17 @@ var abp = abp || {};
     abp.localization.values = {};
 
     abp.localization.localize = function (key, sourceName) {
+        if (sourceName === '_') { //A convention to suppress the localization
+            return key;
+        }
+
         sourceName = sourceName || abp.localization.defaultResourceName;
+        if (!sourceName) {
+            abp.log.warn('Localization source name is not specified and the defaultResourceName was not defined!');
+            return key;
+        }
 
         var source = abp.localization.values[sourceName];
-
         if (!source) {
             abp.log.warn('Could not find localization source: ' + sourceName);
             return key;
@@ -97,6 +104,29 @@ var abp = abp || {};
         return abp.utils.formatString.apply(this, copiedArguments);
     };
 
+    abp.localization.isLocalized = function (key, sourceName) {
+        if (sourceName === '_') { //A convention to suppress the localization
+            return true;
+        }
+
+        sourceName = sourceName || abp.localization.defaultResourceName;
+        if (!sourceName) {
+            return false;
+        }
+
+        var source = abp.localization.values[sourceName];
+        if (!source) {
+            return false;
+        }
+
+        var value = source[key];
+        if (value === undefined) {
+            return false;
+        }
+
+        return true;
+    };
+
     abp.localization.getResource = function (name) {
         return function () {
             var copiedArguments = Array.prototype.slice.call(arguments, 0);