Revisit project dependencies

6 years ago · 36fd83c3fd
18 changed files with 61 additions and 97 deletions
--- a/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/AbpAspNetCoreComponentsUiBasicThemeServerModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/AbpAspNetCoreComponentsUiBasicThemeServerModule.cs
@ -4,13 +4,16 @@ using Volo.Abp.Modularity;

 namespace Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server
 {
-    public class AbpAspNetCoreComponentsServerBasicTheme : AbpModule
+    [DependsOn(
+        typeof(AbpAspNetCoreComponentsUiBasicThemeModule)
+        )]
+    public class AbpAspNetCoreComponentsUiBasicThemeServerModule : AbpModule
    {
        public override void ConfigureServices(ServiceConfigurationContext context)
        {
            Configure<AbpRouterOptions>(options =>
            {
-                options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsServerBasicTheme).Assembly);
+                options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsUiBasicThemeServerModule).Assembly);
            });

            Configure<AbpToolbarOptions>(options =>
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
@ -1,11 +1,11 @@
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AspNetCore.Components.UI.Theming;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;

 namespace Volo.Abp.FeatureManagement.Blazor
 {
    [DependsOn(
-        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpAspNetCoreComponentsUiThemingModule),
        typeof(AbpAutoMapperModule),
        typeof(AbpFeatureManagementHttpApiClientModule)
    )]
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
    </ItemGroup>

--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/_Imports.razor
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/_Imports.razor
@ -1,5 +1,4 @@
-@using Microsoft.AspNetCore.Components.Web
-@using Volo.Abp.AspNetCore.Components.WebAssembly
+@using Microsoft.AspNetCore.Components.Web
@using Volo.Abp.BlazoriseUI
@using Blazorise
@using Blazorise.DataGrid
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs
@ -39,6 +39,11 @@ namespace Volo.Abp.Identity

        public virtual async Task<PagedResultDto<IdentityRoleDto>> GetListAsync(GetIdentityRolesInput input)
        {
+            if (input.Sorting.IsNullOrWhiteSpace())
+            {
+                input.Sorting = nameof(IdentityRole.Name);
+            }
+            
            var list = await RoleRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
            var totalCount = await RoleRepository.GetCountAsync(input.Filter);

--- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
@ -9,7 +9,7 @@ using Volo.Abp.UI.Navigation;
 namespace Volo.Abp.Identity.Blazor
 {
    [DependsOn(
-        typeof(AbpIdentityHttpApiClientModule),
+        typeof(AbpIdentityApplicationContractsModule),
        typeof(AbpAutoMapperModule),
        typeof(AbpPermissionManagementBlazorModule),
        typeof(AbpBlazoriseUIModule)
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
@ -13,7 +13,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
  </ItemGroup>

 </Project>
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs
@ -1,11 +1,11 @@
-using Volo.Abp.AspNetCore.Components.UI.Theming.WebAssembly;
+using Volo.Abp.AspNetCore.Components.UI.Theming;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;

 namespace Volo.Abp.PermissionManagement.Blazor
 {
    [DependsOn(
-        typeof( AbpAspNetCoreComponentsWebAssemblyThemingModule ),
+        typeof(AbpAspNetCoreComponentsUiThemingModule),
        typeof(AbpAutoMapperModule),
        typeof(AbpPermissionManagementHttpApiClientModule)
        )]
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj
@ -8,10 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI\Volo.Abp.AspNetCore.Components.UI.csproj" />
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme.WebAssembly\Volo.Abp.AspNetCore.Components.UI.BasicTheme.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming.WebAssembly\Volo.Abp.AspNetCore.Components.UI.Theming.WebAssembly.csproj" />
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
  </ItemGroup>

--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.FeatureManagement.Blazor;
 using Volo.Abp.Modularity;
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
@ -9,7 +9,6 @@

  <ItemGroup>
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
  </ItemGroup>

  <ItemGroup>
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor
@ -1,5 +1,4 @@
@using Microsoft.AspNetCore.Components.Web
-@using Volo.Abp.AspNetCore.Components.WebAssembly
@using Microsoft.AspNetCore.Components.Forms
@using Volo.Abp.BlazoriseUI
@using Volo.Abp.BlazoriseUI.Components
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@ -7,30 +7,39 @@
  <ItemGroup>
    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3-preview8" />
    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3-preview8" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
    <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
    <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj" />
-    <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.BlazoriseUI\Volo.Abp.BlazoriseUI.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme\Volo.Abp.AspNetCore.Components.UI.BasicTheme.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
-    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.JwtBearer\Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj" />
-    
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj" />
    <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.IdentityServer\Volo.Abp.Account.Web.IdentityServer.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Application.Contracts\Volo.Abp.Account.Application.Contracts.csproj" />
    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor\Volo.Abp.Identity.Blazor.csproj" />
    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor\Volo.Abp.TenantManagement.Blazor.csproj" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+    <Compile Remove="Logs\**" />
+    <Content Remove="Logs\**" />
+    <EmbeddedResource Remove="Logs\**" />
+    <None Remove="Logs\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Pages\**\*.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Pages\**\*.css">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
  </ItemGroup>
  
 </Project>
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
@ -16,7 +16,6 @@ using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
-using Volo.Abp.AspNetCore.Components.UI.BasicTheme;
 using Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server;
 using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
 using Volo.Abp.AspNetCore.Components.UI.Theming.Toolbars;
@ -29,12 +28,13 @@ using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.BlazoriseUI;
 using Volo.Abp.Identity.Blazor;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.Swashbuckle;
 using Volo.Abp.TenantManagement.Blazor;
 using Volo.Abp.UI;
 using Volo.Abp.UI.Navigation;
@ -45,18 +45,17 @@ namespace MyCompanyName.MyProjectName.Blazor.Server
 {
    [DependsOn(
        typeof(MyProjectNameApplicationModule),
-        typeof(AbpAutofacModule),
-        typeof(AbpAspNetCoreMvcModule),
-        typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-        typeof(AbpBlazoriseUIModule),
-        typeof(AbpAspNetCoreComponentsUiBasicThemeModule),
-        typeof(AbpIdentityBlazorModule),
-        typeof(AbpTenantManagementBlazorModule),
-        typeof(AbpAccountWebIdentityServerModule),
-        typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
        typeof(MyProjectNameEntityFrameworkCoreDbMigrationsModule),
        typeof(MyProjectNameHttpApiModule),
-        typeof(MyProjectNameHttpApiClientModule)
+        typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+        typeof(AbpAutofacModule),
+        typeof(AbpSwashbuckleModule),
+        typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
+        typeof(AbpAspNetCoreSerilogModule), 
+        typeof(AbpAccountWebIdentityServerModule),
+        typeof(AbpAspNetCoreComponentsUiBasicThemeServerModule),
+        typeof(AbpIdentityBlazorModule),
+        typeof(AbpTenantManagementBlazorModule)
       )]
    public class MyProjectNameBlazorServerModule : AbpModule
    {
@ -121,16 +120,18 @@ namespace MyCompanyName.MyProjectName.Blazor.Server

        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
        {
-            context.Services.AddOidcAuthentication(options =>
-            {
-                configuration.Bind("AuthServer", options.ProviderOptions);
-                options.UserOptions.RoleClaim = JwtClaimTypes.Role;
-                options.ProviderOptions.DefaultScopes.Add("MyProjectName");
-                options.ProviderOptions.DefaultScopes.Add("role");
-                options.ProviderOptions.DefaultScopes.Add("email");
-                options.ProviderOptions.DefaultScopes.Add("phone");
-            });
+            // context.Services.AddOidcAuthentication(options =>
+            // {
+            //     configuration.Bind("AuthServer", options.ProviderOptions);
+            //     options.UserOptions.RoleClaim = JwtClaimTypes.Role;
+            //     options.ProviderOptions.DefaultScopes.Add("MyProjectName");
+            //     options.ProviderOptions.DefaultScopes.Add("role");
+            //     options.ProviderOptions.DefaultScopes.Add("email");
+            //     options.ProviderOptions.DefaultScopes.Add("phone");
+            // });

+            
+            
            context.Services.AddAuthentication()
                .AddJwtBearer(options =>
                {
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor
@ -6,7 +6,6 @@
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
-@using Volo.Abp.AspNetCore.Components.WebAssembly
@using MyCompanyName.MyProjectName.Blazor.Server
@using Blazorise
@using Blazorise.DataGrid
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/global-styles.css
@ -0,0 +1 @@
+/* Your Global Styles */
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/main.css
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/wwwroot/main.css
@ -1,48 +0,0 @@
-.spinner {
-    width: 40px;
-    height: 40px;
-    display: block;
-    position: fixed;
-    top: calc( 50% - ( 40px / 2) );
-    right: calc( 50% - ( 40px / 2) );
-}
-
-.double-bounce1, .double-bounce2 {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: #333;
-    opacity: 0.6;
-    position: absolute;
-    top: 0;
-    left: 0;
-    -webkit-animation: sk-bounce 2.0s infinite ease-in-out;
-    animation: sk-bounce 2.0s infinite ease-in-out;
-}
-
-.double-bounce2 {
-    -webkit-animation-delay: -1.0s;
-    animation-delay: -1.0s;
-}
-
-@-webkit-keyframes sk-bounce {
-    0%, 100% {
-        -webkit-transform: scale(0.0)
-    }
-
-    50% {
-        -webkit-transform: scale(1.0)
-    }
-}
-
-@keyframes sk-bounce {
-    0%, 100% {
-        transform: scale(0.0);
-        -webkit-transform: scale(0.0);
-    }
-
-    50% {
-        transform: scale(1.0);
-        -webkit-transform: scale(1.0);
-    }
-}
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
@ -1,6 +1,6 @@
 {
  "ConnectionStrings": {
-    "Default": "Server=localhost;Database=BookStore;Trusted_Connection=True"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True"
  },
  "IdentityServer": {
    "Clients": {