[windows] Embed DFNR model and set Store identity#3225
Merged
Conversation
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Codex <noreply@openai.com>
jensenpat
changed the title
jensenpat
changed the title
Collaborator
|
Claude here — merged, thanks @jensenpat. The embed-in-resource + extract-to-cache approach is more elegant than the fork-patch sketch I'd filed in #3217 — solves the same problem without maintaining a DeepFilter fork. SHA-256 sidecar invalidation is the right way to handle DeepFilter version bumps; nice touch. The Store-cert quadfecta is now complete:
Closed #3217 with a pointer to this PR. One tiny doc-cleanup observation noted in #3217's close — the "NULL for embedded default" comment in third_party/deepfilter/include/deep_filter.h:24 is now formally stale doc (the docstring implies behaviour that doesn't exist). Not blocking anything, just worth a one-line scrub if anyone's in that file. 73, Jeremy KK7GWY & Claude (AI dev partner) |
This was referenced May 28, 2026
Open
3 tasks
jensenpat
pushed a commit
that referenced
this pull request
May 28, 2026
## Summary `CMakeLists.txt:1062` passes `/MANIFESTINPUT:<path>` to the MSVC linker but not the required `/MANIFEST:EMBED`. Per MSVC docs the former is only valid alongside the latter. Older toolsets accepted the lone flag with a warning; newer ones (VS 18.x / MSVC 14.50+) fail hard: ``` LINK : fatal error LNK1220: 'MANIFESTINPUT' requires '/MANIFEST:EMBED' specification ``` One-line fix (4 lines incl. comment): add `/MANIFEST:EMBED` to the `target_link_options` call so the manifest is embedded inline (the intended behaviour anyway). ## Why a separate PR Split out of #3234 (the `mic_level` TCI handler) on reviewer request — this is an unrelated build-system change and deserves independent review against the Windows toolchain matrix. ## Context - Hit on a fresh Windows build with **Visual Studio 18 Build Tools, toolset 14.50.35717**, Windows SDK 10.0.26100.0. - This branch is cut from `44eaef7c` (the #3225 "Embed DFNR model and set Store identity" merge), so it sits on top of the latest Windows/manifest changes — no conflict with #3225's Store-identity handling (different part of the file). - CI presumably uses an older MSVC, which is why this has been latent. ## Test plan - [x] Windows local build (MSVC 14.50) links clean with the fix; fails with LNK1220 without it - [x] No effect on Linux/macOS — the change is inside the existing `if(MSVC)` block - [ ] CI Windows matrix (auto) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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
2 participants
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
This prepares the Windows Store MSIX package for submission while keeping DFNR enabled without shipping the DeepFilterNet model as a
.tar.gzarchive.Identity.Name:AetherSDR.AetherSDRIdentity.Publisher:CN=E03F94A2-AEAB-46D2-8BF1-6419C305CC44PublisherDisplayName:AetherSDRImplementation Notes
The DFNR loader now first tries the existing app-data model location, then falls back to a packaged resource path when the model is embedded. This lets normal development/test builds continue to use external model files while Store builds avoid archive payloads that WACK flags.
The workflow sources
packaging/windows/store-identity.ps1before creating the MSIX. The helper only fills missing environment variables, so CI repository variables or local shell variables can still override the identity when needed.Validation
Built locally from a fresh Windows Store submission worktree using the MSVC environment and 8 build jobs.
cmake --build build\msvc-store-submit --target AetherSDR -j 8windeployqt deploy\AetherSDR.exe --release --no-translations --no-system-d3d-compilerpackaging\windows\create-msix.ps1 -DeployDir deploy -PackageRoot AetherSDR-store-submission\msix-root -OutputDir AetherSDR-store-submission -CreateUpload -SkipSign -ExcludeDfnrModelpackaging\windows\check-dpi-awareness.ps1 -ExePath deploy\AetherSDR.exeFinal local validation results:
AetherSDR.AetherSDR/CN=E03F94A2-AEAB-46D2-8BF1-6419C305CC44/AetherSDR.deepfilter.dllandAetherSDR.exe, but noDeepFilterNet,.dfmodel, or.tar.gzpayload.PASS.Archive files usage:PASS.DPIAwarenessValidation:PASS.Blocked executables: still reports findings from Qt/OpenGL/process API/static string matches, but overall WACK remainsPASS.The final local artifact for Partner Center submission is the generated
.msixupload; it is intentionally unsigned with-SkipSignbecause Microsoft signs Store-distributed packages.