merge

common.props

@@ -1,17 +1,15 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>latest</LangVersion> 
-    <Version>2.3.0</Version> 
+    <LangVersion>latest</LangVersion>
+    <Version>2.3.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/abpframework/abp/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/abpframework/abp/</RepositoryUrl>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
   </ItemGroup>
-
-</Project>
+</Project>

templates/app/angular/package.json

@@ -11,11 +11,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~2.1.0",
-    "@abp/ng.identity": "~2.1.0",
-    "@abp/ng.setting-management": "~2.1.0",
-    "@abp/ng.tenant-management": "~2.1.0",
-    "@abp/ng.theme.basic": "~2.1.0",
+    "@abp/ng.account": "~2.2.0",
+    "@abp/ng.identity": "~2.2.0",
+    "@abp/ng.setting-management": "~2.2.0",
+    "@abp/ng.tenant-management": "~2.2.0",
+    "@abp/ng.theme.basic": "~2.2.0",
     "@angular/animations": "~9.0.2",
     "@angular/common": "~9.0.2",
     "@angular/compiler": "~9.0.2",

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^2.1.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0"
   }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/wwwroot/libs/abp/core/abp.css

@@ -1,56 +1,56 @@
-@keyframes spin {
-    0% {
-        transform: translateZ(0) rotate(0deg);
-    }
-
-    100% {
-        transform: translateZ(0) rotate(360deg);
-    }
-}
-
-.abp-block-area {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 102;
-    background-color: #fff;
-    opacity: .8;
-    transition: opacity .25s;
-}
-
-    .abp-block-area.abp-block-area-disappearing {
-        opacity: 0;
-    }
-
-    .abp-block-area.abp-block-area-busy:after {
-        content: attr(data-text);
-        display: block;
-        max-width: 125px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        font-size: 20px;
-        font-family: sans-serif;
-        color: #343a40;
-        text-align: center;
-        text-transform: uppercase;
-    }
-
-    .abp-block-area.abp-block-area-busy:before {
-        content: "";
-        display: block;
-        width: 150px;
-        height: 150px;
-        border-radius: 50%;
-        border-width: 2px;
-        border-style: solid;
-        border-color: transparent #228ae6 #228ae6 #228ae6;
-        position: absolute;
-        top: calc(50% - 75px);
-        left: calc(50% - 75px);
-        will-change: transform;
-        animation: spin .75s infinite ease-in-out;
-    }
+@keyframes spin {
+    0% {
+        transform: translateZ(0) rotate(0deg);
+    }
+
+    100% {
+        transform: translateZ(0) rotate(360deg);
+    }
+}
+
+.abp-block-area {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 102;
+    background-color: #fff;
+    opacity: .8;
+    transition: opacity .25s;
+}
+
+    .abp-block-area.abp-block-area-disappearing {
+        opacity: 0;
+    }
+
+    .abp-block-area.abp-block-area-busy:after {
+        content: attr(data-text);
+        display: block;
+        max-width: 125px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        font-size: 20px;
+        font-family: sans-serif;
+        color: #343a40;
+        text-align: center;
+        text-transform: uppercase;
+    }
+
+    .abp-block-area.abp-block-area-busy:before {
+        content: "";
+        display: block;
+        width: 150px;
+        height: 150px;
+        border-radius: 50%;
+        border-width: 2px;
+        border-style: solid;
+        border-color: transparent #228ae6 #228ae6 #228ae6;
+        position: absolute;
+        top: calc(50% - 75px);
+        left: calc(50% - 75px);
+        will-change: transform;
+        animation: spin .75s infinite ease-in-out;
+    }