diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-11-16 16:47:07 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-11-17 19:06:00 -0600 |
| commit | 7a942746bc535d319bdfa7f17025347ac6913ba2 (patch) | |
| tree | 0ee11240191de3d2b685714b402c1e237f7561cf | |
| parent | e71de85e4ec2899ecd01ac236603cf1dddc4a6c7 (diff) | |
| download | wix-7a942746bc535d319bdfa7f17025347ac6913ba2.tar.gz wix-7a942746bc535d319bdfa7f17025347ac6913ba2.tar.bz2 wix-7a942746bc535d319bdfa7f17025347ac6913ba2.zip | |
Ignore C26812 warning for C style enums.
| -rw-r--r-- | src/Cpp.Build.props | 4 | ||||
| -rw-r--r-- | src/CustomizedNativeRecommendedRules.ruleset | 8 | ||||
| -rw-r--r-- | src/engine/engine.vcxproj | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index ebbf9f71..4d2da36f 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props | |||
| @@ -16,6 +16,10 @@ | |||
| 16 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | 16 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> |
| 17 | </PropertyGroup> | 17 | </PropertyGroup> |
| 18 | 18 | ||
| 19 | <PropertyGroup> | ||
| 20 | <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| 21 | </PropertyGroup> | ||
| 22 | |||
| 19 | <ItemDefinitionGroup> | 23 | <ItemDefinitionGroup> |
| 20 | <ClCompile> | 24 | <ClCompile> |
| 21 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | 25 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> |
diff --git a/src/CustomizedNativeRecommendedRules.ruleset b/src/CustomizedNativeRecommendedRules.ruleset new file mode 100644 index 00000000..142b141c --- /dev/null +++ b/src/CustomizedNativeRecommendedRules.ruleset | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <RuleSet Name="Customized Microsoft Native Recommended Rules" Description="Microsoft Native Recommended Rules, -C26812" ToolsVersion="16.0"> | ||
| 3 | <Include Path="nativerecommendedrules.ruleset" Action="Default" /> | ||
| 4 | <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native"> | ||
| 5 | <!-- We need C style enums since we support BAs written in C --> | ||
| 6 | <Rule Id="C26812" Action="None" /> | ||
| 7 | </Rules> | ||
| 8 | </RuleSet> \ No newline at end of file | ||
diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj index 84717941..28085ed4 100644 --- a/src/engine/engine.vcxproj +++ b/src/engine/engine.vcxproj | |||
| @@ -175,4 +175,4 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command> | |||
| 175 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> | 175 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> |
| 176 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | 176 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> |
| 177 | </Target> | 177 | </Target> |
| 178 | </Project> | 178 | </Project> \ No newline at end of file |