Skip to content

Commit eb3f4c6

Browse files
rxturrxtur
committed
Upgraded to .net 6.0
1 parent b255340 commit eb3f4c6

34 files changed

+70
-68
lines changed

‎src/Blogifier.Admin/Blogifier.Admin.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="Blazored.Typeahead" Version="4.6.0" />
77
<PackageReference Include="ChartJs.Blazor.Fork" Version="2.0.2" />
8-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.3" />
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.3" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.3" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.1" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
1111
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
12-
<PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.3" />
13-
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.1" />
13+
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
1414
<PackageReference Include="Sotsera.Blazor.Toaster" Version="3.0.0" />
1515
</ItemGroup>
1616
<ItemGroup>

‎src/Blogifier.Admin/Components/Customize/SettingsComponent.razor‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,35 @@
55
@if (Settings != null)
66
{
77
<div class="accordion accordion-flush" id="accordionFlushExample">
8-
@foreach (var section in Settings.Sections)
8+
@foreach (var item in Settings.Sections)
99
{
10+
var sec = item.Label.GetHashCode();
11+
1012
<div class="accordion-item">
11-
<h2 class="accordion-header" id="head-@section.Label.GetHashCode()">
12-
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#id-@section.Label.GetHashCode()" aria-expanded="false" aria-controls="id-@section.Label.GetHashCode()">
13-
@section.Label
13+
<h2 class="accordion-header" id="head-@sec">
14+
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#id-@sec" aria-expanded="false" aria-controls="id-@sec">
15+
@item.Label
1416
</button>
1517
</h2>
16-
<div id="id-@section.Label.GetHashCode()" class="accordion-collapse collapse" aria-labelledby="head-@section.Label.GetHashCode()" data-bs-parent="#accordionFlushExample">
18+
<div id="id-@sec" class="accordion-collapse collapse" aria-labelledby="head-@sec" data-bs-parent="#accordionFlushExample">
1719
<!-- Test if this -half is good for this section, theme developers may need full width -->
1820
<div class="accordion-body section-content -half">
19-
@foreach (var field in section.Fields)
21+
@foreach (var field in item.Fields)
2022
{
2123
<div class="form-item">
2224
@if (field.Type == "select")
2325
{
2426
<label class="form-label">@field.Label</label>
2527
<select class="form-select selectpicker" id="@field.Id" name="@field.Id">
26-
@foreach (var item in field.Options)
28+
@foreach (var opt in field.Options)
2729
{
28-
if (field.Value == item)
30+
if (field.Value == opt)
2931
{
30-
<option value="@item" selected>@item</option>
32+
<option value="@opt" selected>@opt</option>
3133
}
3234
else
3335
{
34-
<option value="@item">@item</option>
36+
<option value="@opt">@opt</option>
3537
}
3638
}
3739
</select>

‎src/Blogifier.Admin/Pages/Account/Login.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@inject NavigationManager _navigationManager
55
@inject IStringLocalizer<Resource> _localizer
66

7-
<PageTitle Title="@_localizer["login"]" />
7+
<BlogPageTitle Title="@_localizer["login"]" />
88

99
@if (showError)
1010
{

‎src/Blogifier.Admin/Pages/Account/LogoutView.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@inject NavigationManager _navigationManager
44
@inject IStringLocalizer<Resource> _localizer
55

6-
<PageTitle Title="@_localizer["logout"]" />
6+
<BlogPageTitle Title="@_localizer["logout"]" />
77

88
@code{
99
protected override async Task OnInitializedAsync()

‎src/Blogifier.Admin/Pages/Account/PasswordView.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@inject IStringLocalizer<Resource> _localizer
55
@inject IToaster _toaster
66

7-
<PageTitle Title="@_localizer["change-password"]" />
7+
<BlogPageTitle Title="@_localizer["change-password"]" />
88

99
<h1 class="section-title">@_localizer["change-password"]</h1>
1010
<div class="section-content -half">

‎src/Blogifier.Admin/Pages/Account/ProfileView.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@inject IStringLocalizer<Resource> _localizer
55
@inject IToaster _toaster
66

7-
<PageTitle Title="@_localizer["edit-profile"]" />
7+
<BlogPageTitle Title="@_localizer["edit-profile"]" />
88

99
<h1 class="section-title">@_localizer["edit-profile"]</h1>
1010
<div class="section-content -half">

‎src/Blogifier.Admin/Pages/Account/Register.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@inject NavigationManager _navigationManager
55
@inject IStringLocalizer<Resource> _localizer
66

7-
<PageTitle Title="@_localizer["register"]" />
7+
<BlogPageTitle Title="@_localizer["register"]" />
88

99
<div class="account-header">
1010
<h2 class="account-title text-lg-center">@_localizer["welcome-blogifier"]</h2>

‎src/Blogifier.Admin/Pages/Blog/CategoriesView.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@inject IToaster _toaster
88
@inject NavigationManager _navigation
99

10-
<PageTitle Title="@_localizer["categories"]" />
10+
<BlogPageTitle Title="@_localizer["categories"]" />
1111

1212
@if (!IsEdit)
1313
{

‎src/Blogifier.Admin/Pages/Blog/Editor.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@inject BlogStateProvider _stateprovider
88
@implements IDisposable
99

10-
<PageTitle Title="@_localizer["new-post"]" />
10+
<BlogPageTitle Title="@_localizer["new-post"]" />
1111

1212
@if (Post != null)
1313
{

‎src/Blogifier.Admin/Pages/Blog/ImportView.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@inject IToaster _toaster
66
@inject IJSRuntime JSRuntime
77

8-
<PageTitle Title="@_localizer["import"]" />
8+
<BlogPageTitle Title="@_localizer["import"]" />
99

1010
@if (Posts == null)
1111
{

0 commit comments

Comments
 (0)