Skip to content

Commit c293eda

Browse files
voloagentvoloagent
authored
Merge pull request #25271 from abpframework/auto-merge/rel-10-3/4500
Merge branch dev with rel-10.3
2 parents 9c56794 + 8f27d2a commit c293eda

14 files changed

Lines changed: 37 additions & 28 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
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="2.0.0" />
23-
<PackageVersion Include="Blazorise.Components" Version="2.0.0" />
24-
<PackageVersion Include="Blazorise.DataGrid" Version="2.0.0" />
25-
<PackageVersion Include="Blazorise.Snackbar" Version="2.0.0" />
22+
<PackageVersion Include="Blazorise" Version="2.0.4" />
23+
<PackageVersion Include="Blazorise.Components" Version="2.0.4" />
24+
<PackageVersion Include="Blazorise.DataGrid" Version="2.0.4" />
25+
<PackageVersion Include="Blazorise.Snackbar" Version="2.0.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" />

‎docs/en/package-version-changes.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
| Autofac.Extensions.DependencyInjection | 10.0.0 | 11.0.0 | #25190 |
1616
| Microsoft.Bcl.AsyncInterfaces | 10.0.2 | 10.0.4 | #25190 |
1717

18+
## 10.2.1
19+
20+
| Package | Old Version | New Version | PR |
21+
|---------|-------------|-------------|-----|
22+
| Blazorise | 2.0.0 | 2.0.4 | #25264 |
23+
| Blazorise.Components | 2.0.0 | 2.0.4 | #25264 |
24+
| Blazorise.DataGrid | 2.0.0 | 2.0.4 | #25264 |
25+
| Blazorise.Snackbar | 2.0.0 | 2.0.4 | #25264 |
26+
1827
## 10.2.0-rc.4
1928

2029
| Package | Old Version | New Version | PR |

‎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="2.0.0" />
12-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
11+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
12+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.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="2.0.0" />
12-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
11+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
12+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.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="2.0.0" />
13-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
12+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
13+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.4" />
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
1515
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
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="2.0.0" />
16-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
15+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
16+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.4" />
1717
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
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="2.0.0" />
18-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
17+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
18+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.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.2" />

‎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.2" />
18-
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
19-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
18+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
19+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.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="2.0.0" />
17-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
16+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
17+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.4" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
1919
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
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="2.0.0" />
17-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
16+
<PackageReference Include="Blazorise.Bootstrap5" Version="2.0.4" />
17+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.4" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
1919
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
2020
</ItemGroup>

0 commit comments

Comments
 (0)