stash

Author: BrennanConroy

eng/targets/Cpp.Common.props

@@ -20,8 +20,8 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
-    <PlatformToolsetVersion>v143</PlatformToolsetVersion>
-    <PlatformToolset>$(PlatformToolsetVersion)</PlatformToolset>
+    <PlatformToolsetVersion>143</PlatformToolsetVersion>
+    <PlatformToolset>v$(PlatformToolsetVersion)</PlatformToolset>
     <!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
     <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\build\Build.Lib.Settings" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{55494E58-E061-4C4C-A0A8-837008E72F85}</ProjectGuid>
     <RootNamespace>NewCommon</RootNamespace>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  <Import Project="..\..\build\Build.Lib.Settings" />
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\iislib;$(LibNetHostPath)</AdditionalIncludeDirectories>

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/application.h

@@ -77,7 +77,7 @@ class APPLICATION : public IAPPLICATION
 
     virtual
     VOID
-    StopInternal(bool fServerInitiated)
+    StopInternal(bool fServerInitiated) noexcept
     {
         UNREFERENCED_PARAMETER(fServerInitiated);
     }

src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj

@@ -9,7 +9,7 @@
     <ProjectGuid>{1eac8125-1765-4e2d-8cbe-56dc98a1c8c1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>$(PlatformToolsetVersion)</PlatformToolset>
+    <PlatformToolset>v$(PlatformToolsetVersion)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <IsTestProject>true</IsTestProject>
     <DisableArcadeTestFramework>true</DisableArcadeTestFramework>

src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset

@@ -46,7 +46,7 @@
     <Rule Id="C26435" Action="Error" />
     <Rule Id="C26436" Action="Error" />
     <Rule Id="C26437" Action="Error" />
-    <Rule Id="C26438" Action="Error" />
+    <Rule Id="C26438" Action="None" /> <!-- Avoid goto -->
     <Rule Id="C26439" Action="Error" />
     <Rule Id="C26440" Action="Error" />
     <Rule Id="C26441" Action="Error" />

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

@@ -5,6 +5,7 @@
     <ProjectGuid>{09D9D1D6-2951-4E14-BC35-76A23CF9391A}</ProjectGuid>
     <RootNamespace>IISLib</RootNamespace>
     <ProjectName>IISLib</ProjectName>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <WholeProgramOptimization>true</WholeProgramOptimization>

src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp

@@ -9,7 +9,7 @@
 HRESULT AppOfflineTrackingApplication::StartMonitoringAppOffline()
 {
     LOG_INFOF(L"Starting app_offline monitoring in application '%ls'", m_applicationPath.c_str());
-    HRESULT hr = StartMonitoringAppOflineImpl();
+    const HRESULT hr = StartMonitoringAppOflineImpl();
 
     if (FAILED_LOG(hr))
     {

src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj

@@ -7,6 +7,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CAC1267B-8778-4257-AAC6-CAF481723B01}</ProjectGuid>
     <RootNamespace>gtest</RootNamespace>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <TargetName>gtest</TargetName>

src/Servers/IIS/Directory.Build.props

@@ -8,6 +8,6 @@
     <HostArch Condition="'$(Platform)' == 'AnyCPU'">x64</HostArch>
     <LibNetHostPath>$(NetCoreTargetingPackRoot)Microsoft.NETCore.App.Host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native</LibNetHostPath>
     <!-- This tools version MUST match the same version as runtime uses to compile libnethost.lib -->
-    <PlatformToolsetVersion>v142</PlatformToolsetVersion>
+    <PlatformToolsetVersion>143</PlatformToolsetVersion>
   </PropertyGroup>
 </Project>

src/Servers/IIS/build/Build.Common.Settings

@@ -32,6 +32,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
 
+  <PropertyGroup>
+     <CodeAnalysisRuleSet>..\DefaultRules.ruleset</CodeAnalysisRuleSet>
+     <RunCodeAnalysis Condition="'$(VCToolsRedistVersion)' != '' AND '$(VCToolsRedistVersion)' >= 14.15.26706">true</RunCodeAnalysis>
+     <EnablePREfast>$(RunCodeAnalysis)</EnablePREfast>
+   </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>