Skip to content

Commit 389d3d3

Browse files
[release/10.0] Enable spectre mitigations for ANCM binaries (#63728)
* Enable spectre mitigations for ANCM binaries * Set property as well * Revert "Set property as well" This reverts commit b573d8a. --------- Co-authored-by: wtgodbe <[email protected]>
1 parent 8ee2dbb commit 389d3d3

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<SDLCheck>true</SDLCheck>
6464
<AdditionalIncludeDirectories>$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<MultiProcessorCompilation>true</MultiProcessorCompilation>
66-
<AdditionalOptions>/guard:cf</AdditionalOptions>
66+
<AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
6767
</ClCompile>
6868
<Link>
6969
<AdditionalDependencies>httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;Version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<!-- See https://github.com/dotnet/aspnetcore/issues/40525 -->
2828
<WarningLevel>Level4</WarningLevel>
2929
<TreatSpecificWarningsAsErrors>$(TreatSpecificWarningsAsErrors);4018;4055;4146;4242;4244;4267;4302;4308;4509;4510;4532;4533;4610;4611;4700;4701;4703;4789;4995;4996</TreatSpecificWarningsAsErrors>
30-
<AdditionalOptions>/guard:cf</AdditionalOptions>
30+
<AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
3131
</ClCompile>
3232
</ItemDefinitionGroup>
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ClCompile>
1717
<PreprocessorDefinitions>_USRDLL;ASPNETCOREMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1818
<AdditionalIncludeDirectories>..\IISLib;.\Inc;..\CommonLib;$(LibNetHostPath)</AdditionalIncludeDirectories>
19-
<AdditionalOptions>/guard:cf</AdditionalOptions>
19+
<AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
2020
</ClCompile>
2121
<Link>
2222
<AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;libnethost.lib</AdditionalDependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ClCompile>
1717
<PreprocessorDefinitions>REQUESTHANDLER_EXPORTS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1818
<AdditionalIncludeDirectories>..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib</AdditionalIncludeDirectories>
19-
<AdditionalOptions>/guard:cf</AdditionalOptions>
19+
<AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
2020
</ClCompile>
2121
<Link>
2222
<AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;$(LibNetHostPath)\libnethost.lib</AdditionalDependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ClCompile>
1717
<PreprocessorDefinitions>REQUESTHANDLER_EXPORTS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1818
<AdditionalIncludeDirectories>..\IISLib;..\CommonLib;.\Inc;..\RequestHandlerLib</AdditionalIncludeDirectories>
19-
<AdditionalOptions>/guard:cf</AdditionalOptions>
19+
<AdditionalOptions>/guard:cf /Qspectre</AdditionalOptions>
2020
</ClCompile>
2121
<Link>
2222
<AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;ws2_32.lib;iphlpapi.lib;version.lib;Rpcrt4.lib;winhttp.lib</AdditionalDependencies>

0 commit comments

Comments
 (0)