pwiz: Added a vendor-bundled installer variant for offline installs - #4641
Merged
chambm merged 1 commit intoSep 4, 2026
Conversation
* Added build.ps1 -WithVendorSdks: the bundled-runtime installer plus every Windows vendor SDK pre-extracted into VendorSdkLoader's cache, with a ProgramData marker pointing the app at it * Wired --with-vendor-sdks through build.bat and tcbuild.bat, opt-in so a developer build does not pay for it * Extended Installer.Tests from 4 fixtures across 3 vendors to 9 across 8, and made it accumulate failures instead of aborting on the first * Renamed ProteoWizard-Sharp to ProteoWizard across the installer See TODO-20260901_net10_wine_container.md in pwiz-ai/todos Co-Authored-By: Claude <noreply@anthropic.com>
8 tasks
chambm
merged commit Sep 4, 2026
b10f12f
into
Skyline/work/20260904_vendor_resolution_fixes
5 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Stacked on #4640 — review that one first; this PR's diff is only the six files below.
A third installer variant that needs no network at run time, which is what the net10 Wine
container needs and what an offline or air-gapped site install needs.
build.ps1 -WithVendorSdksproducesProteoWizard-WithVendorSdks-Setup-<ver>.exe(103.8 MB): the bundled-runtime installer plus every Windows vendor SDK, pre-extracted
into exactly the layout
VendorSdkLoader.EnsureExtractedwould have produced on first use,.okmarkers included, so the loader neither downloads nor extracts. The name says onlywhat it adds over the default variant — it carries the .NET runtime too.
Setup.issinstalls that cache to%PROGRAMDATA%\ProteoWizard\vendorand stampsvendor-cache-root.txtbeside it. The loader's default cache root is per-user(
%LOCALAPPDATA%), and writing the marker is what redirects it to the shared bundled copy.The cache is keyed by SDK version rather than by app version, so it is deliberately left
behind on uninstall.
--with-vendor-sdksthroughbuild.batandtcbuild.bat. Opt-in: CI builds thevariant, a developer build does not pay the ~30 s / ~26 MB.
Installer.Testsextended from 4 fixtures across 3 vendors to 9 across 8, and made toaccumulate failures rather than abort on the first. This is what found the four
vendor-resolution bugs in pwiz: Fixed four vendor readers failing from an installer-based install #4640 — nothing before it exercised a real install.
ProteoWizard-SharptoProteoWizardacross the installer: product name, allthree output filenames, the Linux tarballs, and the test's discovery glob.
Verified end to end in the wine 11 container: installing this artifact and converting with
--network noneworks for all 8 vendors, so nothing reaches raw.githubusercontent.com.Test plan
pwiz-sharp/build.bat Release --i-agree-to-the-vendor-licenses --with-vendor-sdks— all three installers produced (78.2 / 21.5 / 103.8 MB), every suite greenbuild.batarg paths (default,--with-vendor-sdks, no--i-agree)Installer.Testsper-user fixture — 9 fixtures across 8 vendors, from the real installer artifact--network none: 43/43 converted, 40/43 count-matchInstall_PerMachine_DeploysAndConvertsVendorFileis skipped locally — it needs elevationCo-Authored-By: Claude noreply@anthropic.com