Browse Source
Merge pull request #11903 from abpframework/auto-merge/rel-5-2/922
Merge branch dev with rel-5.2
pull/11917/head
maliming
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with
18 additions and
18 deletions
-
framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
-
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
-
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
-
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
-
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
-
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
-
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
-
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
|
|
|
@ -14,10 +14,10 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.DataGrid" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Snackbar" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Components" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.DataGrid" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Snackbar" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Components" Version="1.0.1" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -7,8 +7,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -7,8 +7,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -13,8 +13,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" /> |
|
|
|
|
|
|
|
@ -13,8 +13,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -8,8 +8,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -8,8 +8,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -12,8 +12,8 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.0" /> |
|
|
|
<PackageReference Include="Blazorise.Bootstrap5" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.1" /> |
|
|
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" /> |
|
|
|
|