Update Packages

Lan2Play · Dec 19, 2023 · 688310b · 688310b
1 parent 897a950
commit 688310b
Show file tree

Hide file tree

Showing 13 changed files with 175 additions and 110 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -95,6 +95,7 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
 dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
 dotnet_style_allow_multiple_blank_lines_experimental = true:silent
 dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_prefer_collection_expression = true:suggestion
 ###############################
 # C# Coding Conventions #
 ###############################
@@ -177,6 +178,15 @@ csharp_style_prefer_switch_expression = true:suggestion
 csharp_style_prefer_pattern_matching = true:silent
 csharp_style_prefer_not_pattern = true:suggestion
 csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+dotnet_diagnostic.SA1101.severity = none
+dotnet_diagnostic.SA1633.severity = none
+dotnet_diagnostic.SA1128.severity = none
+dotnet_diagnostic.SA1309.severity = none
+dotnet_diagnostic.SA1306.severity = none
+dotnet_diagnostic.SA1600.severity = none
+dotnet_diagnostic.SA1124.severity = none
 
 [**/Migrations/**/*.cs]
 dotnet_analyzer_diagnostic.severity = none
diff --git a/NetEvent/Client.Tests/NetEvent.Client.Tests.csproj b/NetEvent/Client.Tests/NetEvent.Client.Tests.csproj
@@ -1,23 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
 
  <IsPackable>false</IsPackable>
  <SonarQubeTestProject>false</SonarQubeTestProject>
- <CodeAnalysisRuleSet>..\..\.sonarlint\lan2play_custom.ruleset</CodeAnalysisRuleSet>
  <NoWarn>S109</NoWarn>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
- <PackageReference Include="xunit" Version="2.4.2" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+ <PackageReference Include="xunit" Version="2.6.3" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="coverlet.collector" Version="3.2.0">
+ <PackageReference Include="coverlet.collector" Version="6.0.0">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>

diff --git a/NetEvent/Client/NetEvent - Backup.Client.csproj b/NetEvent/Client/NetEvent - Backup.Client.csproj
@@ -0,0 +1,61 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+ <PropertyGroup>
+ <TargetFramework>net8.0</TargetFramework>
+ <Nullable>enable</Nullable>
+ <!--<ImplicitUsings>enable</ImplicitUsings>-->
+ <CodeAnalysisRuleSet>..\..\.sonarlint\lan2play_custom.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <BlazorLinkOnBuild Condition="'$(Configuration)'!='Release'">false</BlazorLinkOnBuild>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <Content Remove="bundleconfig.json" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <_ContentIncludedByDefault Remove="bundleconfig.json" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Include="bundleconfig.json" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" Version="7.0.2" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.2" />
+ <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.2" />
+ <PackageReference Include="MudBlazor" Version="6.1.7" />
+ <PackageReference Include="MudBlazor.ThemeManager" Version="1.0.7" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+ <PackageReference Include="Quick.AspNetCore.Components.Web.Extensions" Version="6.0.2" />
+ <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
+ <PackageReference Include="System.Reactive" Version="5.0.0" />
+ <PackageReference Include="TinyMCE" Version="6.3.1" />
+ <PackageReference Include="TinyMCE.Blazor" Version="1.0.4" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\Shared\NetEvent.Shared.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+ </ItemGroup>
+
+ <PropertyGroup>
+ <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+ </PropertyGroup>
+
+</Project>
diff --git a/NetEvent/Client/NetEvent.Client.csproj b/NetEvent/Client/NetEvent.Client.csproj
@@ -1,10 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  <!--<ImplicitUsings>enable</ImplicitUsings>-->
- <CodeAnalysisRuleSet>..\..\.sonarlint\lan2play_custom.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
 
  <PropertyGroup>
@@ -25,24 +24,24 @@
 
  <ItemGroup>
  <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" Version="7.0.2" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.2" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
  <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
- <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
- <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.2" />
- <PackageReference Include="MudBlazor" Version="6.1.7" />
- <PackageReference Include="MudBlazor.ThemeManager" Version="1.0.7" />
- <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
+ <PackageReference Include="MudBlazor" Version="6.11.2" />
+ <PackageReference Include="MudBlazor.ThemeManager" Version="1.0.8" />
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  <PackageReference Include="Quick.AspNetCore.Components.Web.Extensions" Version="6.0.2" />
  <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
- <PackageReference Include="System.Reactive" Version="5.0.0" />
- <PackageReference Include="TinyMCE" Version="6.3.1" />
+ <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+ <PackageReference Include="System.Reactive" Version="6.0.0" />
+ <PackageReference Include="TinyMCE" Version="6.8.2" />
  <PackageReference Include="TinyMCE.Blazor" Version="1.0.4" />
  </ItemGroup>
 

diff --git a/NetEvent/Client/Pages/Administration/SystemInfo.razor b/NetEvent/Client/Pages/Administration/SystemInfo.razor
@@ -15,7 +15,7 @@
  <MudTable Items="@_SystemInfos.Health" Dense="true" Hover="true" Bordered="false" Striped="true" Filter="new Func<SystemInfoHealthEntryDto,bool>(FilterFuncHealth1)"> 
  <ToolBarContent>
  <MudSpacer />
- <MudTextField @bind-Value="searchStringHealth" Placeholder="@Localize["Administration.Systeminfo.Health.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
+ <MudTextField @bind-Value="_SearchStringHealth" Placeholder="@Localize["Administration.Systeminfo.Health.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
  </ToolBarContent>
  <HeaderContent>
  <MudTh><MudTableSortLabel InitialDirection="SortDirection.Ascending" SortBy="new Func<SystemInfoHealthEntryDto, object>(x=>x.Component)">@Localize["Administration.Systeminfo.Health.Component"]</MudTableSortLabel></MudTh>
@@ -42,7 +42,7 @@
  <MudTable Items="@_SystemInfos.Versions" Dense="true" Hover="true" Bordered="false" Striped="true" Filter="new Func<SystemInfoVersionEntryDto,bool>(FilterFuncVersions1)"> 
  <ToolBarContent>
  <MudSpacer />
- <MudTextField @bind-Value="searchStringVersions" Placeholder="@Localize["Administration.Systeminfo.Versions.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
+ <MudTextField @bind-Value="_SearchStringVersions" Placeholder="@Localize["Administration.Systeminfo.Versions.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
  </ToolBarContent>
  <HeaderContent>
  <MudTh><MudTableSortLabel InitialDirection="SortDirection.Ascending" SortBy="new Func<SystemInfoVersionEntryDto, object>(x=>x.Component)">@Localize["Administration.Systeminfo.Versions.Component"]</MudTableSortLabel></MudTh>
@@ -58,7 +58,7 @@
  <MudTable Items="@_SystemInfos.Components" Dense="true" Hover="true" Bordered="false" Striped="true" Filter="new Func<SystemInfoComponentEntryDto,bool>(FilterFuncComponents)">
  <ToolBarContent>
  <MudSpacer />
- <MudTextField @bind-Value="searchStringComponents" Placeholder="@Localize["Administration.Systeminfo.Components.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
+ <MudTextField @bind-Value="_SearchStringComponents" Placeholder="@Localize["Administration.Systeminfo.Components.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
  </ToolBarContent>
  <HeaderContent>
  <MudTh><MudTableSortLabel InitialDirection="SortDirection.Ascending" SortBy="new Func<SystemInfoComponentEntryDto, object>(x=>x.Component)">@Localize["Administration.Systeminfo.Components.Component"]</MudTableSortLabel></MudTh>
@@ -74,7 +74,7 @@
  <MudTable Items="@_ClientComponents" Dense="true" Hover="true" Bordered="false" Striped="true" Filter="new Func<SystemInfoComponentEntryDto,bool>(FilterFuncComponentsClient)">
  <ToolBarContent>
  <MudSpacer />
- <MudTextField @bind-Value="searchStringClientComponents" Placeholder="@Localize["Administration.Systeminfo.ClientComponents.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
+ <MudTextField @bind-Value="_SearchStringClientComponents" Placeholder="@Localize["Administration.Systeminfo.ClientComponents.SearchPlaceholder"]" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Class="mt-0"></MudTextField> 
  </ToolBarContent>
  <HeaderContent>
  <MudTh><MudTableSortLabel InitialDirection="SortDirection.Ascending" SortBy="new Func<SystemInfoComponentEntryDto, object>(x=>x.Component)">@Localize["Administration.Systeminfo.ClientComponents.Component"]</MudTableSortLabel></MudTh>

diff --git a/NetEvent/Client/Pages/Administration/SystemInfo.razor.cs b/NetEvent/Client/Pages/Administration/SystemInfo.razor.cs
@@ -10,20 +10,20 @@ namespace NetEvent.Client.Pages.Administration
 {
  public partial class SystemInfo
  {
+ private readonly IList<SystemInfoComponentEntryDto> _ClientComponents = new List<SystemInfoComponentEntryDto>();
+ private readonly string _SearchStringComponents = string.Empty;
+ private readonly string _SearchStringClientComponents = string.Empty;
+ private readonly string _SearchStringVersions = string.Empty;
+ private readonly string _SearchStringHealth = string.Empty;
+ private SystemInfoDto _SystemInfos = new();
+
  #region Injects
 
  [Inject]
  private ISystemInfoDataService SystemInfoDataService { get; set; } = default!;
 
  #endregion
 
- private readonly IList<SystemInfoComponentEntryDto> _ClientComponents = new List<SystemInfoComponentEntryDto>();
- private SystemInfoDto _SystemInfos = new();
- private string searchStringComponents = string.Empty;
- private string searchStringClientComponents = string.Empty;
- private string searchStringVersions = string.Empty;
- private string searchStringHealth = string.Empty;
-
  protected override async Task OnInitializedAsync()
  {
  var cts = new CancellationTokenSource();
@@ -37,9 +37,9 @@ protected override async Task OnInitializedAsync()
  }
  }
 
- private bool FilterFuncComponents(SystemInfoComponentEntryDto systeminfocomponententry) => InternalFilterFuncComponents(systeminfocomponententry, searchStringComponents);
+ private bool FilterFuncComponents(SystemInfoComponentEntryDto systeminfocomponententry) => InternalFilterFuncComponents(systeminfocomponententry, _SearchStringComponents);
 
- private bool FilterFuncComponentsClient(SystemInfoComponentEntryDto systeminfocomponententry) => InternalFilterFuncComponents(systeminfocomponententry, searchStringClientComponents);
+ private bool FilterFuncComponentsClient(SystemInfoComponentEntryDto systeminfocomponententry) => InternalFilterFuncComponents(systeminfocomponententry, _SearchStringClientComponents);
 
  private static bool InternalFilterFuncComponents(SystemInfoComponentEntryDto systeminfocomponententry, string searchString)
  {
@@ -61,7 +61,7 @@ private static bool InternalFilterFuncComponents(SystemInfoComponentEntryDto sys
  return false;
  }
 
- private bool FilterFuncVersions1(SystemInfoVersionEntryDto systeminfoversionentry) => FilterFuncVersions(systeminfoversionentry, searchStringVersions);
+ private bool FilterFuncVersions1(SystemInfoVersionEntryDto systeminfoversionentry) => FilterFuncVersions(systeminfoversionentry, _SearchStringVersions);
 
  private static bool FilterFuncVersions(SystemInfoVersionEntryDto systeminfoversionentry, string searchString)
  {
@@ -83,7 +83,7 @@ private static bool FilterFuncVersions(SystemInfoVersionEntryDto systeminfoversi
  return false;
  }
 
- private bool FilterFuncHealth1(SystemInfoHealthEntryDto systeminfohealthentry) => FilterFuncHealth(systeminfohealthentry, searchStringHealth);
+ private bool FilterFuncHealth1(SystemInfoHealthEntryDto systeminfohealthentry) => FilterFuncHealth(systeminfohealthentry, _SearchStringHealth);
 
  private static bool FilterFuncHealth(SystemInfoHealthEntryDto systeminfohealthentry, string searchString)
  {