tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #21288 from abpframework/auto-merge/rel-9-0/3171 

Merge branch dev with rel-9.0
pull/21305/head
maliming 2 years ago
committed by GitHub
parent
f2ef2914d8 106d2ab115
commit
1c3e3ea239
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
12 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
  2. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
  3. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
  4. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
  5. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
  6. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
  7. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
  8. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
  9. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
  10. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
  11. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
  12. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
</ItemGroup>

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
</ItemGroup>

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
View File

@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.24474.3" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
View File

@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.24474.3" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
View File

@ -14,8 +14,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0-rc.2.24474.3" />

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
View File

@ -15,8 +15,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.24474.3" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.24474.3" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
View File

@ -16,8 +16,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0-rc.2.24474.3" />

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
View File

@ -16,8 +16,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
</ItemGroup>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
View File

@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.24474.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.24474.3" />
</ItemGroup>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.1.0" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-rc.2.24474.1" />

Write Preview
Loading…
Cancel
Save