Skip to content

pwiz: Added a vendor-bundled installer variant for offline installs - #4641

Merged
chambm merged 1 commit into
Skyline/work/20260904_vendor_resolution_fixesfrom
Skyline/work/20260904_vendor_bundled_installer
Sep 4, 2026
Merged

pwiz: Added a vendor-bundled installer variant for offline installs#4641
chambm merged 1 commit into
Skyline/work/20260904_vendor_resolution_fixesfrom
Skyline/work/20260904_vendor_bundled_installer

Conversation

@chambm

@chambm chambm commented Sep 4, 2026

Copy link
Copy Markdown
Member

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 -WithVendorSdks produces ProteoWizard-WithVendorSdks-Setup-<ver>.exe
    (103.8 MB): the bundled-runtime installer plus every Windows vendor SDK, pre-extracted
    into exactly the layout VendorSdkLoader.EnsureExtracted would have produced on first use,
    .ok markers included, so the loader neither downloads nor extracts. The name says only
    what it adds over the default variant — it carries the .NET runtime too.
  • Setup.iss installs that cache to %PROGRAMDATA%\ProteoWizard\vendor and stamps
    vendor-cache-root.txt beside 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-sdks through build.bat and tcbuild.bat. Opt-in: CI builds the
    variant, a developer build does not pay the ~30 s / ~26 MB.
  • Installer.Tests extended from 4 fixtures across 3 vendors to 9 across 8, and made to
    accumulate 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.
  • Renamed ProteoWizard-Sharp to ProteoWizard across the installer: product name, all
    three 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 none works 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 green
  • All three build.bat arg paths (default, --with-vendor-sdks, no --i-agree)
  • Installer.Tests per-user fixture — 9 fixtures across 8 vendors, from the real installer artifact
  • 43-pair vendor sweep in the wine 11 container with --network none: 43/43 converted, 40/43 count-match
  • ABI/Sciex offline check in the same image: 4/4 converted, 11 count-matches
  • Install_PerMachine_DeploysAndConvertsVendorFile is skipped locally — it needs elevation

Co-Authored-By: Claude noreply@anthropic.com

* 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>
@chambm chambm added the pwiz ProteoWizard/msconvert changes - create Skyline/work branch label Sep 4, 2026
@chambm
chambm merged commit b10f12f into Skyline/work/20260904_vendor_resolution_fixes Sep 4, 2026
5 checks passed
@chambm
chambm deleted the Skyline/work/20260904_vendor_bundled_installer branch September 4, 2026 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pwiz ProteoWizard/msconvert changes - create Skyline/work branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant