Skip to content

Commit c3a0d63

Browse files
committed
fix: make Windows MSI validation clean
1 parent 99513b0 commit c3a0d63

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

ExtLibs/WinUSBNet/Nefarius.Drivers.WinUSB.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<!-- Win32 Metadata -->
2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.268">
29+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
3030
<PrivateAssets>all</PrivateAssets>
3131
</PackageReference>
3232
<PackageReference Include="Microsoft.Windows.SDK.Win32Metadata" Version="69.0.7-preview">
@@ -46,4 +46,4 @@
4646
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
4747
</ItemGroup>
4848

49-
</Project>
49+
</Project>

build/windows/msi/Package.wxs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,34 @@
2323
Source="!(bindpath.PublishDir)MissionPlanner.exe"
2424
KeyPath="yes">
2525
<Shortcut Id="StartMenuShortcut"
26-
Directory="ProgramMenuFolder"
26+
Directory="CommonProgramsFolder"
2727
Name="Mission Planner (Avalonia)"
2828
Description="Ground control station for ArduPilot vehicles"
2929
WorkingDirectory="INSTALLFOLDER"
30+
Advertise="yes"
3031
Icon="MissionPlanner.exe" />
3132
<Shortcut Id="DesktopShortcut"
32-
Directory="DesktopFolder"
33+
Directory="CommonDesktopFolder"
3334
Name="Mission Planner (Avalonia)"
3435
Description="Ground control station for ArduPilot vehicles"
3536
WorkingDirectory="INSTALLFOLDER"
37+
Advertise="yes"
3638
Icon="MissionPlanner.exe" />
3739
</File>
3840
</Component>
3941

42+
<!-- SQLite's native PE is versioned but language-neutral. LANGID 0 keeps MSI repair
43+
decisions deterministic and satisfies ICE60 without hiding installer validation. -->
44+
<Component Id="SqliteNative" Bitness="always64">
45+
<File Id="SqliteNativeFile"
46+
Source="!(bindpath.PublishDir)e_sqlite3.dll"
47+
DefaultLanguage="0"
48+
KeyPath="yes" />
49+
</Component>
50+
4051
<Files Include="!(bindpath.PublishDir)**">
4152
<Exclude Files="!(bindpath.PublishDir)MissionPlanner.exe" />
53+
<Exclude Files="!(bindpath.PublishDir)e_sqlite3.dll" />
4254
</Files>
4355
</Directory>
4456
</StandardDirectory>

build/windows/package.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ env -u VERSION "$DOTNET" publish "$APP_PROJECT" \
5454
--self-contained true \
5555
-m:1 \
5656
-p:DebugType=none \
57+
-p:PlatformTarget=x64 \
5758
-p:MissionPlannerUpstreamVersion="$MP_UPSTREAM_VERSION" \
5859
-p:MissionPlannerBuildDate="$MP_BUILD_DATE" \
5960
-p:MissionPlannerCommit="$MP_COMMIT$MP_DIRTY_SUFFIX" \

0 commit comments

Comments
 (0)