diff --git a/Common.props b/Common.props
index 145eedbef9..2272b1c0b7 100644
--- a/Common.props
+++ b/Common.props
@@ -23,7 +23,6 @@
 		<NoWarn>$(NoWarn);CS1591;SA0001</NoWarn>
 		<Nullable>enable</Nullable>
 		<PlatformTarget>AnyCPU</PlatformTarget>
-		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
 		<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
@@ -36,13 +35,15 @@
 	<PropertyGroup Condition=" '$(MachineExtraCompilationFlag)' != '' ">
 		<DefineConstants>$(DefineConstants);$(MachineExtraCompilationFlag)</DefineConstants>
 	</PropertyGroup>
+	<ItemGroup Condition=" '$(RunStyleCop)' != '' OR '$(ContinuousIntegrationBuild)' != '' ">
+		<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" PrivateAssets="all" />
 		<PackageReference Include="Menees.Analyzers" PrivateAssets="all" />
 		<PackageReference Include="Meziantou.Analyzer" PrivateAssets="all" />
 		<PackageReference Include="Nullable" PrivateAssets="all" />
 		<PackageReference Include="Roslynator.Analyzers" PrivateAssets="all" />
-		<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
 		<Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.Analyzer.dll" />
 		<GlobalAnalyzerConfigFiles Include="$(MSBuildProjectDirectory)/../../.global.editorconfig.ini" />
 		<AdditionalFiles Include="$(MSBuildProjectDirectory)/../../.stylecop.json" />
diff --git a/ExternalCoreProjects/Virtu/Virtu.csproj b/ExternalCoreProjects/Virtu/Virtu.csproj
index b5b41573fd..b3456ff441 100644
--- a/ExternalCoreProjects/Virtu/Virtu.csproj
+++ b/ExternalCoreProjects/Virtu/Virtu.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
+		<RunStyleCop>true</RunStyleCop>
 		<TargetFrameworks>netstandard2.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="$(ProjectDir)../../Common.props" />
diff --git a/ExternalProjects/LibCommon.props b/ExternalProjects/LibCommon.props
index 621e2ff051..75d8ac1758 100644
--- a/ExternalProjects/LibCommon.props
+++ b/ExternalProjects/LibCommon.props
@@ -1,4 +1,7 @@
 <Project>
+	<PropertyGroup>
+		<RunStyleCop>true</RunStyleCop>
+	</PropertyGroup>
 	<Import Project="../Common.props" />
 	<PropertyGroup>
 		<NoWarn>$(NoWarn);BHI1105;MEN018;SA1200</NoWarn>
diff --git a/ExternalToolProjects/ExtToolCommon.props b/ExternalToolProjects/ExtToolCommon.props
index f8cee02797..2fdb134da4 100644
--- a/ExternalToolProjects/ExtToolCommon.props
+++ b/ExternalToolProjects/ExtToolCommon.props
@@ -1,4 +1,7 @@
 <Project>
+	<PropertyGroup>
+		<RunStyleCop>true</RunStyleCop>
+	</PropertyGroup>
 	<Import Project="../Common.props" />
 	<ItemGroup>
 		<AdditionalFiles Include="$(MSBuildThisFileDirectory)/../src/Menees.Analyzers.Settings.xml" />
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index 08de89c382..1ea37b1559 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -17,9 +17,6 @@
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(SolutionDir)' != '' ">
 		<PathMap>$(SolutionDir)=/</PathMap>
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">
-		<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
-	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="all" />
 		<Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.SrcGen.ReflectionCache.dll" />