Merge branch 'dev' into liangshiwei/rediscache

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

@@ -1,27 +0,0 @@
-{
-  "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.MultiTenancy/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "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.Mvc.Client/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "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.UI.Bootstrap/Properties/launchSettings.json

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

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

@@ -1,27 +0,0 @@
-{
-  "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.MultiTenancy/Properties/launchSettings.json

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

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

@@ -1,27 +0,0 @@
-{
-  "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/Uppy/UppyScriptContributor.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Uppy
+{
+    public class UppyScriptContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/libs/uppy/uppy.min.js");
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Uppy/UppyStyleContributor.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Uppy
+{
+    public class UppyStyleContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/libs/uppy/uppy.min.css");
+        }
+    }
+}

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

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

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

@@ -22,8 +22,6 @@
 
   <ItemGroup>
     <Content Remove="wwwroot\**\*.*" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -18,8 +18,6 @@
 
   <ItemGroup>
     <Content Remove="compilerconfig.json" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

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

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

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

@@ -23,9 +23,7 @@
   <ItemGroup>
     <Content Remove="wwwroot\**\*.*" />
     <Content Remove="compilerconfig.json" />
-    <Content Remove="Properties\launchSettings.json" />
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -1,27 +0,0 @@
-{
-  "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/Properties/launchSettings.json

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

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

@@ -1,27 +0,0 @@
-{
-  "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.Serilog/Properties/launchSettings.json

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

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

@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:53900/",
-      "sslPort": 44362
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Volo.Abp.SignalR": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
-    }
-  }
-}

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

@@ -1,27 +0,0 @@
-{
-  "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/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "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.Caching.StackExchangeRedis/Volo/Abp/Caching/StackExchangeRedis/AbpRedisCache.cs

@@ -184,5 +184,15 @@ namespace Volo.Abp.Caching.StackExchangeRedis
 
             return tasks;
         }
+        
+        private IDatabase GetRedisDatabase()
+        {
+            if (_redisDatabase == null)
+            {
+                _redisDatabase = RedisDatabaseField.GetValue(this) as IDatabase;                
+            }
+
+            return _redisDatabase;
+        }
     }
 }

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

@@ -1,7 +0,0 @@
-{
-  "profiles": {
-    "Volo.Abp.Cli": {
-      "commandName": "Project"
-    }
-  }
-}

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

@@ -1,27 +0,0 @@
-{
-  "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/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "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/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "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/"
-    }
-  }
-}

modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json

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

modules/account/src/Volo.Abp.Account.Web.IdentityServer/Volo.Abp.Account.Web.IdentityServer.csproj

@@ -21,8 +21,6 @@
     <EmbeddedResource Include="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/account/src/Volo.Abp.Account.Web/Properties/launchSettings.json

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

modules/account/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj

@@ -25,8 +25,6 @@
     <Content Remove="Modules\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/blogging/src/Volo.Blogging.Admin.Web/Properties/launchSettings.json

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

modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj

@@ -28,7 +28,6 @@
         <Content Remove="Pages\**\*.js" />
         <Content Remove="Pages\**\*.css" />
         <Content Remove="compilerconfig.json" />
-        <Content Remove="Properties\launchSettings.json" />
     </ItemGroup>
 
 </Project>

modules/blogging/src/Volo.Blogging.Web/Properties/launchSettings.json

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

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj

@@ -28,9 +28,7 @@
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="compilerconfig.json" />
-    <Content Remove="Properties\launchSettings.json" />
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
 </Project>

modules/client-simulation/src/Volo.ClientSimulation.Web/Properties/launchSettings.json

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

modules/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj

@@ -27,9 +27,7 @@
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.scss" />
     <Content Remove="compilerconfig.json" />
-    <Content Remove="Properties\launchSettings.json" />
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
 </Project>

modules/docs/src/Volo.Docs.Admin.Web/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
-    "iisExpress": {
-      "applicationUrl": "http://localhost:51397",
-      "sslPort": 44346
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Volo.Docs.Admin.Web": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj

@@ -30,11 +30,9 @@
     <EmbeddedResource Include="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
-    <Content Remove="Properties\launchSettings.json" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />  
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
 </Project>

modules/docs/src/Volo.Docs.Web/Properties/launchSettings.json

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

modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

@@ -33,11 +33,9 @@
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Localization\Resources\**\*.json" />
-    <Content Remove="Properties\launchSettings.json" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
 </Project>

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Properties/launchSettings.json

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

modules/identity/src/Volo.Abp.Identity.AspNetCore/Properties/launchSettings.json

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

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Properties/launchSettings.json

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

modules/identity/src/Volo.Abp.Identity.HttpApi/Properties/launchSettings.json

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

modules/identity/src/Volo.Abp.Identity.Web/Properties/launchSettings.json

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

modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj

@@ -25,9 +25,7 @@
     <Content Remove="Pages\**\*.css" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
-    <Content Remove="Properties\launchSettings.json" />
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Properties/launchSettings.json

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

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Properties/launchSettings.json

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

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj

@@ -24,8 +24,6 @@
     <EmbeddedResource Include="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
 </Project>

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Properties/launchSettings.json

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

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj

@@ -19,9 +19,7 @@
     <Content Remove="Pages\**\*.css" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
-    <Content Remove="Properties\launchSettings.json" />
     <None Include="compilerconfig.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Volo.Abp.VirtualFileExplorer.Web.csproj

@@ -30,9 +30,4 @@
     <Content Remove="Localization\**\*.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
-  </ItemGroup>
-
 </Project>

npm/ng-packs/apps/dev-app/tsconfig.dev.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

npm/ng-packs/apps/dev-app/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": ["node", "jest"]

npm/ng-packs/package.json

@@ -32,35 +32,35 @@
     "@abp/ng.tenant-management": "~2.9.0",
     "@abp/ng.theme.basic": "~2.9.0",
     "@abp/ng.theme.shared": "~2.9.0",
-    "@abp/utils": "^2.9.0",
+    "@abp/utils": "^3.0.0-alpha.1",
     "@angular-builders/jest": "^9.0.1",
-    "@angular-devkit/build-angular": "~0.901.7",
+    "@angular-devkit/build-angular": "~0.1000.0",
-    "@angular-devkit/build-ng-packagr": "~0.901.7",
+    "@angular-devkit/build-ng-packagr": "~0.1000.0",
-    "@angular/animations": "~9.1.9",
+    "@angular/animations": "~10.0.0",
-    "@angular/cli": "~9.1.7",
+    "@angular/cli": "~10.0.0",
-    "@angular/common": "~9.1.9",
+    "@angular/common": "~10.0.0",
-    "@angular/compiler": "~9.1.9",
+    "@angular/compiler": "~10.0.0",
-    "@angular/compiler-cli": "~9.1.9",
+    "@angular/compiler-cli": "~10.0.0",
-    "@angular/core": "~9.1.9",
+    "@angular/core": "~10.0.0",
-    "@angular/forms": "~9.1.9",
+    "@angular/forms": "~10.0.0",
-    "@angular/language-service": "~9.1.9",
+    "@angular/language-service": "~10.0.0",
-    "@angular/localize": "~9.1.9",
+    "@angular/localize": "~10.0.0",
-    "@angular/platform-browser": "~9.1.9",
+    "@angular/platform-browser": "~10.0.0",
-    "@angular/platform-browser-dynamic": "~9.1.9",
+    "@angular/platform-browser-dynamic": "~10.0.0",
-    "@angular/router": "~9.1.9",
+    "@angular/router": "~10.0.0",
     "@fortawesome/fontawesome-free": "^5.13.0",
     "@ng-bootstrap/ng-bootstrap": "^6.1.0",
-    "@ngneat/spectator": "^4.5.0",
+    "@ngneat/spectator": "^5.11.0",
-    "@ngx-validate/core": "^0.0.8",
+    "@ngx-validate/core": "^0.0.9",
     "@ngxs/devtools-plugin": "^3.6.2",
     "@ngxs/logger-plugin": "^3.6.2",
     "@ngxs/router-plugin": "^3.6.2",
     "@ngxs/storage-plugin": "^3.6.2",
     "@ngxs/store": "^3.6.2",
-    "@swimlane/ngx-datatable": "^16.0.0",
+    "@swimlane/ngx-datatable": "^17.0.0",
     "@types/jest": "^25.2.3",
     "@types/node": "^12.11.1",
-    "angular-oauth2-oidc": "^8.0.4",
+    "angular-oauth2-oidc": "^9.2.2",
     "bootstrap": "^4.5.0",
     "chart.js": "^2.9.3",
     "codelyzer": "^5.1.2",
@@ -73,23 +73,23 @@
     "just-clone": "^3.1.0",
     "just-compare": "^1.3.0",
     "lerna": "^3.19.0",
-    "ng-packagr": "^9.1.5",
+    "ng-packagr": "^10.0.0",
     "ngxs-reset-plugin": "^1.3.0",
     "ngxs-schematic": "^1.1.9",
     "prettier": "^1.18.2",
-    "protractor": "~5.4.0",
+    "protractor": "~7.0.0",
     "rxjs": "~6.5.4",
     "snq": "^1.0.3",
     "symlink-manager": "^1.5.0",
     "ts-node": "~7.0.0",
-    "ts-toolbelt": "^6.3.6",
+    "ts-toolbelt": "^6.9.9",
-    "tsickle": "^0.37.0",
+    "tsickle": "^0.38.1",
-    "tslint": "~5.20.0",
+    "tslint": "~6.1.0",
-    "typescript": "~3.8.0",
+    "typescript": "~3.9.5",
     "zone.js": "~0.10.2"
   },
   "dependencies": {
-    "tslib": "^1.10.0"
+    "tslib": "^2.0.0"
   },
   "config": {
     "commitizen": {
@@ -99,4 +99,4 @@
   "resolutions": {
     "@ngx-validate/core": "^0.0.8"
   }
-}
+}

npm/ng-packs/packages/account/package.json

@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@abp/ng.theme.shared": "~2.9.0"
-  },
+  ,    "tslib": "^2.0.0"
+},
   "publishConfig": {
     "access": "public"
   }

npm/ng-packs/packages/core/package.json

@@ -8,15 +8,16 @@
   },
   "dependencies": {
     "@abp/utils": "^2.9.0",
-    "@angular/localize": "~9.1.9",
+    "@angular/localize": "~9.1.11",
     "@ngxs/router-plugin": "^3.6.2",
     "@ngxs/storage-plugin": "^3.6.2",
     "@ngxs/store": "^3.6.2",
-    "angular-oauth2-oidc": "^8.0.4",
+    "angular-oauth2-oidc": "^9.2.2",
     "just-clone": "^3.1.0",
     "just-compare": "^1.3.0",
     "snq": "^1.0.3",
-    "ts-toolbelt": "^6.3.6"
+    "ts-toolbelt": "^6.9.9",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/core/src/lib/services/auth.service.ts

@@ -20,14 +20,14 @@ export class AuthService {
     private oAuthService: OAuthService,
     private store: Store,
     @Optional() @Inject('ACCOUNT_OPTIONS') private options: any,
-  ) {}
+  ) {
-
-  login(username: string, password: string): Observable<any> {
-    const tenant = this.store.selectSnapshot(SessionState.getTenant);
-
     this.oAuthService.configure(
       this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig,
     );
+  }
+
+  login(username: string, password: string): Observable<any> {
+    const tenant = this.store.selectSnapshot(SessionState.getTenant);
 
     return from(this.oAuthService.loadDiscoveryDocument()).pipe(
       switchMap(() =>
@@ -63,7 +63,7 @@ export class AuthService {
       )
       .pipe(
         switchMap(() => {
-          this.oAuthService.logOut();
+          this.oAuthService.logOut(true);
           return this.store.dispatch(new GetAppConfiguration());
         }),
       );

npm/ng-packs/packages/core/src/lib/services/routes.service.ts

@@ -126,6 +126,7 @@ export abstract class AbstractTreeService<T extends object> {
   }
 }
 
+@Injectable()
 export abstract class AbstractNavTreeService<T extends ABP.Nav> extends AbstractTreeService<T>
   implements OnDestroy {
   readonly id = 'name';

npm/ng-packs/packages/feature-management/package.json

@@ -7,7 +7,8 @@
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/identity/package.json

@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@abp/ng.permission-management": "~2.9.0",
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@@ -102,109 +102,110 @@
     ></ng-template>
 
     <form *ngIf="form; else loaderRef" [formGroup]="form" (ngSubmit)="save()">
-      <ngb-tabset>
+      <ul ngbNav #nav="ngbNav" class="nav-tabs">
-        <ngb-tab [title]="'AbpIdentity::UserInformations' | abpLocalization">
+        <li ngbNavItem>
-          <ng-template ngbTabContent>
+          <a ngbNavLink>{{ 'AbpIdentity::UserInformations' | abpLocalization }}</a>
-            <div class="mt-2 fade-in-top">
+          <ng-template ngbNavContent>
-              <div class="form-group">
+            <div class="form-group">
-                <label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
+              <label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
-                ><span> * </span>
+              ><span> * </span>
-                <input
+              <input
-                  type="text"
+                type="text"
-                  id="user-name"
+                id="user-name"
-                  class="form-control"
+                class="form-control"
-                  formControlName="userName"
+                formControlName="userName"
-                  autofocus
+                autofocus
-                />
+              />
-              </div>
+            </div>
 
-              <div class="form-group">
+            <div class="form-group">
-                <label for="name">{{ 'AbpIdentity::DisplayName:Name' | abpLocalization }}</label>
+              <label for="name">{{ 'AbpIdentity::DisplayName:Name' | abpLocalization }}</label>
-                <input type="text" id="name" class="form-control" formControlName="name" />
+              <input type="text" id="name" class="form-control" formControlName="name" />
-              </div>
+            </div>
 
-              <div class="form-group">
+            <div class="form-group">
-                <label for="surname">{{
+              <label for="surname">{{
-                  'AbpIdentity::DisplayName:Surname' | abpLocalization
+                'AbpIdentity::DisplayName:Surname' | abpLocalization
-                }}</label>
+              }}</label>
-                <input type="text" id="surname" class="form-control" formControlName="surname" />
+              <input type="text" id="surname" class="form-control" formControlName="surname" />
-              </div>
+            </div>
 
-              <div class="form-group">
+            <div class="form-group">
-                <label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label
+              <label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label
-                ><span *ngIf="!selected.userName"> * </span>
+              ><span *ngIf="!selected.userName"> * </span>
-                <input
+              <input
-                  type="password"
+                type="password"
-                  id="password"
+                id="password"
-                  autocomplete="new-password"
+                autocomplete="new-password"
-                  class="form-control"
+                class="form-control"
-                  formControlName="password"
+                formControlName="password"
-                />
+              />
-              </div>
+            </div>
 
-              <div class="form-group">
+            <div class="form-group">
-                <label for="email">{{ 'AbpIdentity::EmailAddress' | abpLocalization }}</label
+              <label for="email">{{ 'AbpIdentity::EmailAddress' | abpLocalization }}</label
-                ><span> * </span>
+              ><span> * </span>
-                <input type="text" id="email" class="form-control" formControlName="email" />
+              <input type="text" id="email" class="form-control" formControlName="email" />
-              </div>
+            </div>
 
-              <div class="form-group">
+            <div class="form-group">
-                <label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label>
+              <label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label>
-                <input
+              <input
-                  type="text"
+                type="text"
-                  id="phone-number"
+                id="phone-number"
-                  class="form-control"
+                class="form-control"
-                  formControlName="phoneNumber"
+                formControlName="phoneNumber"
-                />
+              />
-              </div>
+            </div>
 
-              <div class="custom-checkbox custom-control mb-2">
+            <div class="custom-checkbox custom-control mb-2">
-                <input
+              <input
-                  type="checkbox"
+                type="checkbox"
-                  id="lockout-checkbox"
+                id="lockout-checkbox"
-                  class="custom-control-input"
+                class="custom-control-input"
-                  formControlName="lockoutEnabled"
+                formControlName="lockoutEnabled"
-                />
+              />
-                <label class="custom-control-label" for="lockout-checkbox">{{
+              <label class="custom-control-label" for="lockout-checkbox">{{
-                  'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization
+                'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization
-                }}</label>
+              }}</label>
-              </div>
+            </div>
 
-              <div class="custom-checkbox custom-control mb-2">
+            <div class="custom-checkbox custom-control mb-2">
-                <input
+              <input
-                  type="checkbox"
+                type="checkbox"
-                  id="two-factor-checkbox"
+                id="two-factor-checkbox"
-                  class="custom-control-input"
+                class="custom-control-input"
-                  formControlName="twoFactorEnabled"
+                formControlName="twoFactorEnabled"
-                />
+              />
-                <label class="custom-control-label" for="two-factor-checkbox">{{
+              <label class="custom-control-label" for="two-factor-checkbox">{{
-                  'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization
+                'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization
-                }}</label>
+              }}</label>
-              </div>
             </div>
           </ng-template>
-        </ngb-tab>
+        </li>
-        <ngb-tab [title]="'AbpIdentity::Roles' | abpLocalization">
+
-          <ng-template ngbTabContent>
+        <li ngbNavItem>
-            <div class="mt-2 fade-in-top">
+          <a ngbNavLink>{{ 'AbpIdentity::Roles' | abpLocalization }}</a>
-              <div
+          <ng-template ngbNavContent>
-                *ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn"
+            <div
-                class="custom-checkbox custom-control mb-2"
+              *ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn"
-              >
+              class="custom-checkbox custom-control mb-2"
-                <input
+            >
-                  type="checkbox"
+              <input
-                  class="custom-control-input"
+                type="checkbox"
-                  [attr.id]="'roles-' + i"
+                class="custom-control-input"
-                  [formControl]="roleGroup.controls[roles[i].name]"
+                [attr.id]="'roles-' + i"
-                />
+                [formControl]="roleGroup.controls[roles[i].name]"
-                <label class="custom-control-label" [attr.for]="'roles-' + i">{{
+              />
-                  roles[i].name
+              <label class="custom-control-label" [attr.for]="'roles-' + i">{{
-                }}</label>
+                roles[i].name
-              </div>
+              }}</label>
             </div>
           </ng-template>
-        </ngb-tab>
+        </li>
-      </ngb-tabset>
+      </ul>
+
+      <div class="mt-2 fade-in-top" [ngbNavOutlet]="nav"></div>
     </form>
   </ng-template>
 

npm/ng-packs/packages/identity/src/lib/identity.module.ts

@@ -2,7 +2,7 @@ import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
 import { PermissionManagementModule } from '@abp/ng.permission-management';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
-import { NgbDropdownModule, NgbTabsetModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDropdownModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
 import { NgxsModule } from '@ngxs/store';
 import { RolesComponent } from './components/roles/roles.component';
@@ -17,7 +17,7 @@ import { IdentityState } from './states/identity.state';
     NgxsModule.forFeature([IdentityState]),
     CoreModule,
     IdentityRoutingModule,
-    NgbTabsetModule,
+    NgbNavModule,
     ThemeSharedModule,
     NgbDropdownModule,
     PermissionManagementModule,

npm/ng-packs/packages/permission-management/package.json

@@ -7,7 +7,8 @@
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/setting-management/package.json

@@ -7,7 +7,8 @@
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/tenant-management/package.json

@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@abp/ng.feature-management": "~2.9.0",
-    "@abp/ng.theme.shared": "~2.9.0"
+    "@abp/ng.theme.shared": "~2.9.0",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/theme-basic/package.json

@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@abp/ng.theme.shared": "~2.9.0"
-  },
+  ,    "tslib": "^2.0.0"
+},
   "publishConfig": {
     "access": "public"
   }

npm/ng-packs/packages/theme-shared/package.json

@@ -8,12 +8,13 @@
   },
   "dependencies": {
     "@abp/ng.core": "~2.9.0",
-    "@fortawesome/fontawesome-free": "^5.13.0",
+    "@fortawesome/fontawesome-free": "^5.13.1",
     "@ng-bootstrap/ng-bootstrap": "^6.1.0",
-    "@ngx-validate/core": "^0.0.8",
+    "@ngx-validate/core": "^0.0.9",
-    "@swimlane/ngx-datatable": "^16.0.0",
+    "@swimlane/ngx-datatable": "^17.0.0",
     "bootstrap": "^4.5.0",
-    "chart.js": "^2.9.3"
+    "chart.js": "^2.9.3",
+    "tslib": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/tsconfig.base.json

@@ -0,0 +1,38 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2018", "dom"],
+    "types": ["jest"],
+    "paths": {
+      "@abp/ng.core": ["packages/core/src/public-api.ts"],
+      "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
+      "@abp/ng.theme.shared/extensions": ["packages/theme-shared/src/public-api.ts"],
+      "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
+      "@abp/ng.account": ["packages/account/src/public-api.ts"],
+      "@abp/ng.account/config": ["packages/account/config/src/public-api.ts"],
+      "@abp/ng.identity": ["packages/identity/src/public-api.ts"],
+      "@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"],
+      "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
+      "@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"],
+      "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
+      "@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"],
+      "@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
+      "@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"]
+    }
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}

npm/ng-packs/tsconfig.json

@@ -1,38 +1,41 @@
+/*
+  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
+  It is not intended to be used to perform a compilation.
+
+  To learn more about this file see: https://angular.io/config/solution-tsconfig.
+*/
 {
-  "compileOnSave": false,
+  "files": [],
-  "compilerOptions": {
+  "references": [
-    "baseUrl": "./",
+    {
-    "outDir": "./dist/out-tsc",
+      "path": "./packages/core/tsconfig.lib.json"
-    "sourceMap": true,
+    },
-    "declaration": false,
+    {
-    "downlevelIteration": true,
+      "path": "./packages/theme-shared/tsconfig.lib.json"
-    "experimentalDecorators": true,
+    },
-    "module": "esnext",
+    {
-    "moduleResolution": "node",
+      "path": "./packages/theme-basic/tsconfig.lib.json"
-    "importHelpers": true,
+    },
-    "target": "es2015",
+    {
-    "typeRoots": ["node_modules/@types"],
+      "path": "./packages/account/tsconfig.lib.json"
-    "lib": ["es2018", "dom"],
+    },
-    "types": ["jest"],
+    {
-    "paths": {
+      "path": "./packages/permission-management/tsconfig.lib.json"
-      "@abp/ng.core": ["packages/core/src/public-api.ts"],
+    },
-      "@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
+    {
-      "@abp/ng.theme.shared/extensions": ["packages/theme-shared/src/public-api.ts"],
+      "path": "./packages/identity/tsconfig.lib.json"
-      "@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
+    },
-      "@abp/ng.account": ["packages/account/src/public-api.ts"],
+    {
-      "@abp/ng.account/config": ["packages/account/config/src/public-api.ts"],
+      "path": "./packages/feature-management/tsconfig.lib.json"
-      "@abp/ng.identity": ["packages/identity/src/public-api.ts"],
+    },
-      "@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"],
+    {
-      "@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
+      "path": "./packages/tenant-management/tsconfig.lib.json"
-      "@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"],
+    },
-      "@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
+    {
-      "@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"],
+      "path": "./packages/setting-management/tsconfig.lib.json"
-      "@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
+    },
-      "@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"]
+    {
+      "path": "./apps/dev-app/tsconfig.dev.json"
     }
-  },
+  ]
-  "angularCompilerOptions": {
+}
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
-}

npm/ng-packs/tslint.json

@@ -2,16 +2,38 @@
   "extends": "tslint:recommended",
   "rulesDirectory": ["node_modules/codelyzer"],
   "rules": {
+    "align": {
+      "options": [
+        "parameters",
+        "statements"
+      ]
+    },
     "array-type": false,
     "contextual-lifecycle": true,
     "component-class-suffix": [true, "Component"],
     "directive-class-suffix": [true, "Directive"],
+    "eofline": true,
+    "import-spacing": true,
+    "indent": {
+      "options": [
+        "spaces"
+      ]
+    },
     "max-line-length": [true, 140],
     "no-consecutive-blank-lines": false,
     "no-redundant-jsdoc": true,
     "no-var-requires": false,
     "object-literal-key-quotes": [true, "as-needed"],
     "ordered-imports": false,
+    "space-before-function-paren": {
+      "options": {
+        "anonymous": "never",
+        "asyncArrow": "always",
+        "constructor": "never",
+        "method": "never",
+        "named": "never"
+      }
+    },
     "trailing-comma": false,
     "component-max-inline-declarations": [true, { "animations": 20, "styles": 20, "template": 20 }],
     "no-forward-ref": true,
@@ -21,6 +43,24 @@
     "no-unused-css": true,
     "prefer-output-readonly": true,
     "template-conditional-complexity": [true, 4],
+    "typedef-whitespace": {
+      "options": [
+        {
+          "call-signature": "nospace",
+          "index-signature": "nospace",
+          "parameter": "nospace",
+          "property-declaration": "nospace",
+          "variable-declaration": "nospace"
+        },
+        {
+          "call-signature": "onespace",
+          "index-signature": "onespace",
+          "parameter": "onespace",
+          "property-declaration": "onespace",
+          "variable-declaration": "onespace"
+        }
+      ]
+    },
     "use-component-selector": true,
     "max-classes-per-file": false,
     "arrow-parens": false,
@@ -96,5 +136,15 @@
     "use-pipe-transform-interface": true,
     "variable-name": false,
     "prefer-for-of": false
-  }
+  ,    "whitespace": {
+      "options": [
+        "check-branch",
+        "check-decl",
+        "check-operator",
+        "check-separator",
+        "check-type",
+        "check-typecast"
+      ]
+    }
+}
 }

npm/packs/uppy/abp.resourcemapping.js

@@ -0,0 +1,5 @@
+module.exports = {
+    mappings: {
+        "@node_modules/uppy/dist/*.*": "@libs/uppy/"
+    }
+}

npm/packs/uppy/package.json

@@ -0,0 +1,12 @@
+{
+  "version": "2.9.0",
+  "name": "@abp/uppy",
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@abp/core": "^2.9.0",
+    "uppy": "^1.16.1"
+  },
+  "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
+}

npm/packs/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/utils",
-  "version": "2.9.0",
+  "version": "3.0.0-alpha.1",
   "scripts": {
     "prepublish": "yarn install --ignore-scripts && node prepublish.js",
     "ng": "ng",
@@ -24,14 +24,14 @@
   "sideEffects": false,
   "devDependencies": {
     "@angular-builders/jest": "^9.0.0",
-    "@angular-devkit/build-ng-packagr": "~0.901.0",
+    "@angular-devkit/build-ng-packagr": "~0.1000.0",
-    "@angular/cli": "~9.1.0",
+    "@angular/cli": "~10.0.0",
-    "@angular/common": "^9.1.0",
+    "@angular/common": "^10.0.0",
-    "@angular/compiler": "~9.1.0",
+    "@angular/compiler": "~10.0.0",
-    "@angular/compiler-cli": "~9.1.0",
+    "@angular/compiler-cli": "~10.0.0",
-    "@angular/core": "~9.1.0",
+    "@angular/core": "~10.0.0",
-    "@angular/platform-browser": "^9.1.0",
+    "@angular/platform-browser": "^10.0.0",
-    "@angular/platform-browser-dynamic": "^9.1.0",
+    "@angular/platform-browser-dynamic": "^10.0.0",
     "@types/execa": "^2.0.0",
     "@types/fs-extra": "^8.1.0",
     "@types/jest": "^25.1.4",
@@ -41,17 +41,15 @@
     "fs-extra": "^9.0.0",
     "jest": "^25.2.4",
     "jest-preset-angular": "^8.1.2",
-    "ng-packagr": "^9.0.0",
+    "ng-packagr": "^10.0.0",
-    "protractor": "~5.4.3",
+    "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.6.0",
+    "typescript": "~3.9.5",
     "zone.js": "~0.10.2"
   },
-  "peerDependencies": {
+  "peerDependencies": {},
-    "tslib": "^1.10.0"
-  },
   "dependencies": {
     "just-compare": "^1.3.0"
   },

npm/packs/utils/projects/utils/tsconfig.lib.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",

npm/packs/utils/projects/utils/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,

npm/packs/utils/tsconfig.base.json

@@ -0,0 +1,24 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "strictBindCallApply": true,
+    "lib": ["es2018", "dom"],
+    "paths": {
+      "utils": ["dist/utils/utils", "dist/utils"]
+    }
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}

npm/packs/utils/tsconfig.json

@@ -1,24 +1,14 @@
+/*
+  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
+  It is not intended to be used to perform a compilation.
+
+  To learn more about this file see: https://angular.io/config/solution-tsconfig.
+*/
 {
-  "compileOnSave": false,
+  "files": [],
-  "compilerOptions": {
+  "references": [
-    "baseUrl": "./",
+    {
-    "outDir": "./dist/out-tsc",
+      "path": "./projects/utils/tsconfig.lib.json"
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "strictBindCallApply": true,
-    "lib": ["es2018", "dom"],
-    "paths": {
-      "utils": ["dist/utils/utils", "dist/utils"]
     }
-  },
+  ]
-  "angularCompilerOptions": {
+}
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
-}

samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagement.Web.csproj

@@ -15,8 +15,6 @@
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Localization\Resources\**\*.json" />
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
   </ItemGroup>
 
   <ItemGroup>

samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:56993/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "ProductManagement.Web": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:56994/"
-    }
-  }
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa

@@ -0,0 +1,13 @@
+{
+  "KeyId": "f788zGVUZh9H-HbWL1S-Mg",
+  "Parameters": {
+    "D": "F19hbC5PLO872DszGiJnVoU55ee7XGXmNf0KEKndJ/uGBv5lWklXA0QF80h1ytWXde0jV5isQPB1t7mPhRQlDoDTkywLi1CeOgBPbxzHEfLjZZ5c4olfeX0IJX9BDqgUntY0H1a/+Om/eDu4OZUz3EIJFFZBgz46YZSyTT6ZDvAEdpC/o66sNJmxvJIp+8zVoVDSqBUzxmc+oEamXLg7r2jdymxJMxau1kQFxEGLOrJnNxGsEe8UrYA3qSsm8m/Xg4uOh7RYgnuEEt88+KTvRq+CAMWhN3YNLtOJ3NmXowwE7e1Ma+jih9+UVfxZn14P5+SOJbQ2bYV2sCV+2vBiCQ==",
+    "DP": "oPiGO/qdOQfFEAS9fMInQnsrNylIZVpDYEVoDJ6/jQfE/IpuwxGcmsaGvCob3SKxZiJRLCWpwJYo1hCh/JOSVGWMkVyELky56nbbkkV5ymKLSGZ4JoetdQs+GchnPdR+k2P9Ij1Kjk13ylubN3htzNhcBASJpOfSEv5pPVzGKX0=",
+    "DQ": "z6imxLABHkyftbfUUtpeOlPanEHgpuIjmUdp3T1Ju1jziE63UEhuj0GPAXOF17uYxixwYE8JhOJ7+TyIK9oZeI3zH2OzJqQh8f5PCQ/E+0ULXZDeNV/ShDLCTufu3Fis9Rt64uTp/H/l21oMQ79jc0ysa8DTz1ReJLRc5qjL41U=",
+    "Exponent": "AQAB",
+    "InverseQ": "ieZcvSt5XYukKJKhXpv5Dm/1RD7iH88cZnhLSTEVTMoOUHoYWmApY5pNLGahbfjA9bxnkBWDYex/i7wE9uNNY5CsA6ovUaQLVJDt3kHvR9W+9QtN8D6jjG2TuRbbOdEg4RqhfjUaDfDIgTJX2Wxc8U98FOvOyGw1HzwUPFZKecM=",
+    "Modulus": "vk4z1Bmtmbo+gxITcY+FIlXzcO2wTOGlOXK5GMYj/6PUMFt7lbqkc72AkPsrAo5/JE8LYLhWj7fzSKbjvtowHCz5m2t+FlUYmuiKpvvnJsTqvQrckNlbZ1nm071q5PhP3Dar/OksfBhPtAX+c3+NjDnM/w53ccJJNaBDO/s9JYoN7vH5n6ed1pMSK71hmg4MPsxChcnc1f1PpnG2mqyJ253+GEUbj/kRyeBSmCCr9aadov2ZzxIKVaFNagJEHOzanQmorSLpP25GfOHCuy27Zkef94V/qU9elzjbH4uIKslVGx5T6H99TYh0sUGu11NytYJa5WNAZWow95CzurC2vw==",
+    "P": "4GMCQy+XTNzR5TsgFcdAZv2K6TcQR13fHVvPoxQp/b32V5YUJOBFEUAtqociy5ro4+KzpXP5WPSk1ZtznGKuNZyLq8gTnhpB3rwd0sdo4zxKnQ5nu+n1UhlhWNxg5A9V5TaciUAyPrHWJfLoYTQWygNTgJELQH5zZXi2ihC2uiU=",
+    "Q": "2R36pamnLAJggkPJxiW5qH6HizZ+bkQVg0BBftMLzkAM8Y9CwTW75GRUzGEJFpMckkw0GZSYb1Uwl3DVUpkcQ8LZ91IPYdPpDlYUshhIxl184M55pnO14besKxJtMZ64zhHKVAR2pBMO0n6W4/1iBXkkQqyPViJxdfvXPJMBbhM="
+  }
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs

@@ -26,6 +26,11 @@ namespace MyCompanyName.MyProjectName
         )]
     public class MyProjectNameDomainSharedModule : AbpModule
     {
+        public override void PreConfigureServices(ServiceConfigurationContext context)
+        {
+            MyProjectNameModulePropertyConfigurator.Configure();
+        }
+
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<AbpVirtualFileSystemOptions>(options =>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameModuleExtensionConfigurator.cs

@@ -0,0 +1,35 @@
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Identity;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.Threading;
+
+namespace MyCompanyName.MyProjectName
+{
+    public static class MyProjectNameModulePropertyConfigurator
+    {
+        private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
+
+        public static void Configure()
+        {
+            OneTimeRunner.Run(() =>
+            {
+                ConfigureExistingProperties();
+            });
+        }
+
+        private static void ConfigureExistingProperties()
+        {
+            /* You can change max lengths for properties of the
+             * entities defined in the modules used by your application.
+             *
+             * Example: Change user and role name max lengths
+             
+               IdentityUserConsts.MaxNameLength = 99;
+               IdentityRoleConsts.MaxNameLength = 99;
+             
+             * Notice: It is not suggested to change property lengths
+             * unless you really need it. Go with the standard values wherever possible.
+             */
+        }
+    }
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs

@@ -10,6 +10,8 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
 
         public static void Configure()
         {
+            MyProjectNameModulePropertyConfigurator.Configure();
+            
             OneTimeRunner.Run(() =>
             {
                 /* You can configure entity extension properties for the

templates/module/angular/package.json

@@ -5,49 +5,54 @@
     "ng": "ng",
     "start": "ng serve dev-app --open",
     "build": "ng build my-project-name --prod",
-    "build:app": "ng build dev-app --prod",
+    "build:app": "npm run symlink:copy -- --no-watch && ng build dev-app --prod",
+    "symlink:copy": "symlink copy --angular --packages @my-company-name/my-project-name --prod",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "compile:ivy": "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules --async false",
+    "postinstall": "npm run compile:ivy"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~9.1.11",
+    "@abp/ng.account": "~2.9.0",
-    "@angular/common": "~9.1.11",
+    "@abp/ng.identity": "~2.9.0",
-    "@angular/compiler": "~9.1.11",
+    "@abp/ng.setting-management": "~2.9.0",
-    "@angular/core": "~9.1.11",
+    "@abp/ng.tenant-management": "~2.9.0",
-    "@angular/forms": "~9.1.11",
+    "@abp/ng.theme.basic": "~2.9.0",
-    "@angular/platform-browser": "~9.1.11",
+    "@angular/animations": "~10.0.0",
-    "@angular/platform-browser-dynamic": "~9.1.11",
+    "@angular/common": "~10.0.0",
-    "@angular/router": "~9.1.11",
+    "@angular/compiler": "~10.0.0",
-    "@abp/ng.account": "~3.0.0",
+    "@angular/core": "~10.0.0",
-    "@abp/ng.identity": "~3.0.0",
+    "@angular/forms": "~10.0.0",
-    "@abp/ng.tenant-management": "~3.0.0",
+    "@angular/platform-browser": "~10.0.0",
-    "@abp/ng.setting-management": "~3.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@angular/router": "~10.0.0",
     "rxjs": "~6.5.4",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.9",
+    "@angular-devkit/build-angular": "~0.1000.0",
-    "@angular-devkit/build-ng-packagr": "~0.901.9",
+    "@angular-devkit/build-ng-packagr": "~0.1000.0",
-    "@angular/cli": "~9.1.9",
+    "@angular/cli": "~10.0.0",
-    "@angular/compiler-cli": "~9.1.11",
+    "@angular/compiler-cli": "~10.0.0",
-    "@types/node": "^12.11.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
+    "@types/node": "^12.11.1",
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~2.1.0",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~3.0.1",
+    "karma-jasmine": "~3.3.0",
-    "karma-jasmine-html-reporter": "^1.4.2",
+    "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^9.0.0",
+    "ng-packagr": "^10.0.0",
     "protractor": "~7.0.0",
+    "symlink-manager": "^1.5.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~3.9.5"
   }
-}
+}

templates/module/angular/projects/dev-app/e2e/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

templates/module/angular/projects/dev-app/src/app/app.module.ts

@@ -13,7 +13,7 @@ import { environment } from '../environments/environment';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { APP_ROUTE_PROVIDER } from './route.provider';
-import { SharedModule } from './shared/shared.module';
+import { ThemeBasicModule } from '@abp/ng.theme.basic';
 
 @NgModule({
   imports: [
@@ -32,7 +32,7 @@ import { SharedModule } from './shared/shared.module';
     TenantManagementConfigModule.forRoot(),
     SettingManagementConfigModule.forRoot(),
     NgxsModule.forRoot(),
-    SharedModule,
+    ThemeBasicModule.forRoot(),
   ],
   providers: [APP_ROUTE_PROVIDER],
   declarations: [AppComponent],

templates/module/angular/projects/dev-app/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

templates/module/angular/projects/dev-app/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

templates/module/angular/projects/my-project-name/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "my-project-name",
+  "name": "@my-company-name/my-project-name",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^9.1.11",
@@ -8,6 +8,6 @@
     "@abp/ng.theme.shared": ">=3.0.0"
   },
   "dependencies": {
-    "tslib": "^1.10.0"
+    "tslib": "^2.0.0"
-  }
+}
 }

templates/module/angular/projects/my-project-name/tsconfig.spec.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

templates/module/angular/tsconfig.base.json

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.prod.json",
+  "compilerOptions": {
+    "paths": {
+      "@my-company-name/my-project-name": [
+        "projects/my-project-name/src/public-api.ts"
+      ],
+      "@my-company-name/my-project-name/config": [
+        "projects/my-project-name/config/src/public-api.ts"
+      ]
+    }
+  }
+}

templates/module/angular/tsconfig.json

@@ -1,13 +1,23 @@
+/*
+  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
+  It is not intended to be used to perform a compilation.
+
+  To learn more about this file see: https://angular.io/config/solution-tsconfig.
+*/
 {
-  "extends": "./tsconfig.prod.json",
+  "files": [],
-  "compilerOptions": {
+  "references": [
-    "paths": {
+    {
-      "@my-company-name/my-project-name": [
+      "path": "./projects/my-project-name/tsconfig.lib.json"
-        "projects/my-project-name/src/public-api.ts"
+    },
-      ],
+    {
-      "@my-company-name/my-project-name/config": [
+      "path": "./projects/my-project-name/tsconfig.spec.json"
-        "projects/my-project-name/config/src/public-api.ts"
+    },
-      ]
+    {
+      "path": "./projects/dev-app/tsconfig.app.json"
+    },
+    {
+      "path": "./projects/dev-app/tsconfig.spec.json"
     }
-  }
+  ]
-}
+}

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -28,11 +28,6 @@
     <Content Remove="wwwroot\**\*.*" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Remove="Properties\launchSettings.json" />
-    <None Include="Properties\launchSettings.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json

@@ -1,27 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:56993/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "MyCompanyName.MyProjectName.Web": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:56994/"
-    }
-  }
-}