Actually run all the Analyzers for ext. tools, update Analyzers

fixes 6f372820a
This commit is contained in:
YoshiRulz 2022-07-15 20:46:31 +10:00
parent ece2d8d68c
commit 6b4e526a44
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
7 changed files with 14 additions and 11 deletions

View File

@ -1,12 +1,14 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<AnalysisLevel>5</AnalysisLevel> <AnalysisLevel>5</AnalysisLevel>
<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
<ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild> <ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild>
<EnableNETAnalyzers>true</EnableNETAnalyzers> <EnableNETAnalyzers>true</EnableNETAnalyzers>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<Features>strict</Features> <Features>strict</Features>
<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework> <IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<NoWarn>SA0001</NoWarn>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild> <RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
@ -28,7 +30,13 @@
<DefineConstants>$(DefineConstants);$(MachineExtraCompilationFlag)</DefineConstants> <DefineConstants>$(DefineConstants);$(MachineExtraCompilationFlag)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" /> <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
<PackageReference Include="Menees.Analyzers" Version="3.0.8" PrivateAssets="all" />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.704" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
<Analyzer Include="$(ProjectDir)../../References/BizHawk.Analyzer.dll" />
<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" $(IsTargetingNetFramework) "> <PropertyGroup Condition=" $(IsTargetingNetFramework) ">
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources> <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>

View File

@ -93,6 +93,9 @@
<!-- Use UTC time --> <!-- Use UTC time -->
<Rule Id="MEN013" Action="Hidden" /> <Rule Id="MEN013" Action="Hidden" />
<!-- Prefer TryGetValue -->
<Rule Id="MEN014" Action="Hidden" />
</Rules> </Rules>
<Rules AnalyzerId="Meziantou.Analyzers" RuleNamespace="Meziantou.Analyzers"> <Rules AnalyzerId="Meziantou.Analyzers" RuleNamespace="Meziantou.Analyzers">
<!-- StringComparison is missing --> <!-- StringComparison is missing -->

View File

@ -78,7 +78,7 @@ namespace BizHawk.DBManTool
{ {
get get
{ {
if (String.IsNullOrEmpty(Region)) return 99; if (string.IsNullOrEmpty(Region)) return 99;
if (Region.Contains("World")) return 1; if (Region.Contains("World")) return 1;
if (Region.Contains("USA")) return 2; if (Region.Contains("USA")) return 2;
if (Region.Contains("Europe")) return 3; if (Region.Contains("Europe")) return 3;

View File

@ -5,6 +5,7 @@
<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture> <GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>
<GenerateResourceMSBuildRuntime Condition=" '$(GenerateResourceMSBuildRuntime)' == '' ">CurrentRuntime</GenerateResourceMSBuildRuntime> <GenerateResourceMSBuildRuntime Condition=" '$(GenerateResourceMSBuildRuntime)' == '' ">CurrentRuntime</GenerateResourceMSBuildRuntime>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources> <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<NoWarn>$(NoWarn);SA1400</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Memory" Version="4.5.4" />

View File

@ -1,12 +1,10 @@
<Project> <Project>
<Import Project="../Common.props" /> <Import Project="../Common.props" />
<PropertyGroup> <PropertyGroup>
<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath> <OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild> <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
<None Remove="*.sh" /> <None Remove="*.sh" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -11,10 +11,6 @@
<PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="all" /> <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="all" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
<PackageReference Include="Menees.Analyzers" Version="2.0.4" Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
<PackageReference Include="Meziantou.Analyzer" Version="1.0.704" Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' "/>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333" Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!-- target in Version project generates VersionInfo.gen.cs; note that the Version project MUST BE FIRST in solution file --> <!-- target in Version project generates VersionInfo.gen.cs; note that the Version project MUST BE FIRST in solution file -->

View File

@ -2,7 +2,6 @@
<Import Project="../Common.props" /> <Import Project="../Common.props" />
<PropertyGroup> <PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
<DefineConstants>$(DefineConstants);AVI_SUPPORT</DefineConstants> <DefineConstants>$(DefineConstants);AVI_SUPPORT</DefineConstants>
<DocumentationFile>$(ProjectDir)bin/doc_comments.xml</DocumentationFile> <DocumentationFile>$(ProjectDir)bin/doc_comments.xml</DocumentationFile>
<LangVersion>9.0</LangVersion> <LangVersion>9.0</LangVersion>
@ -11,8 +10,6 @@
<OutputPath>$(ProjectDir)../../output/dll</OutputPath> <OutputPath>$(ProjectDir)../../output/dll</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
<Analyzer Include="$(ProjectDir)../../References/BizHawk.Analyzer.dll" />
<Analyzer Include="$(ProjectDir)../../References/BizHawk.SrcGen.ReflectionCache.dll" /> <Analyzer Include="$(ProjectDir)../../References/BizHawk.SrcGen.ReflectionCache.dll" />
</ItemGroup> </ItemGroup>
</Project> </Project>