added configureawait, sealed, cleanup

fgsfds · Sep 26, 2024 · 89ca137 · 89ca137
1 parent 3b3b9f2
commit 89ca137
Show file tree

Hide file tree

Showing 52 changed files with 248 additions and 172 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -22,6 +22,7 @@
     <PackageVersion Include="SharpCompress" Version="0.38.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="xunit" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="AWSSDK.S3" Version="3.7.402.11" />

diff --git a/Web.Blazor/Components/AddonsList.razor b/Web.Blazor/Components/AddonsList.razor
@@ -33,7 +33,7 @@ else
                     }
 
                     <br />
-                    <div>@((MarkupString)@Markdown.ToHtml(addon.Description))</div>
+                    <div>@((MarkupString)@Markdown.ToHtml(addon.Description ?? string.Empty))</div>
                     <a href="@addon.DownloadUrl">Download</a>
                     <br />
                     <br />
@@ -44,7 +44,7 @@ else
                 {
                     <h4>@addon.Title</h4>
                     <br />
-                    <div>@((MarkupString)@Markdown.ToHtml(addon.Description))</div>
+                    <div>@((MarkupString)@Markdown.ToHtml(addon.Description ?? string.Empty))</div>
                     <a href="@addon.DownloadUrl">Download</a>
                     <br />
                     <br />
@@ -55,7 +55,7 @@ else
                 {
                     <h4>@addon.Title</h4>
                     <br />
-                    <div>@((MarkupString)@Markdown.ToHtml(addon.Description))</div>
+                    <div>@((MarkupString)@Markdown.ToHtml(addon.Description ?? string.Empty))</div>
                     <a href="@addon.DownloadUrl">Download</a>
                     <br />
                     <br />

diff --git a/Web.Blazor/Pages/Error.cshtml.cs b/Web.Blazor/Pages/Error.cshtml.cs
@@ -6,7 +6,7 @@ namespace Web.Blazor.Pages;
 
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 [IgnoreAntiforgeryToken]
-public class ErrorModel : PageModel
+public sealed class ErrorModel : PageModel
 {
     public string? RequestId { get; set; }
 

diff --git a/Web.Blazor/Program.cs b/Web.Blazor/Program.cs
@@ -6,7 +6,7 @@
 
 namespace Web.Blazor;
 
-public class Program
+public sealed class Program
 {
     public static void Main(string[] args)
     {

diff --git a/Web.Blazor/Web.Blazor.csproj b/Web.Blazor/Web.Blazor.csproj
@@ -9,6 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AddSealed">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Markdig" />
     <PackageReference Include="AWSSDK.S3" />
   </ItemGroup>

diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj
@@ -46,12 +46,17 @@
     </PackageReference>
     <PackageReference Include="Avalonia.Desktop" />
     <PackageReference Include="Avalonia.Diagnostics" />
+    <PackageReference Include="ConfigureAwaitAnalyzer">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" />
       <PackageReference Include="Avalonia" />
       <PackageReference Include="Avalonia.Controls.DataGrid" />
       <PackageReference Include="Avalonia.Themes.Fluent" />
       <PackageReference Include="CommunityToolkit.Mvvm" />
       <PackageReference Include="Markdown.Avalonia" />
+      <PackageReference Include="System.Private.Uri" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Avalonia.Desktop/Controls/MapsControl.axaml.cs b/src/Avalonia.Desktop/Controls/MapsControl.axaml.cs
@@ -59,7 +59,7 @@ private void CreateSkillsFlyout()
 
         foreach (var skill in skills)
         {
-            flyout.Items.Add(skill);
+            _ = flyout.Items.Add(skill);
         }
 
         _flyout = flyout;
@@ -176,7 +176,7 @@ private void AddContextMenuButtons()
 
                 foreach (var skill in skills)
                 {
-                    portButton.Items.Add(skill);
+                    _ = portButton.Items.Add(skill);
                 }
             }
             else
@@ -188,12 +188,12 @@ private void AddContextMenuButtons()
                 };
             }
 
-            MapsList.ContextMenu.Items.Add(portButton);
+            _ = MapsList.ContextMenu.Items.Add(portButton);
         }
 
         if (MapsList.ContextMenu.Items.Count > 0)
         {
-            MapsList.ContextMenu.Items.Add(new Separator());
+            _ = MapsList.ContextMenu.Items.Add(new Separator());
         }
 
         var deleteButton = new MenuItem()
@@ -205,7 +205,7 @@ private void AddContextMenuButtons()
                 )
         };
 
-        MapsList.ContextMenu.Items.Add(deleteButton);
+        _ = MapsList.ContextMenu.Items.Add(deleteButton);
     }
 
 
@@ -264,7 +264,7 @@ private BasePort GetPort(BasePort? port)
     {
         if (_flyout?.Target is not null)
         {
-            return ((Button)_flyout.Target!).CommandParameter as BasePort;
+            return ((Button)_flyout.Target!).CommandParameter as BasePort ?? ThrowHelper.Exception<BasePort>();
         }
         else if (port is not null)
         {
@@ -325,7 +325,7 @@ private void OnListBoxEmptySpaceClicked(object? sender, Input.PointerPressedEven
     {
         MapsList.SelectedItem = null;
         MapsList.Focusable = true;
-        MapsList.Focus();
+        _ = MapsList.Focus();
         MapsList.Focusable = false;
     }
 

diff --git a/src/Avalonia.Desktop/ViewModels/AboutViewModel.cs b/src/Avalonia.Desktop/ViewModels/AboutViewModel.cs
@@ -47,7 +47,7 @@ public sealed partial class AboutViewModel(AppUpdateInstaller updateInstaller) :
     [RelayCommand(CanExecute = (nameof(CheckForUpdatesCanExecute)))]
     private async Task CheckForUpdatesAsync()
     {
-        await CheckForUpdateAsync();
+        await CheckForUpdateAsync().ConfigureAwait(true);
     }
 
     private bool CheckForUpdatesCanExecute() => IsInProgress is false;
@@ -91,7 +91,7 @@ private async Task CheckForUpdateAsync()
         try
         {
             CheckForUpdatesButtonText = "Checking...";
-            updates = await _updateInstaller.CheckForUpdates(CurrentVersion);
+            updates = await _updateInstaller.CheckForUpdates(CurrentVersion).ConfigureAwait(true);
         }
         catch
         {

diff --git a/src/Avalonia.Desktop/ViewModels/CampaignsViewModel.cs b/src/Avalonia.Desktop/ViewModels/CampaignsViewModel.cs
@@ -113,7 +113,7 @@ public override IAddon? SelectedAddon
     /// </summary>
     private async Task UpdateAsync(bool createNew)
     {
-        await _installedAddonsProvider.CreateCache(createNew);
+        await _installedAddonsProvider.CreateCache(createNew).ConfigureAwait(true);
 
         OnPropertyChanged(nameof(CampaignsList));
     }
@@ -135,7 +135,7 @@ private async Task StartCampaignAsync(object? command)
 
         var args = port.GetStartGameArgs(Game, SelectedAddon, mods, _config.SkipIntro, _config.SkipStartup);
 
-        await StartPortAsync(SelectedAddon.Id, port.FullPathToExe, args);
+        await StartPortAsync(SelectedAddon.Id, port.FullPathToExe, args).ConfigureAwait(true);
     }
 
 
@@ -145,7 +145,7 @@ private async Task StartCampaignAsync(object? command)
     [RelayCommand]
     private void OpenFolder()
     {
-        Process.Start(new ProcessStartInfo
+        _ = Process.Start(new ProcessStartInfo
         {
             FileName = Game.CampaignsFolderPath,
             UseShellExecute = true,
@@ -159,7 +159,7 @@ private void OpenFolder()
     [RelayCommand]
     private async Task RefreshListAsync()
     {
-        await UpdateAsync(true);
+        await UpdateAsync(true).ConfigureAwait(true);
     }
 
 
@@ -190,6 +190,7 @@ private void DeleteCampaign()
     /// <summary>
     /// Start port with command line args
     /// </summary>
+    /// <param name="id">Campaign id</param>
     /// <param name="exe">Path to port exe</param>
     /// <param name="args">Command line arguments</param>
     private async Task StartPortAsync(string id, string exe, string args)
@@ -202,7 +203,7 @@ await Process.Start(new ProcessStartInfo
             UseShellExecute = true,
             Arguments = args,
             WorkingDirectory = Path.GetDirectoryName(exe)
-        })!.WaitForExitAsync();
+        })!.WaitForExitAsync().ConfigureAwait(true);
 
         sw.Stop();
         var time = sw.Elapsed;

diff --git a/src/Avalonia.Desktop/ViewModels/DevViewModel.cs b/src/Avalonia.Desktop/ViewModels/DevViewModel.cs
@@ -15,7 +15,6 @@
 using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;
 using SharpCompress.Common;
-using System;
 using System.Collections.Immutable;
 using System.Text;
 using System.Text.Json;
@@ -364,7 +363,7 @@ private async Task AddAddonAsync()
             return;
         }
 
-        var result = await _filesUploader.AddAddonToDatabaseAsync(files[0].Path.LocalPath);
+        var result = await _filesUploader.AddAddonToDatabaseAsync(files[0].Path.LocalPath).ConfigureAwait(true);
 
         if (result)
         {
@@ -800,7 +799,7 @@ private async Task UploadAddonAsync()
             return;
         }
 
-        var uploadResult = await _filesUploader.UploadFilesToFtpAsync(files[0].Path.LocalPath, CancellationToken.None);
+        var uploadResult = await _filesUploader.UploadFilesToFtpAsync(files[0].Path.LocalPath, CancellationToken.None).ConfigureAwait(true);
 
         if (uploadResult)
         {

diff --git a/src/Avalonia.Desktop/ViewModels/MapsViewModel.cs b/src/Avalonia.Desktop/ViewModels/MapsViewModel.cs
@@ -59,7 +59,7 @@ DownloadableAddonsProviderFactory _downloadableAddonsProviderFactory
     /// </summary>
     private async Task UpdateAsync(bool createNew)
     {
-        await _installedAddonsProvider.CreateCache(createNew);
+        await _installedAddonsProvider.CreateCache(createNew).ConfigureAwait(true);
 
         OnPropertyChanged(nameof(MapsList));
     }
@@ -135,7 +135,7 @@ private async Task StartMapAsync(object? command)
 
         var args = parameter.Item1.GetStartGameArgs(Game, SelectedAddon, mods, _config.SkipIntro, _config.SkipStartup, parameter.Item2);
 
-        await StartPortAsync(SelectedAddon.Id, parameter.Item1.FullPathToExe, args);
+        await StartPortAsync(SelectedAddon.Id, parameter.Item1.FullPathToExe, args).ConfigureAwait(true);
     }
 
 
@@ -145,7 +145,7 @@ private async Task StartMapAsync(object? command)
     [RelayCommand]
     private void OpenFolder()
     {
-        Process.Start(new ProcessStartInfo
+        _ = Process.Start(new ProcessStartInfo
         {
             FileName = Game.MapsFolderPath,
             UseShellExecute = true,
@@ -159,7 +159,7 @@ private void OpenFolder()
     [RelayCommand]
     private async Task RefreshListAsync()
     {
-        await UpdateAsync(true);
+        await UpdateAsync(true).ConfigureAwait(true);
     }
 
 
@@ -190,6 +190,7 @@ private void DeleteMap()
     /// <summary>
     /// Start port with command line args
     /// </summary>
+    /// <param name="id">Map id</param>
     /// <param name="exe">Path to port exe</param>
     /// <param name="args">Command line arguments</param>
     private async Task StartPortAsync(string id, string exe, string args)
@@ -202,7 +203,7 @@ await Process.Start(new ProcessStartInfo
             UseShellExecute = true,
             Arguments = args,
             WorkingDirectory = Path.GetDirectoryName(exe)
-        })!.WaitForExitAsync();
+        })!.WaitForExitAsync().ConfigureAwait(true);
 
         sw.Stop();
         var time = sw.Elapsed;

diff --git a/src/Avalonia.Desktop/ViewModels/ModsViewModel.cs b/src/Avalonia.Desktop/ViewModels/ModsViewModel.cs
@@ -1,5 +1,3 @@
-using Common.Client.API;
-using Common.Client.Config;
 using Common.Client.Providers;
 using Common.Enums;
 using Common.Helpers;
@@ -54,7 +52,7 @@ DownloadableAddonsProviderFactory _downloadableAddonsProviderFactory
     /// </summary>
     private async Task UpdateAsync(bool createNew)
     {
-        await _installedAddonsProvider.CreateCache(createNew);
+        await _installedAddonsProvider.CreateCache(createNew).ConfigureAwait(true);
 
         OnPropertyChanged(nameof(ModsList));
     }
@@ -98,7 +96,7 @@ public override IAddon? SelectedAddon
     [RelayCommand]
     private void OpenFolder()
     {
-        Process.Start(new ProcessStartInfo
+        _ = Process.Start(new ProcessStartInfo
         {
             FileName = Game.ModsFolderPath,
             UseShellExecute = true,
@@ -112,7 +110,7 @@ private void OpenFolder()
     [RelayCommand]
     private async Task RefreshListAsync()
     {
-        await UpdateAsync(true);
+        await UpdateAsync(true).ConfigureAwait(true);
     }
 
 

diff --git a/src/Avalonia.Desktop/ViewModels/PortViewModel.cs b/src/Avalonia.Desktop/ViewModels/PortViewModel.cs
@@ -140,7 +140,7 @@ out var newVersion
     /// </summary>
     public async Task InitializeAsync()
     {
-        _release = await _portsReleasesProvider.GetLatestReleaseAsync(_port.PortEnum);
+        _release = await _portsReleasesProvider.GetLatestReleaseAsync(_port.PortEnum).ConfigureAwait(true);
 
         OnPropertyChanged(nameof(LatestVersion));
         OnPropertyChanged(nameof(InstallButtonText));
@@ -165,7 +165,7 @@ private async Task InstallAsync()
             ProgressBarValue = 0;
             OnPropertyChanged(nameof(ProgressBarValue));
 
-            await installer.InstallAsync(_port);
+            await installer.InstallAsync(_port).ConfigureAwait(true);
 
             installer.Progress.ProgressChanged -= OnProgressChanged;
             ProgressBarValue = 0;

diff --git a/src/Avalonia.Desktop/ViewModels/RightPanelViewModel.cs b/src/Avalonia.Desktop/ViewModels/RightPanelViewModel.cs
@@ -1,5 +1,3 @@
-using Common.Client.API;
-using Common.Client.Config;
 using Common.Client.Providers;
 using Common.Enums;
 using Common.Helpers;

diff --git a/src/Avalonia.Desktop/ViewModels/ToolViewModel.cs b/src/Avalonia.Desktop/ViewModels/ToolViewModel.cs
@@ -111,7 +111,7 @@ public string InstallButtonText
     /// </summary>
     public async Task InitializeAsync()
     {
-        _release = await _toolsReleasesProvider.GetLatestReleaseAsync(_tool);
+        _release = await _toolsReleasesProvider.GetLatestReleaseAsync(_tool).ConfigureAwait(true);
 
         OnPropertyChanged(nameof(LatestVersion));
         OnPropertyChanged(nameof(InstallButtonText));
@@ -130,7 +130,7 @@ private async Task InstallAsync()
         ProgressBarValue = 0;
         OnPropertyChanged(nameof(ProgressBarValue));
 
-        await installer.InstallAsync(_tool);
+        await installer.InstallAsync(_tool).ConfigureAwait(true);
 
         installer.Progress.ProgressChanged -= OnProgressChanged;
         ProgressBarValue = 0;
@@ -151,7 +151,7 @@ private async Task CheckUpdateAsync()
     {
         IsInProgress = true;
 
-        _release = await _toolsReleasesProvider.GetLatestReleaseAsync(_tool);
+        _release = await _toolsReleasesProvider.GetLatestReleaseAsync(_tool).ConfigureAwait(true);
 
         OnPropertyChanged(nameof(LatestVersion));
         OnPropertyChanged(nameof(InstallButtonText));
@@ -169,7 +169,7 @@ public void Start()
     {
         var args = _tool.GetStartToolArgs();
 
-        Process.Start(new ProcessStartInfo
+        _ = Process.Start(new ProcessStartInfo
         {
             FileName = _tool.FullPathToExe,
             UseShellExecute = true,