fix: create Windows shortcuts with valid WiX directories

Author: Rouniy

.github/workflows/ci.yml

@@ -95,8 +95,19 @@ jobs:
 
           $zipRoot = Join-Path $env:RUNNER_TEMP "zip"
           Expand-Archive -Path $zip.FullName -DestinationPath $zipRoot
-          if (-not (Get-ChildItem $zipRoot -Recurse -Filter MissionPlanner.exe)) {
-            throw "Portable ZIP does not contain MissionPlanner.exe"
+          $requiredFiles = @(
+            'MissionPlanner.exe',
+            'e_sqlite3.dll',
+            'airports.csv',
+            'COPYING.txt',
+            'NOTICE.md',
+            'LICENSE',
+            'SimpleBLE-0.7.3-NOTICE.txt'
+          )
+          foreach ($requiredFile in $requiredFiles) {
+            if (-not (Get-ChildItem $zipRoot -Recurse -File -Filter $requiredFile)) {
+              throw "Portable ZIP does not contain $requiredFile"
+            }
           }
 
           $msiRoot = Join-Path $env:RUNNER_TEMP "msi"
@@ -105,8 +116,10 @@ jobs:
             '/a', $msi.FullName, '/qn', "TARGETDIR=$msiRoot"
           )
           if ($process.ExitCode -ne 0) { throw "MSI validation failed: $($process.ExitCode)" }
-          if (-not (Get-ChildItem $msiRoot -Recurse -Filter MissionPlanner.exe)) {
-            throw "MSI does not contain MissionPlanner.exe"
+          foreach ($requiredFile in $requiredFiles) {
+            if (-not (Get-ChildItem $msiRoot -Recurse -File -Filter $requiredFile)) {
+              throw "MSI does not contain $requiredFile"
+            }
           }
 
       - uses: actions/upload-artifact@v7

build/windows/msi/Package.wxs

@@ -21,22 +21,7 @@
         <Component Id="MainExecutable" Bitness="always64">
           <File Id="MissionPlannerExecutable"
                 Source="!(bindpath.PublishDir)MissionPlanner.exe"
-                KeyPath="yes">
-            <Shortcut Id="StartMenuShortcut"
-                      Directory="CommonProgramsFolder"
-                      Name="Mission Planner (Avalonia)"
-                      Description="Ground control station for ArduPilot vehicles"
-                      WorkingDirectory="INSTALLFOLDER"
-                      Advertise="yes"
-                      Icon="MissionPlanner.exe" />
-            <Shortcut Id="DesktopShortcut"
-                      Directory="CommonDesktopFolder"
-                      Name="Mission Planner (Avalonia)"
-                      Description="Ground control station for ArduPilot vehicles"
-                      WorkingDirectory="INSTALLFOLDER"
-                      Advertise="yes"
-                      Icon="MissionPlanner.exe" />
-          </File>
+                KeyPath="yes" />
         </Component>
 
         <!-- SQLite's native PE is versioned but language-neutral. LANGID 0 keeps MSI repair
@@ -54,5 +39,42 @@
         </Files>
       </Directory>
     </StandardDirectory>
+
+    <!-- Non-advertised shortcuts must use an HKCU registry value as their component
+         key path (ICE43). Keeping each shortcut in a per-user-only component also
+         avoids mixing it with the per-machine executable component (ICE57). -->
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Component Id="StartMenuShortcutComponent" Bitness="always64">
+        <Shortcut Id="StartMenuShortcut"
+                  Name="Mission Planner (Avalonia)"
+                  Description="Ground control station for ArduPilot vehicles"
+                  Target="[#MissionPlannerExecutable]"
+                  WorkingDirectory="INSTALLFOLDER"
+                  Icon="MissionPlanner.exe" />
+        <RegistryValue Root="HKCU"
+                       Key="Software\Rouniy\MissionPlannerAvalonia"
+                       Name="StartMenuShortcut"
+                       Type="integer"
+                       Value="1"
+                       KeyPath="yes" />
+      </Component>
+    </StandardDirectory>
+
+    <StandardDirectory Id="DesktopFolder">
+      <Component Id="DesktopShortcutComponent" Bitness="always64">
+        <Shortcut Id="DesktopShortcut"
+                  Name="Mission Planner (Avalonia)"
+                  Description="Ground control station for ArduPilot vehicles"
+                  Target="[#MissionPlannerExecutable]"
+                  WorkingDirectory="INSTALLFOLDER"
+                  Icon="MissionPlanner.exe" />
+        <RegistryValue Root="HKCU"
+                       Key="Software\Rouniy\MissionPlannerAvalonia"
+                       Name="DesktopShortcut"
+                       Type="integer"
+                       Value="1"
+                       KeyPath="yes" />
+      </Component>
+    </StandardDirectory>
   </Package>
 </Wix>