Browse Source
Merge branch 'dev' into auto-merge/rel-5-3/1090
pull/12698/head
maliming
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
28 additions and
13 deletions
docs/en/Themes/LeptonXLite/blazor.md
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs
modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj
modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj
modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj
modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/_Imports.razor
@ -18,9 +18,10 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo
{{if UI == "Blazor"}}
- Complete the [MVC Razor Pages Installation ](mvc.md#installation ) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **IdentityServer**_ .
- Add **Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme** package to your **Blazor WebAssembly** application.
- Add **Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme** package to your **Blazor WebAssembly** application with the following command:
```bash
dotnet add package Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme
dotnet add package Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme --prerelease
```
- Remove **Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme** reference from the project since it's not necessary after switching to LeptonX Lite.
@ -53,9 +54,10 @@ builder.RootComponents.Add<App>("#ApplicationContainer");
- Complete the [MVC Razor Pages Installation ](mvc.md#installation ) first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and **IdentityServer**_ .
- Add **Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme** package to your **Blazor server** application.
- Add **Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme** package to your **Blazor server** application with the following command:
```bash
dotnet add package Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme
dotnet add package Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme --prerelease
```
- Remove **Volo.Abp.AspNetCore.Components.Server.BasicTheme** reference from the project since it's not necessary after switching to LeptonX Lite.
@ -36,14 +36,14 @@ public abstract class ProjectCreationCommandBase
ICmdHelper cmdHelper ,
IInstallLibsService installLibsService ,
AngularPwaSupportAdder angularPwaSupportAdder ,
InitialMigrationCreator ı nitialMigrationCreator )
InitialMigrationCreator i nitialMigrationCreator)
{
ConnectionStringProvider = connectionStringProvider ;
SolutionPackageVersionFinder = solutionPackageVersionFinder ;
CmdHelper = cmdHelper ;
InstallLibsService = installLibsService ;
AngularPwaSupportAdder = angularPwaSupportAdder ;
InitialMigrationCreator = ı nitialMigrationCreator ;
InitialMigrationCreator = i nitialMigrationCreator;
Logger = NullLogger < NewCommand > . Instance ;
}
@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3 " />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5 " />
</ItemGroup>
</Project>
@ -8,9 +8,9 @@
<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.3 "/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.3 " PrivateAssets="all"/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.3 "/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5 "/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5 " PrivateAssets="all"/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.5 "/>
</ItemGroup>
</Project>
@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.3 " />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5 " />
</ItemGroup>
</Project>
@ -67,8 +67,8 @@
<ItemGroup>
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.1.1" />
<PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3 " />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0 ">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5 " />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5 ">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>
@ -0,0 +1,13 @@
@using System.Net.Http
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Components.Authorization
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
@using MyCompanyName.MyProjectName.Blazor.Server
@using Blazorise
@using Blazorise.DataGrid
@using Volo.Abp.BlazoriseUI
@using Volo.Abp.BlazoriseUI.Components