Skip to content

WindowsML cpp-abi: enable Control Flow Guard to fix BinSkim BA2008 (release/2.0-experimental) - #656

Merged
agniuks merged 1 commit into
release/2.0-experimentalfrom
user/agnel/cfg-ba2008-cpp-abi-2.0-experimental
Jul 21, 2026
Merged

agniuks merged 1 commit into
release/2.0-experimentalfrom
user/agnel/cfg-ba2008-cpp-abi-2.0-experimental

Conversation

@agniuks

@agniuks agniuks commented Jul 20, 2026

Copy link
Copy Markdown

Cherry-picks the CFG fix (#648, commit c4bd030) onto release/2.0-experimental. CppAbiEPEnumerationSample.exe is built without /guard:cf, so BinSkim BA2008 (error severity) breaks the SamplesCompat SDL gate on every WinAppSDK 2.0-experimental build (e.g. the 2.3.2-ci.experimental autosnap, build 152606950).

The fix already shipped to main, release/2.0-stable, and release/experimental; it was never ported to release/2.0-experimental, which is the branch the aggregator's experimental samples-compat job builds (SamplesBranch: release/2.0-experimental). This closes that gap.

Original fix authored by Kyaw Thant (@kythant); parallel fix (e32efe4d) by v-arlysenko.

CppAbiEPEnumerationSample.exe was built without Control Flow Guard, tripping BinSkim BA2008 (error severity) in the WindowsAppSDK SamplesCompat SDL gate (Guardian: Post Analysis) once the temporary .gdnsuppress waiver (Bug 60433419) expired on 2026-06-30. Set <ControlFlowGuard>Guard</ControlFlowGuard> so cl receives /guard:cf and link receives /GUARD:CF, matching the other WindowsML C++ samples that already pass BA2008.

(cherry picked from commit 26eddcd)
(cherry picked from commit c4bd030)
@agniuks

agniuks commented Jul 20, 2026

Copy link
Copy Markdown
Author

/azp run

@agniuks
agniuks merged commit 63efdc9 into release/2.0-experimental Jul 21, 2026
4 checks passed
@agniuks
agniuks deleted the user/agnel/cfg-ba2008-cpp-abi-2.0-experimental branch July 21, 2026 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants