Skip to content

Commit 8e5af64

Browse files
[Build][CP to Main] Mitigate BinSkim errors (#399)
* Add Directory.Build.props (#378) * [Build] Ensure chaining of directory.build.props files reaches the new central one for Sample apps (#380) --------- Co-authored-by: Bob Pulliam <bpulliam@gmail.com>
1 parent 9ffb709 commit 8e5af64

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

Diff for: Samples/Directory.Build.props

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemDefinitionGroup>
4+
<ClCompile>
5+
<AdditionalOptions>%(AdditionalOptions) /Qspectre</AdditionalOptions>
6+
<!-- /GS Enable Control Flow Guard -->
7+
<ControlFlowGuard>Guard</ControlFlowGuard>
8+
<!-- Setting this to be compatible with CFG -->
9+
<DebugInformationFormat>OldStyle</DebugInformationFormat>
10+
<SDLCheck>true</SDLCheck>
11+
</ClCompile>
12+
<Link>
13+
<!-- dynamicbase is required for enabling CFG -->
14+
<AdditionalOptions>%(AdditionalOptions) /dynamicbase</AdditionalOptions>
15+
<!-- /GS Enable Control Flow Guard -->
16+
<ControlFlowGuard>Guard</ControlFlowGuard>
17+
<CETCompat Condition="'$(Platform)'!='ARM64'">true</CETCompat>
18+
</Link>
19+
</ItemDefinitionGroup>
20+
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
<Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
45
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
<Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
45
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
<Import Project="$(MSBuildThisFileDirectory)HybridCRT.props" />
45
</Project>

0 commit comments

Comments
 (0)