Skip to content

Commit 721fba9

Browse files
malimingmaliming
authored
Merge pull request #23925 from abpframework/auto-merge/rel-10-0/4035
Merge branch dev with rel-10.0
2 parents 121b21f + ee9ed05 commit 721fba9

File tree

13 files changed

+28
-28
lines changed

13 files changed

+28
-28
lines changed

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<PackageVersion Include="BunnyCDN.Net.Storage" Version="1.0.4" />
2020
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
2121
<PackageVersion Include="Azure.Storage.Blobs" Version="12.25.0" />
22-
<PackageVersion Include="Blazorise" Version="1.8.3" />
23-
<PackageVersion Include="Blazorise.Components" Version="1.8.3" />
24-
<PackageVersion Include="Blazorise.DataGrid" Version="1.8.3" />
25-
<PackageVersion Include="Blazorise.Snackbar" Version="1.8.3" />
22+
<PackageVersion Include="Blazorise" Version="1.8.4" />
23+
<PackageVersion Include="Blazorise.Components" Version="1.8.4" />
24+
<PackageVersion Include="Blazorise.DataGrid" Version="1.8.4" />
25+
<PackageVersion Include="Blazorise.Snackbar" Version="1.8.4" />
2626
<PackageVersion Include="Castle.Core" Version="5.2.1" />
2727
<PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
2828
<PackageVersion Include="CommonMark.NET" Version="0.15.1" />

‎templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
12-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
11+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
12+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1313
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1414
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
1515
</ItemGroup>

‎templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
12-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
11+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
12+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1313
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1414
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
1515
</ItemGroup>

‎templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
13-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
12+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
13+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.*" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.*" />
1616
</ItemGroup>

‎templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
16-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
15+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
16+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1717
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.*" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.*" />
1919
</ItemGroup>

‎templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
18-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
17+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
18+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1919
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
2020
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
2121
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.0-rc.*" />

‎templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-rc.*" />
18-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
19-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
18+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
19+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
2020
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
2121
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
2222
</ItemGroup>

‎templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
17-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
16+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
17+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.*" />
1919
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.*" />
2020
</ItemGroup>

‎templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
17-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
16+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
17+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.*" />
1919
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0-rc.*" />
2020
</ItemGroup>

‎templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-rc.*" />
19-
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.3" />
20-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.3" />
19+
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.4" />
20+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.4" />
2121
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
2222
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
2323
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.0-rc.*" />

0 commit comments

Comments
 (0)