Cleanup

.editorconfig

@@ -1380,3 +1380,4 @@ csharp_style_prefer_switch_expression = true:warning
 csharp_style_prefer_pattern_matching = true:warning
 csharp_style_prefer_not_pattern = true:warning
 csharp_style_prefer_extended_property_pattern = true:warning
+dotnet_diagnostic.SA1010.severity = warning

.github/workflows/dotnet.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@main
       with:
-        dotnet-version: '7.x.x'
+        dotnet-version: '8.x.x'
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@main
       with:
@@ -32,17 +32,11 @@ jobs:
         dotnet publish CipherPunk.UI/CipherPunk.UI.csproj --configuration Release --no-self-contained --framework net7.0-windows --runtime win-arm64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
     - name: Zip
       run: |
-        7z a -r ${{ format('CipherPunk-v{0}-net7.0-windows-x86.zip', env.GitVersion_SemVer) }} ./CipherPunk.UI/bin/Release/net7.0-windows/win-x86/publish/*.*
-        7z a -r ${{ format('CipherPunk-v{0}-net7.0-windows-x64.zip', env.GitVersion_SemVer) }} ./CipherPunk.UI/bin/Release/net7.0-windows/win-x64/publish/*.*
-        7z a -r ${{ format('CipherPunk-v{0}-net7.0-windows-ARM64.zip', env.GitVersion_SemVer) }} ./CipherPunk.UI/bin/Release/net7.0-windows/win-arm64/publish/*.*
-    - name: Prerelease
-      if: ${{ env.GitVersion_PreReleaseTag != '' }}
-      run: gh release create ${{ format('v{0}', env.GitVersion_SemVer) }} (get-item *.zip) --generate-notes --target ${{ github.sha }} --prerelease
-      env:
-        GH_TOKEN: ${{ github.token }}
+        7z a -r "${{ format('CipherPunk-v{0}-net7.0-windows-x86.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net7.0-windows/win-x86/publish/*.*" "-x!*.xml"
+        7z a -r "${{ format('CipherPunk-v{0}-net7.0-windows-x64.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net7.0-windows/win-x64/publish" "-x!*.xml"
+        7z a -r "${{ format('CipherPunk-v{0}-net7.0-windows-ARM64.zip', env.GitVersion_SemVer) }}" "./CipherPunk.UI/bin/Release/net7.0-windows/win-arm64/publish/*.*" "-x!*.xml"
     - name: Release
-      if: ${{ env.GitVersion_PreReleaseTag == '' }}
-      run: gh release create ${{ format('v{0}', env.GitVersion_SemVer) }} (get-item *.zip) --generate-notes --target ${{ github.sha }}
+      run: gh release create v${{ env.GitVersion_SemVer }} (get-item *.zip) --generate-notes --target ${{ github.sha }} ${{ env.PreReleaseTag != '' && '--prerelease' || '' }}
       env:
         GH_TOKEN: ${{ github.token }}
     - name: Package

CipherPunk.CipherSuiteInfoApi/CipherPunk.CipherSuiteInfoApi.csproj

@@ -16,6 +16,7 @@
     <AnalysisLevel>preview-all</AnalysisLevel>
     <LangVersion>preview</LangVersion>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Version>0.0.0.1</Version>
@@ -24,10 +25,10 @@
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 </Project>

CipherPunk.UI/App.xaml.cs

@@ -78,11 +78,9 @@ private static void PreventWpfFlashBang(Window window)
     }
 
     private static void SetUiCulture()
-    {
-        FrameworkElement.LanguageProperty.OverrideMetadata(
+        => FrameworkElement.LanguageProperty.OverrideMetadata(
             typeof(FrameworkElement),
             new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
-    }
 
     private void AppDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
     {

CipherPunk.UI/CipherPunk.UI.csproj

@@ -17,19 +17,19 @@
     <AnalysisLevel>preview-all</AnalysisLevel>
     <LangVersion>preview</LangVersion>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <Version>0.0.0.1</Version>
     <FileVersion>0.0.0.1</FileVersion>
     <InformationalVersion>0.0.0.1</InformationalVersion>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <Platforms>x86;x64;ARM64</Platforms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
       <PrivateAssets>all</PrivateAssets>
@@ -38,15 +38,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="55.0.45-preview">
+    <PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="56.0.13-preview">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.WDK.Win32Metadata" Version="0.9.9-experimental">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

CipherPunk.UI/Infrastructure/BaseViewModel.cs

@@ -19,10 +19,7 @@ protected BaseViewModel(ILogger logger)
         DefaultCommand = new AsyncRelayCommand<bool?>(ExecuteDefaultCommandAsync, _ => CanExecuteDefaultCommand);
         PropertyChanged += BaseViewModelPropertyChanged;
 
-        StrongReferenceMessenger.Default.Register<PropertyChangedMessage<bool>>(this, (r, m) =>
-        {
-            ((BaseViewModel)r).Receive(m);
-        });
+        StrongReferenceMessenger.Default.Register<PropertyChangedMessage<bool>>(this, (r, m) => ((BaseViewModel)r).Receive(m));
     }
 
     public IAsyncRelayCommand DefaultCommand { get; }
@@ -67,15 +64,9 @@ protected virtual void BaseViewModelPropertyChanged(object? sender, PropertyChan
         }
     }
 
-    protected virtual bool GetCanExecuteDefaultCommand()
-    {
-        return !DefaultCommandActive;
-    }
+    protected virtual bool GetCanExecuteDefaultCommand() => !DefaultCommandActive;
 
-    protected void UpdateCanExecuteDefaultCommand()
-    {
-        CanExecuteDefaultCommand = GetCanExecuteDefaultCommand();
-    }
+    protected void UpdateCanExecuteDefaultCommand() => CanExecuteDefaultCommand = GetCanExecuteDefaultCommand();
 
     private async Task ExecuteDefaultCommandAsync(bool? showView, CancellationToken cancellationToken)
     {

CipherPunk.UI/Infrastructure/ExceptionMessageBuilder.cs

@@ -4,10 +4,7 @@
 
 public static class ExceptionMessageBuilder
 {
-    public static string GetDetailedExceptionInfo(this Exception ex)
-    {
-        return new StringBuilder().GetExceptionInfo(ex).ToString();
-    }
+    public static string GetDetailedExceptionInfo(this Exception ex) => new StringBuilder().GetExceptionInfo(ex).ToString();
 
     private static StringBuilder GetExceptionInfo(this StringBuilder sb, Exception ex)
     {

CipherPunk.UI/Infrastructure/NoScrollDataGrid.cs

@@ -6,10 +6,7 @@
 
 internal sealed class NoScrollDataGrid : DataGrid
 {
-    public NoScrollDataGrid()
-    {
-        PreviewMouseWheel += OnPreviewMouseWheel;
-    }
+    public NoScrollDataGrid() => PreviewMouseWheel += OnPreviewMouseWheel;
 
     private static void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
     {

CipherPunk.UI/MainWindowViewModel.cs

@@ -44,14 +44,8 @@ public MainWindowViewModel(
         CopyMessageCommand = new RelayCommand(ExecuteCopyMessageCommand);
         CloseMessageCommand = new RelayCommand(ExecuteCloseMessageCommand);
 
-        StrongReferenceMessenger.Default.Register<UserMessageValueChangedMessage>(this, (r, m) =>
-        {
-            ((MainWindowViewModel)r).UserMessage = m.Value.Message;
-        });
-        StrongReferenceMessenger.Default.Register<ActiveViewValueChangedMessage>(this, (r, m) =>
-        {
-            ((MainWindowViewModel)r).ActiveView = m.Value;
-        });
+        StrongReferenceMessenger.Default.Register<UserMessageValueChangedMessage>(this, (r, m) => ((MainWindowViewModel)r).UserMessage = m.Value.Message);
+        StrongReferenceMessenger.Default.Register<ActiveViewValueChangedMessage>(this, (r, m) => ((MainWindowViewModel)r).ActiveView = m.Value);
         UpdateCanExecuteDefaultCommand();
     }
 
@@ -81,17 +75,17 @@ public MainWindowViewModel(
 
     public double MainContentOpacity
     {
-        get => mainContentOpacity; set { _ = SetProperty(ref mainContentOpacity, value); }
+        get => mainContentOpacity; set => _ = SetProperty(ref mainContentOpacity, value);
     }
 
     public bool MainContentIsHitTestVisible
     {
-        get => mainContentIsHitTestVisible; set { _ = SetProperty(ref mainContentIsHitTestVisible, value); }
+        get => mainContentIsHitTestVisible; set => _ = SetProperty(ref mainContentIsHitTestVisible, value);
     }
 
     public int MessageZIndex
     {
-        get => messageZIndex; set { _ = SetProperty(ref messageZIndex, value); }
+        get => messageZIndex; set => _ = SetProperty(ref messageZIndex, value);
     }
 
     public string? UserMessage
@@ -138,8 +132,5 @@ private void ExecuteCopyMessageCommand()
             Clipboard.Clear();
     }
 
-    private void ExecuteCloseMessageCommand()
-    {
-        UserMessage = null;
-    }
+    private void ExecuteCloseMessageCommand() => UserMessage = null;
 }

CipherPunk.UI/Messaging/ActiveViewValueChangedMessage.cs

@@ -1,4 +1,4 @@
-namespace CipherPunk.UI;
+namespace CipherPunk.UI;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging.Messages;

CipherPunk.UI/Messaging/UserInterfaceLogService.cs

@@ -1,4 +1,4 @@
-namespace CipherPunk.UI;
+namespace CipherPunk.UI;
 
 using CommunityToolkit.Mvvm.Messaging;
 

CipherPunk.UI/Messaging/UserMessage.cs

@@ -1,3 +1,3 @@
-namespace CipherPunk.UI;
+namespace CipherPunk.UI;
 
 internal readonly record struct UserMessage(string Message);

CipherPunk.UI/Messaging/UserMessageValueChangedMessage.cs

@@ -1,4 +1,4 @@
-namespace CipherPunk.UI;
+namespace CipherPunk.UI;
 
 using CommunityToolkit.Mvvm.Messaging.Messages;
 

CipherPunk.UI/Properties/AssemblyInfo.cs

@@ -1,3 +1,3 @@
-using System.Windows;
+using System.Windows;
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

CipherPunk.UI/Properties/GlobalUsings.cs

@@ -1,4 +1,4 @@
-#pragma warning disable IDE0065 // Misplaced using directive
+#pragma warning disable IDE0065 // Misplaced using directive
 #pragma warning disable SA1200 // Using directives should be placed correctly
 global using CipherPunk;
 global using Microsoft.Extensions.Logging;

CipherPunk.UI/UserControls/CipherSuites/CipherSuitesGroupPolicySettingsView.xaml.cs

@@ -2,8 +2,5 @@
 
 internal sealed partial class CipherSuitesGroupPolicySettingsView
 {
-    public CipherSuitesGroupPolicySettingsView()
-    {
-        InitializeComponent();
-    }
+    public CipherSuitesGroupPolicySettingsView() => InitializeComponent();
 }

CipherPunk.UI/UserControls/CipherSuites/CipherSuitesGroupPolicySettingsViewModel.cs

@@ -11,14 +11,15 @@ internal sealed class CipherSuitesGroupPolicySettingsViewModel : BaseViewModel
     private readonly IUacIconService uacIconService;
     private readonly ICipherSuiteInfoApiService cipherSuiteInfoApiService;
     private readonly IGroupPolicyService groupPolicyService;
-    private readonly List<CipherSuite?> onlineCipherSuiteInfos = new();
+    private readonly List<CipherSuite?> onlineCipherSuiteInfos = [];
     private ObservableCollection<UiWindowsDocumentationCipherSuiteConfiguration>? activeGroupPolicyCipherSuiteConfigurations;
     private ObservableCollection<UiWindowsDocumentationCipherSuiteConfiguration>? defaultGroupPolicyCipherSuiteConfigurations;
     private BitmapSource? uacIcon;
     private bool fetchOnlineInfo = true;
     private string? adminMessage;
 
-    public CipherSuitesGroupPolicySettingsViewModel(ILogger logger, ICipherSuiteService cipherSuiteService, IUacIconService uacIconService, ICipherSuiteInfoApiService cipherSuiteInfoApiService, IGroupPolicyService groupPolicyService)
+    public CipherSuitesGroupPolicySettingsViewModel(
+        ILogger logger, ICipherSuiteService cipherSuiteService, IUacIconService uacIconService, ICipherSuiteInfoApiService cipherSuiteInfoApiService, IGroupPolicyService groupPolicyService)
         : base(logger)
     {
         this.cipherSuiteService = cipherSuiteService;
@@ -35,10 +36,7 @@ public string? AdminMessage
         private set => _ = SetProperty(ref adminMessage, value);
     }
 
-    public BitmapSource UacIcon
-    {
-        get => uacIcon ??= uacIconService.GetUacShieldIcon();
-    }
+    public BitmapSource UacIcon => uacIcon ??= uacIconService.GetUacShieldIcon();
 
     public bool FetchOnlineInfo
     {
@@ -61,7 +59,7 @@ public ObservableCollection<UiWindowsDocumentationCipherSuiteConfiguration>? Def
     protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         string[] windowsDefaultGroupPolicyCipherSuiteConfigurationsStrings = await groupPolicyService.GetSslCipherSuiteOrderPolicyWindowsDefaultsAsync(cancellationToken);
-        string[] windowsActiveGroupPolicyCipherSuiteConfigurationsStrings = Array.Empty<string>();
+        string[] windowsActiveGroupPolicyCipherSuiteConfigurationsStrings = [];
 
         AdminMessage = null;
 

CipherPunk.UI/UserControls/CipherSuites/CipherSuitesOsSettingsView.xaml.cs

@@ -2,8 +2,5 @@
 
 internal sealed partial class CipherSuitesOsSettingsView
 {
-    public CipherSuitesOsSettingsView()
-    {
-        InitializeComponent();
-    }
+    public CipherSuitesOsSettingsView() => InitializeComponent();
 }

CipherPunk.UI/UserControls/CipherSuites/CipherSuitesOsSettingsViewModel.cs

@@ -10,7 +10,7 @@ internal sealed class CipherSuitesOsSettingsViewModel : BaseViewModel
     private readonly ICipherSuiteService cipherSuiteService;
     private readonly IUacIconService uacIconService;
     private readonly ICipherSuiteInfoApiService cipherSuiteInfoApiService;
-    private readonly List<CipherSuite?> onlineCipherSuiteInfos = new();
+    private readonly List<CipherSuite?> onlineCipherSuiteInfos = [];
     private ObservableCollection<UiWindowsApiCipherSuiteConfiguration>? activeCipherSuiteConfigurations;
     private ObservableCollection<UiWindowsDocumentationCipherSuiteConfiguration>? osDefaultCipherSuiteConfigurations;
     private BitmapSource? uacIcon;
@@ -26,10 +26,7 @@ public CipherSuitesOsSettingsViewModel(ILogger logger, ICipherSuiteService ciphe
         UpdateCanExecuteDefaultCommand();
     }
 
-    public BitmapSource UacIcon
-    {
-        get => uacIcon ??= uacIconService.GetUacShieldIcon();
-    }
+    public BitmapSource UacIcon => uacIcon ??= uacIconService.GetUacShieldIcon();
 
     public bool FetchOnlineInfo
     {

CipherPunk.UI/UserControls/CipherSuites/CipherSuitesView.xaml.cs

@@ -2,8 +2,5 @@
 
 internal sealed partial class CipherSuitesView
 {
-    public CipherSuitesView()
-    {
-        InitializeComponent();
-    }
+    public CipherSuitesView() => InitializeComponent();
 }

CipherPunk.UI/UserControls/CipherSuites/CipherSuitesViewModel.cs

@@ -8,7 +8,7 @@ internal sealed class CipherSuitesViewModel : BaseViewModel
 {
     private readonly ICipherSuiteService cipherSuiteService;
     private readonly ICipherSuiteInfoApiService cipherSuiteInfoApiService;
-    private readonly List<CipherSuite?> onlineCipherSuiteInfos = new();
+    private readonly List<CipherSuite?> onlineCipherSuiteInfos = [];
     private ObservableCollection<UiWindowsApiCipherSuiteConfiguration>? activeCipherSuiteConfigurations;
     private bool fetchOnlineInfo = true;
 

CipherPunk.UI/UserControls/EllipticCurves/EllipticCurvesGroupPolicySettingsView.xaml.cs

@@ -2,8 +2,5 @@
 
 internal sealed partial class EllipticCurvesGroupPolicySettingsView
 {
-    public EllipticCurvesGroupPolicySettingsView()
-    {
-        InitializeComponent();
-    }
+    public EllipticCurvesGroupPolicySettingsView() => InitializeComponent();
 }

CipherPunk.UI/UserControls/EllipticCurves/EllipticCurvesGroupPolicySettingsViewModel.cs

@@ -30,10 +30,7 @@ public string? AdminMessage
         private set => _ = SetProperty(ref adminMessage, value);
     }
 
-    public BitmapSource UacIcon
-    {
-        get => uacIcon ??= uacIconService.GetUacShieldIcon();
-    }
+    public BitmapSource UacIcon => uacIcon ??= uacIconService.GetUacShieldIcon();
 
     public ObservableCollection<UiWindowsApiEllipticCurveConfiguration>? ActiveEllipticCurveConfigurations
     {
@@ -57,7 +54,7 @@ protected override async Task DoExecuteDefaultCommandAsync(CancellationToken can
     {
         await Task.CompletedTask;
 
-        string[] activeGroupPolicyEllipticCurveConfigurationsStrings = Array.Empty<string>();
+        string[] activeGroupPolicyEllipticCurveConfigurationsStrings = [];
 
         AdminMessage = null;
 

CipherPunk.UI/UserControls/EllipticCurves/EllipticCurvesOsSettingsView.xaml.cs

@@ -2,8 +2,5 @@
 
 internal sealed partial class EllipticCurvesOsSettingsView
 {
-    public EllipticCurvesOsSettingsView()
-    {
-        InitializeComponent();
-    }
+    public EllipticCurvesOsSettingsView() => InitializeComponent();
 }