diff --git a/.gitignore b/.gitignore
index 3d2f9d7..467d92e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,6 +172,7 @@ StyleCopReport.xml
 *.pgc
 *.pgd
 *.rsp
+!Directory.Build.rsp
 *.sbr
 *.tlb
 *.tli
diff --git a/Directory.Build.rsp b/Directory.Build.rsp
new file mode 100644
index 0000000..1dd1f09
--- /dev/null
+++ b/Directory.Build.rsp
@@ -0,0 +1,2 @@
+/MaxCPUCount
+/NodeReuse:false
\ No newline at end of file
diff --git a/eng/DotNetAnalyzers.props b/eng/DotNetAnalyzers.props
index cddd1b1..8495bd2 100644
--- a/eng/DotNetAnalyzers.props
+++ b/eng/DotNetAnalyzers.props
@@ -6,7 +6,6 @@
     -->
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
-    <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <AnalysisLevel>7.0</AnalysisLevel>
   </PropertyGroup>
diff --git a/eng/DotNetDefaults.props b/eng/DotNetDefaults.props
index 0c6440d..96330a4 100644
--- a/eng/DotNetDefaults.props
+++ b/eng/DotNetDefaults.props
@@ -44,8 +44,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MSBuildTreatWarningsAsErrors>$(IsCIBuild)</MSBuildTreatWarningsAsErrors>
-    <TreatWarningsAsErrors>$(IsCIBuild)</TreatWarningsAsErrors>
+    <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
 </Project>