Skip to content

Commit 08a12f2

Browse files
jkotalikjkotalik
committed
Enable control flow guard for IIS dlls
1 parent bcd4fc0 commit 08a12f2

File tree

6 files changed

+28
-4
lines changed

6 files changed

+28
-4
lines changed

‎src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<MultiProcessorCompilation>true</MultiProcessorCompilation>
100100
<LanguageStandard>stdcpp17</LanguageStandard>
101101
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
102+
<ControlFlowGuard>Guard</ControlFlowGuard>
102103
</ClCompile>
103104
<Link>
104105
<SubSystem>Windows</SubSystem>
@@ -135,6 +136,7 @@
135136
<IntrinsicFunctions>true</IntrinsicFunctions>
136137
<LanguageStandard>stdcpp17</LanguageStandard>
137138
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
139+
<ControlFlowGuard>Guard</ControlFlowGuard>
138140
</ClCompile>
139141
<Link>
140142
<SubSystem>Windows</SubSystem>
@@ -172,6 +174,7 @@
172174
<MultiProcessorCompilation>true</MultiProcessorCompilation>
173175
<LanguageStandard>stdcpp17</LanguageStandard>
174176
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
177+
<ControlFlowGuard>Guard</ControlFlowGuard>
175178
</ClCompile>
176179
<Link>
177180
<SubSystem>Windows</SubSystem>
@@ -212,6 +215,7 @@
212215
<MultiProcessorCompilation>true</MultiProcessorCompilation>
213216
<LanguageStandard>stdcpp17</LanguageStandard>
214217
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
218+
<ControlFlowGuard>Guard</ControlFlowGuard>
215219
</ClCompile>
216220
<Link>
217221
<SubSystem>Windows</SubSystem>
@@ -311,4 +315,4 @@
311315
</ItemGroup>
312316
<WriteLinesToFile File="$(InstallersOutputPath)aspnetcoremodule.version" Lines="@(VersionFileContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
313317
</Target>
314-
</Project>
318+
</Project>

‎src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<MultiProcessorCompilation>true</MultiProcessorCompilation>
104104
<LanguageStandard>stdcpp17</LanguageStandard>
105105
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
106+
<ControlFlowGuard>Guard</ControlFlowGuard>
106107
</ClCompile>
107108
<Link>
108109
<SubSystem>Windows</SubSystem>
@@ -128,6 +129,7 @@
128129
<MultiProcessorCompilation>true</MultiProcessorCompilation>
129130
<LanguageStandard>stdcpp17</LanguageStandard>
130131
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
132+
<ControlFlowGuard>Guard</ControlFlowGuard>
131133
</ClCompile>
132134
<Link>
133135
<SubSystem>Windows</SubSystem>
@@ -153,6 +155,7 @@
153155
<MultiProcessorCompilation>true</MultiProcessorCompilation>
154156
<LanguageStandard>stdcpp17</LanguageStandard>
155157
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
158+
<ControlFlowGuard>Guard</ControlFlowGuard>
156159
</ClCompile>
157160
<Link>
158161
<SubSystem>Windows</SubSystem>
@@ -183,6 +186,7 @@
183186
<ShowIncludes>false</ShowIncludes>
184187
<LanguageStandard>stdcpp17</LanguageStandard>
185188
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
189+
<ControlFlowGuard>Guard</ControlFlowGuard>
186190
</ClCompile>
187191
<Link>
188192
<SubSystem>Windows</SubSystem>
@@ -279,4 +283,4 @@
279283
<Import Project="..\..\build\native.targets" />
280284
<ImportGroup Label="ExtensionTargets">
281285
</ImportGroup>
282-
</Project>
286+
</Project>

‎src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<ShowIncludes>false</ShowIncludes>
8585
<TreatWarningAsError>true</TreatWarningAsError>
8686
<MultiProcessorCompilation>true</MultiProcessorCompilation>
87+
<ControlFlowGuard>Guard</ControlFlowGuard>
8788
</ClCompile>
8889
<Link>
8990
<SubSystem>Windows</SubSystem>
@@ -103,6 +104,7 @@
103104
<ShowIncludes>false</ShowIncludes>
104105
<TreatWarningAsError>true</TreatWarningAsError>
105106
<MultiProcessorCompilation>true</MultiProcessorCompilation>
107+
<ControlFlowGuard>Guard</ControlFlowGuard>
106108
</ClCompile>
107109
<Link>
108110
<SubSystem>Windows</SubSystem>
@@ -123,6 +125,7 @@
123125
<ShowIncludes>false</ShowIncludes>
124126
<TreatWarningAsError>true</TreatWarningAsError>
125127
<MultiProcessorCompilation>true</MultiProcessorCompilation>
128+
<ControlFlowGuard>Guard</ControlFlowGuard>
126129
</ClCompile>
127130
<Link>
128131
<SubSystem>Windows</SubSystem>
@@ -146,6 +149,7 @@
146149
<ShowIncludes>false</ShowIncludes>
147150
<TreatWarningAsError>true</TreatWarningAsError>
148151
<MultiProcessorCompilation>true</MultiProcessorCompilation>
152+
<ControlFlowGuard>Guard</ControlFlowGuard>
149153
</ClCompile>
150154
<Link>
151155
<SubSystem>Windows</SubSystem>
@@ -194,4 +198,4 @@
194198
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
195199
<ImportGroup Label="ExtensionTargets">
196200
</ImportGroup>
197-
</Project>
201+
</Project>

‎src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<LanguageStandard>stdcpp17</LanguageStandard>
110110
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
111111
<MultiProcessorCompilation>true</MultiProcessorCompilation>
112+
<ControlFlowGuard>Guard</ControlFlowGuard>
112113
</ClCompile>
113114
<Link>
114115
<SubSystem>Windows</SubSystem>
@@ -143,6 +144,7 @@
143144
<LanguageStandard>stdcpp17</LanguageStandard>
144145
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
145146
<MultiProcessorCompilation>true</MultiProcessorCompilation>
147+
<ControlFlowGuard>Guard</ControlFlowGuard>
146148
</ClCompile>
147149
<Link>
148150
<SubSystem>Windows</SubSystem>
@@ -177,6 +179,7 @@
177179
<LanguageStandard>stdcpp17</LanguageStandard>
178180
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
179181
<MultiProcessorCompilation>true</MultiProcessorCompilation>
182+
<ControlFlowGuard>Guard</ControlFlowGuard>
180183
</ClCompile>
181184
<Link>
182185
<SubSystem>Windows</SubSystem>
@@ -214,6 +217,7 @@
214217
<LanguageStandard>stdcpp17</LanguageStandard>
215218
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
216219
<MultiProcessorCompilation>true</MultiProcessorCompilation>
220+
<ControlFlowGuard>Guard</ControlFlowGuard>
217221
</ClCompile>
218222
<Link>
219223
<SubSystem>Windows</SubSystem>

‎src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<MultiProcessorCompilation>true</MultiProcessorCompilation>
110110
<LanguageStandard>stdcpp17</LanguageStandard>
111111
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
112+
<ControlFlowGuard>Guard</ControlFlowGuard>
112113
</ClCompile>
113114
<Link>
114115
<SubSystem>Windows</SubSystem>
@@ -143,6 +144,7 @@
143144
<MultiProcessorCompilation>true</MultiProcessorCompilation>
144145
<LanguageStandard>stdcpp17</LanguageStandard>
145146
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
147+
<ControlFlowGuard>Guard</ControlFlowGuard>
146148
</ClCompile>
147149
<Link>
148150
<SubSystem>Windows</SubSystem>
@@ -177,6 +179,7 @@
177179
<MultiProcessorCompilation>true</MultiProcessorCompilation>
178180
<LanguageStandard>stdcpp17</LanguageStandard>
179181
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
182+
<ControlFlowGuard>Guard</ControlFlowGuard>
180183
</ClCompile>
181184
<Link>
182185
<SubSystem>Windows</SubSystem>
@@ -214,6 +217,7 @@
214217
<MultiProcessorCompilation>true</MultiProcessorCompilation>
215218
<LanguageStandard>stdcpp17</LanguageStandard>
216219
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
220+
<ControlFlowGuard>Guard</ControlFlowGuard>
217221
</ClCompile>
218222
<Link>
219223
<SubSystem>Windows</SubSystem>

‎src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
<AdditionalIncludeDirectories>..\iislib;..\CommonLib;</AdditionalIncludeDirectories>
103103
<MultiProcessorCompilation>true</MultiProcessorCompilation>
104104
<LanguageStandard>stdcpp17</LanguageStandard>
105+
<ControlFlowGuard>Guard</ControlFlowGuard>
105106
</ClCompile>
106107
<Link>
107108
<SubSystem>Windows</SubSystem>
@@ -126,6 +127,7 @@
126127
<AdditionalIncludeDirectories>..\iislib;..\CommonLib;</AdditionalIncludeDirectories>
127128
<MultiProcessorCompilation>true</MultiProcessorCompilation>
128129
<LanguageStandard>stdcpp17</LanguageStandard>
130+
<ControlFlowGuard>Guard</ControlFlowGuard>
129131
</ClCompile>
130132
<Link>
131133
<SubSystem>Windows</SubSystem>
@@ -150,6 +152,7 @@
150152
<AdditionalIncludeDirectories>..\iislib;..\CommonLib;</AdditionalIncludeDirectories>
151153
<MultiProcessorCompilation>true</MultiProcessorCompilation>
152154
<LanguageStandard>stdcpp17</LanguageStandard>
155+
<ControlFlowGuard>Guard</ControlFlowGuard>
153156
</ClCompile>
154157
<Link>
155158
<SubSystem>Windows</SubSystem>
@@ -179,6 +182,7 @@
179182
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
180183
<ShowIncludes>false</ShowIncludes>
181184
<LanguageStandard>stdcpp17</LanguageStandard>
185+
<ControlFlowGuard>Guard</ControlFlowGuard>
182186
</ClCompile>
183187
<Link>
184188
<SubSystem>Windows</SubSystem>
@@ -219,4 +223,4 @@
219223
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
220224
<ImportGroup Label="ExtensionTargets">
221225
</ImportGroup>
222-
</Project>
226+
</Project>

0 commit comments

Comments
 (0)