diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index c561e8640f..f38ed8c627 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -8,8 +8,8 @@
 	<ItemGroup>
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" PrivateAssets="All" />
 		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="All" />
-	</ItemGroup>
-	<ItemGroup>
+		<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113"
+			Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
 		<Compile Include="$(SolutionDir)Version/svnrev.cs" />
 		<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
 		<Compile Remove="Extensions/BinaryReaderExtensions.cs" />
diff --git a/Common.props b/Common.props
index 32fc3af1e8..e9fb940623 100644
--- a/Common.props
+++ b/Common.props
@@ -6,6 +6,8 @@
 		<LangVersion>8.0</LangVersion>
 		<OutputPath>$(SolutionDir)output/dll</OutputPath>
 		<PlatformTarget>x64</PlatformTarget>
+		<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
+		<RunCodeAnalysis>false</RunCodeAnalysis>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
 		<DebugSymbols>true</DebugSymbols>
@@ -21,6 +23,5 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<AdditionalFiles Include="$(SolutionDir).stylecop.json" />
-		<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113" PrivateAssets="All" />
 	</ItemGroup>
 </Project>
diff --git a/Dist/BuildAndPackage.bat b/Dist/BuildAndPackage.bat
index 81968cf7ea..fee5db752b 100644
--- a/Dist/BuildAndPackage.bat
+++ b/Dist/BuildAndPackage.bat
@@ -14,7 +14,7 @@ for /f "usebackq tokens=*" %%A in (`vswhere -version "[16.0,17.0)" -requires Mic
 IF "%MSBUILDPATH%"=="" GOTO MISSINGMSBUILD
 
 nuget restore ..\BizHawk.sln
-call "%MSBUILDPATH%" ..\BizHawk.sln /p:Configuration=Release /p:Platform="Any Cpu" /t:rebuild
+call "%MSBUILDPATH%" ..\BizHawk.sln "/p:Configuration=Release;Platform=AnyCPU;MachineRunAnalyzersDuringBuild=true" /t:rebuild
 
 @if errorlevel 1 goto MSBUILDFAILED