Preview 1.82.15 Release

.github/workflows/qodana-scan-pr.yml

@@ -3,8 +3,6 @@ on:
  pull_request:
     branches:
       - main
-      - preview
-      - stable
     paths-ignore:
       - '**.md'
       - 'Hi3Helper.Core/Lang/**.json'
@@ -21,13 +19,11 @@ jobs:
         pull-requests: write
         checks: write
         security-events: write
-
     strategy:
       matrix:
         configuration: [Release] # No need to distribute Debug builds
         platform: [x64]
         framework: [net9.0-windows10.0.22621.0]
-
     env:
       Configuration: ${{ matrix.configuration }}
       Platform: ${{ matrix.platform }}
@@ -45,7 +41,6 @@ jobs:
             ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
             fetch-depth: 0  # a full history is required for pull request analysis
             submodules: recursive # many many submodules  
-
       - name: Install .NET
         uses: actions/setup-dotnet@v4
         with:
@@ -62,7 +57,6 @@ jobs:
           pr-mode: true
         env:
             QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} # read the steps about it below
-
       - uses: github/codeql-action/upload-sarif@v3
         if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
         with:

.github/workflows/qodana-scan.yml

@@ -3,9 +3,10 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * 0,3,5' # At 00:00 on Sunday, Wednesday, and Friday.
-#  pull_request:
-#    branches:
-#      - main
+  pull_request:
+    branches:
+      - preview
+      - stable
 
 jobs:
   qodana:
@@ -15,31 +16,26 @@ jobs:
         configuration: [Release] # No need to distribute Debug builds
         platform: [x64]
         framework: [net9.0-windows10.0.22621.0]
-
     env:
       Configuration: ${{ matrix.configuration }}
       Platform: ${{ matrix.platform }}
       DOTNET_INSTALL_DIR: '.\.dotnet' 
       DOTNET_VERSION: '9.x'
       DOTNET_QUALITY: 'ga'
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
-
     permissions:
       actions: read
       contents: write
       pull-requests: write
       checks: write
       security-events: write
-
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
           submodules: recursive # many many submodules
-
       # - name: Install winget
       #   uses: Cyberboss/install-winget@v1
-
       # - name: Install Qodana CLI
       #   uses: crazy-max/ghaction-chocolatey@v3
       #   with:
@@ -50,21 +46,18 @@ jobs:
       #     Import-Module "$env:ChocolateyInstall/helpers/chocolateyInstaller.psm1"
       #     refreshenv
       #     qodana --version
-
       - name: Install .NET
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
           dotnet-quality: ${{ env.DOTNET_QUALITY }}
           cache: true
           cache-dependency-path: CollapseLauncher/packages.lock.json
-
       # - name: Qodana Scan
       #   run: |
       #     Import-Module "$env:ChocolateyInstall/helpers/chocolateyInstaller.psm1"
       #     refreshenv
       #     qodana scan --ide QDNET-EAP -o ${{ runner.temp }}\qodana\results --cache-dir ${{ runner.temp }}\qodana\cache
-
       - name: Qodana Scan
         uses: JetBrains/qodana-action@v2024.3.3
         continue-on-error: true
@@ -73,9 +66,8 @@ jobs:
           pr-mode: false
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-
       - uses: github/codeql-action/upload-sarif@v3
         if: always()
         continue-on-error: true
         with:
-          sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
+          sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

.gitignore

@@ -6,6 +6,8 @@
 packages/*
 
 CollapseLauncher/Deps/*
+CollapseLauncher/StaticLib/*.lib
+CollapseLauncher/StaticLib/**/*.lib
 CollapseLauncher/Invoker/*
 **/Generated Files/**
 *.psd

CollapseLauncher/App.xaml

@@ -2,10 +2,9 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+             xmlns:controls="using:Microsoft.UI.Xaml.Controls"
              xmlns:conv="using:CollapseLauncher.Pages"
-             xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
              xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-             xmlns:controls="using:Microsoft.UI.Xaml.Controls"
              xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
              xmlns:ui="using:Windows.UI">
     <!--  ReSharper disable Xaml.InvalidResourceType  -->
@@ -2190,13 +2189,13 @@
                                             <!--  Force ShouldConstrainToRootBounds to True  -->
                                             <!--  Fix https://github.com/microsoft/microsoft-ui-xaml/issues/8657  -->
                                             <interactivity:Interaction.Behaviors>
-                                                <interactions:DataTriggerBehavior Binding="{Binding ShouldConstrainToRootBounds, ElementName=Popup}"
-                                                                                  ComparisonCondition="Equal"
-                                                                                  Value="False">
-                                                    <interactions:ChangePropertyAction PropertyName="ShouldConstrainToRootBounds"
-                                                                                       TargetObject="{Binding ElementName=Popup}"
-                                                                                       Value="True" />
-                                                </interactions:DataTriggerBehavior>
+                                                <interactivity:DataTriggerBehavior Binding="{Binding ShouldConstrainToRootBounds, ElementName=Popup}"
+                                                                                   ComparisonCondition="Equal"
+                                                                                   Value="False">
+                                                    <interactivity:ChangePropertyAction PropertyName="ShouldConstrainToRootBounds"
+                                                                                        TargetObject="{Binding ElementName=Popup}"
+                                                                                        Value="True" />
+                                                </interactivity:DataTriggerBehavior>
                                             </interactivity:Interaction.Behaviors>
                                             <Border x:Name="PopupBorder"
                                                     Margin="0,-0.5,0,-1"
@@ -2627,13 +2626,13 @@
                                             <!--  Force ShouldConstrainToRootBounds to True  -->
                                             <!--  Fix https://github.com/microsoft/microsoft-ui-xaml/issues/8657  -->
                                             <interactivity:Interaction.Behaviors>
-                                                <interactions:DataTriggerBehavior Binding="{Binding ShouldConstrainToRootBounds, ElementName=Popup}"
-                                                                                  ComparisonCondition="Equal"
-                                                                                  Value="False">
-                                                    <interactions:ChangePropertyAction PropertyName="ShouldConstrainToRootBounds"
-                                                                                       TargetObject="{Binding ElementName=Popup}"
-                                                                                       Value="True" />
-                                                </interactions:DataTriggerBehavior>
+                                                <interactivity:DataTriggerBehavior Binding="{Binding ShouldConstrainToRootBounds, ElementName=Popup}"
+                                                                                   ComparisonCondition="Equal"
+                                                                                   Value="False">
+                                                    <interactivity:ChangePropertyAction PropertyName="ShouldConstrainToRootBounds"
+                                                                                        TargetObject="{Binding ElementName=Popup}"
+                                                                                        Value="True" />
+                                                </interactivity:DataTriggerBehavior>
                                             </interactivity:Interaction.Behaviors>
                                             <Border x:Name="PopupBorder"
                                                     Margin="0,-0.5,0,-1"
@@ -5019,7 +5018,8 @@
                     </Style>
 
                     <!--  PipsPager styles  -->
-                    <Style x:Key="DefaultPipsPagerStyle" TargetType="controls:PipsPager">
+                    <Style x:Key="DefaultPipsPagerStyle"
+                           TargetType="controls:PipsPager">
                         <Setter Property="Background" Value="Transparent" />
                         <Setter Property="HorizontalAlignment" Value="Left" />
                         <Setter Property="VerticalAlignment" Value="Top" />
@@ -5031,7 +5031,9 @@
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="controls:PipsPager">
-                                    <StackPanel x:Name="RootPanel" Orientation="{TemplateBinding Orientation}" Background="{TemplateBinding Background}">
+                                    <StackPanel x:Name="RootPanel"
+                                                Background="{TemplateBinding Background}"
+                                                Orientation="{TemplateBinding Orientation}">
 
                                         <VisualStateManager.VisualStateGroups>
                                             <VisualStateGroup x:Name="PreviousPageButtonVisibilityStates">
@@ -5112,9 +5114,23 @@
                                             </VisualStateGroup>
 
                                         </VisualStateManager.VisualStateGroups>
-                                        <Button x:Name="PreviousPageButton" ToolTipService.ToolTip="{Binding ElementName=PreviousPageButton, Path=(AutomationProperties.Name)}" ToolTipService.Placement="Top" Style="{TemplateBinding PreviousButtonStyle}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                        <ScrollViewer x:Name="PipsPagerScrollViewer" VerticalScrollBarVisibility="Hidden" VerticalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" HorizontalScrollMode="Disabled" IsHorizontalScrollChainingEnabled="False" IsVerticalScrollChainingEnabled="False" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                            <controls:ItemsRepeater x:Name="PipsPagerItemsRepeater" ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PipsPagerItems}">
+                                        <Button x:Name="PreviousPageButton"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Style="{TemplateBinding PreviousButtonStyle}"
+                                                ToolTipService.Placement="Top"
+                                                ToolTipService.ToolTip="{Binding ElementName=PreviousPageButton, Path=(AutomationProperties.Name)}" />
+                                        <ScrollViewer x:Name="PipsPagerScrollViewer"
+                                                      HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center"
+                                                      HorizontalScrollBarVisibility="Hidden"
+                                                      HorizontalScrollMode="Disabled"
+                                                      IsHorizontalScrollChainingEnabled="False"
+                                                      IsVerticalScrollChainingEnabled="False"
+                                                      VerticalScrollBarVisibility="Hidden"
+                                                      VerticalScrollMode="Disabled">
+                                            <controls:ItemsRepeater x:Name="PipsPagerItemsRepeater"
+                                                                    ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PipsPagerItems}">
                                                 <controls:ItemsRepeater.Layout>
                                                     <controls:StackLayout Orientation="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" />
                                                 </controls:ItemsRepeater.Layout>
@@ -5125,20 +5141,29 @@
                                                 </controls:ItemsRepeater.ItemTemplate>
                                             </controls:ItemsRepeater>
                                         </ScrollViewer>
-                                        <Button x:Name="NextPageButton" ToolTipService.ToolTip="{Binding ElementName=NextPageButton, Path=(AutomationProperties.Name)}" ToolTipService.Placement="Bottom" Style="{TemplateBinding NextButtonStyle}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                        <Button x:Name="NextPageButton"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Style="{TemplateBinding NextButtonStyle}"
+                                                ToolTipService.Placement="Bottom"
+                                                ToolTipService.ToolTip="{Binding ElementName=NextPageButton, Path=(AutomationProperties.Name)}" />
                                     </StackPanel>
 
                                 </ControlTemplate>
                             </Setter.Value>
                         </Setter>
                     </Style>
-                    <Style BasedOn="{StaticResource DefaultPipsPagerStyle}" TargetType="controls:PipsPager" />
+                    <Style BasedOn="{StaticResource DefaultPipsPagerStyle}"
+                           TargetType="controls:PipsPager" />
 
                     <!--  Pivot styles  -->
-                    <Style x:Key="ThinPivotHeaderItemStyle" TargetType="PivotHeaderItem" BasedOn="{StaticResource DefaultPivotHeaderItemStyle}">
+                    <Style x:Key="ThinPivotHeaderItemStyle"
+                           BasedOn="{StaticResource DefaultPivotHeaderItemStyle}"
+                           TargetType="PivotHeaderItem">
                         <Setter Property="Height" Value="30" />
                     </Style>
-                    <Style BasedOn="{StaticResource ThinPivotHeaderItemStyle}" TargetType="PivotHeaderItem" />
+                    <Style BasedOn="{StaticResource ThinPivotHeaderItemStyle}"
+                           TargetType="PivotHeaderItem" />
                     <Thickness x:Key="PivotNavButtonMargin">0,-6,0,0</Thickness>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>

CollapseLauncher/App.xaml.cs

@@ -14,20 +14,26 @@
 using Windows.UI;
 using static CollapseLauncher.InnerLauncherConfig;
 using static Hi3Helper.Logger;
+// ReSharper disable SwitchStatementMissingSomeEnumCasesNoDefault
+// ReSharper disable CommentTypo
+// ReSharper disable StringLiteralTypo
 
 namespace CollapseLauncher
 {
     public partial class App
     {
-        public static bool IsAppKilled = false;
+        // TODO: #671 This App.IsAppKilled will be replaced with cancellable-awaitable event
+        //       to ensure no hot-exit being called before all background tasks
+        //       hasn't being cancelled.
+        // public static bool IsAppKilled { get; set; } = false;
 
         public App()
         {
             if (DebugSettings != null)
             {
-#if ENABLEFRAMECOUNTER
+            #if ENABLEFRAMECOUNTER
                 DebugSettings.EnableFrameRateCounter = true;
-#endif
+            #endif
 #if DEBUG
                 DebugSettings.LayoutCycleDebugBreakLevel = LayoutCycleDebugBreakLevel.High;
                 DebugSettings.LayoutCycleTracingLevel = LayoutCycleTracingLevel.High;
@@ -68,7 +74,7 @@ public App()
             RequestedTheme = IsAppThemeLight ? ApplicationTheme.Light : ApplicationTheme.Dark;
             PInvoke.SetPreferredAppMode(PInvoke.ShouldAppsUseDarkMode() ? PreferredAppMode.AllowDark : PreferredAppMode.Default);
 
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)