diff --git a/Common.props b/Common.props
index 5866b09689..5cbece6df9 100644
--- a/Common.props
+++ b/Common.props
@@ -1,12 +1,14 @@
 <Project>
 	<PropertyGroup>
 		<AnalysisLevel>5</AnalysisLevel>
+		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
 		<ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<ErrorReport>prompt</ErrorReport>
 		<Features>strict</Features>
 		<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
 		<LangVersion>10.0</LangVersion>
+		<NoWarn>SA0001</NoWarn>
 		<Nullable>enable</Nullable>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
@@ -28,7 +30,13 @@
 		<DefineConstants>$(DefineConstants);$(MachineExtraCompilationFlag)</DefineConstants>
 	</PropertyGroup>
 	<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>
 	<PropertyGroup Condition=" $(IsTargetingNetFramework) ">
 		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
diff --git a/Common.ruleset b/Common.ruleset
index d85dc06d21..6e5cf4c0c4 100644
--- a/Common.ruleset
+++ b/Common.ruleset
@@ -93,6 +93,9 @@
 
 		<!-- Use UTC time -->
 		<Rule Id="MEN013" Action="Hidden" />
+
+		<!-- Prefer TryGetValue -->
+		<Rule Id="MEN014" Action="Hidden" />
 	</Rules>
 	<Rules AnalyzerId="Meziantou.Analyzers" RuleNamespace="Meziantou.Analyzers">
 		<!-- StringComparison is missing -->
diff --git a/ExternalToolProjects/DBMan/DB.cs b/ExternalToolProjects/DBMan/DB.cs
index af12667bf7..fb7451f5aa 100644
--- a/ExternalToolProjects/DBMan/DB.cs
+++ b/ExternalToolProjects/DBMan/DB.cs
@@ -78,7 +78,7 @@ namespace BizHawk.DBManTool
 		{
 			get
 			{
-				if (String.IsNullOrEmpty(Region)) return 99;
+				if (string.IsNullOrEmpty(Region)) return 99;
 				if (Region.Contains("World")) return 1;
 				if (Region.Contains("USA")) return 2;
 				if (Region.Contains("Europe")) return 3;
diff --git a/ExternalToolProjects/DBMan/DBMan.csproj b/ExternalToolProjects/DBMan/DBMan.csproj
index 86fc90b9c9..e379858539 100644
--- a/ExternalToolProjects/DBMan/DBMan.csproj
+++ b/ExternalToolProjects/DBMan/DBMan.csproj
@@ -5,6 +5,7 @@
 		<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>
 		<GenerateResourceMSBuildRuntime Condition=" '$(GenerateResourceMSBuildRuntime)' == '' ">CurrentRuntime</GenerateResourceMSBuildRuntime>
 		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+		<NoWarn>$(NoWarn);SA1400</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="System.Memory" Version="4.5.4" />
diff --git a/ExternalToolProjects/ExtToolCommon.props b/ExternalToolProjects/ExtToolCommon.props
index 55ca5c547f..55baa7dcee 100644
--- a/ExternalToolProjects/ExtToolCommon.props
+++ b/ExternalToolProjects/ExtToolCommon.props
@@ -1,12 +1,10 @@
 <Project>
 	<Import Project="../Common.props" />
 	<PropertyGroup>
-		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
 		<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 	</PropertyGroup>
 	<ItemGroup>
-		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
 		<None Remove="*.sh" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj
index 4d511a3fae..a477a33a5b 100644
--- a/src/BizHawk.Common/BizHawk.Common.csproj
+++ b/src/BizHawk.Common/BizHawk.Common.csproj
@@ -11,10 +11,6 @@
 		<PackageReference Include="System.Memory" Version="4.5.4" />
 		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="all" />
 		<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>
 		<!-- target in Version project generates VersionInfo.gen.cs; note that the Version project MUST BE FIRST in solution file -->
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index 32b238606a..83160ae388 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -2,7 +2,6 @@
 	<Import Project="../Common.props" />
 	<PropertyGroup>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
 		<DefineConstants>$(DefineConstants);AVI_SUPPORT</DefineConstants>
 		<DocumentationFile>$(ProjectDir)bin/doc_comments.xml</DocumentationFile>
 		<LangVersion>9.0</LangVersion>
@@ -11,8 +10,6 @@
 		<OutputPath>$(ProjectDir)../../output/dll</OutputPath>
 	</PropertyGroup>
 	<ItemGroup>
-		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
-		<Analyzer Include="$(ProjectDir)../../References/BizHawk.Analyzer.dll" />
 		<Analyzer Include="$(ProjectDir)../../References/BizHawk.SrcGen.ReflectionCache.dll" />
 	</ItemGroup>
 </Project>