diff --git a/eng/config/globalconfigs/Common.globalconfig b/eng/config/globalconfigs/Common.globalconfig
new file mode 100644
index 0000000000000..667d755443434
--- /dev/null
+++ b/eng/config/globalconfigs/Common.globalconfig
@@ -0,0 +1,99 @@
+is_global = true
+
+dotnet_diagnostic.CA1067.severity = warning
+dotnet_diagnostic.CA1068.severity = warning
+dotnet_diagnostic.CA1200.severity = warning
+dotnet_diagnostic.CA1821.severity = warning
+
+dotnet_diagnostic.IDE0055.severity = warning
+
+dotnet_diagnostic.RS1001.severity = none
+dotnet_diagnostic.RS1002.severity = none
+dotnet_diagnostic.RS1003.severity = none
+dotnet_diagnostic.RS1004.severity = none
+dotnet_diagnostic.RS1005.severity = none
+dotnet_diagnostic.RS1006.severity = none
+dotnet_diagnostic.RS1008.severity = none
+dotnet_diagnostic.RS1009.severity = none
+dotnet_diagnostic.RS1010.severity = none
+dotnet_diagnostic.RS1011.severity = none
+dotnet_diagnostic.RS1012.severity = none
+dotnet_diagnostic.RS1013.severity = none
+dotnet_diagnostic.RS1014.severity = warning
+# https://github.com/dotnet/roslyn/issues/26420: Enable rule RS1022 for Roslyn.sln
+dotnet_diagnostic.RS1022.severity = none
+# RS1024: Compare symbols correctly
+dotnet_diagnostic.RS1024.severity = refactoring
+
+dotnet_diagnostic.AD0001.severity = error
+
+dotnet_diagnostic.RS0001.severity = warning
+dotnet_diagnostic.RS0002.severity = warning
+dotnet_diagnostic.RS0006.severity = error
+dotnet_diagnostic.RS0012.severity = warning
+dotnet_diagnostic.RS0014.severity = warning
+dotnet_diagnostic.RS0015.severity = warning
+dotnet_diagnostic.RS0016.severity = error
+dotnet_diagnostic.RS0017.severity = error
+dotnet_diagnostic.RS0018.severity = warning
+dotnet_diagnostic.RS0022.severity = error
+dotnet_diagnostic.RS0023.severity = error
+dotnet_diagnostic.RS0024.severity = error
+dotnet_diagnostic.RS0025.severity = error
+dotnet_diagnostic.RS0026.severity = error
+dotnet_diagnostic.RS0027.severity = error
+# RS0040: Defaultable types should have defaultable fields
+dotnet_diagnostic.RS0040.severity = none
+# RS0046: Avoid the 'Opt' suffix in nullable-enabled code (too noisy right now)
+dotnet_diagnostic.RS0046.severity = suggestion
+# RS0047: (Suppressor) The 'Type.FullName' property is never null when using the syntax 'typeof(T).FullName'
+dotnet_diagnostic.RS0047.severity = none
+
+# allow skipped tests, with a code fix to unskip them
+dotnet_diagnostic.xUnit1004.severity = refactoring
+# xUnit2006: "do not use generic Assert.Equal to test string equality" is a valid assert, but very noisy right now
+dotnet_diagnostic.xUnit2006.severity = none
+# xUnit2009: "do not use Assert.True to check for substrings" is a valid assert, but very noisy right now
+dotnet_diagnostic.xUnit2009.severity = none
+# xUnit2012: "do not use Enumerable.Any() to check if a value exists in a collection" is a valid assert, but very noisy right now
+dotnet_diagnostic.xUnit2012.severity = none
+# xUnit2013: "do not use Assert.Equal() to check for collection size" is a valid assert, but very noisy right now
+dotnet_diagnostic.xUnit2013.severity = none
+# xUnit2017: "do not use Contains() to check if a value exists in a collection" is a valid assert, but very noisy right now
+dotnet_diagnostic.xUnit2017.severity = none
+
+# https://github.com/Microsoft/VSSDK-Analyzers/blob/master/doc/index.md
+# VSSDK001: Derive from AsyncPackage
+dotnet_diagnostic.VSSDK001.severity = warning
+# VSSDK003: Support async tool windows
+dotnet_diagnostic.VSSDK003.severity = warning
+# VSSDK006: Remove suppression. https://github.com/dotnet/roslyn/issues/38471
+dotnet_diagnostic.VSSDK006.severity = none
+
+# VSTHRD002: Avoid problematic synchronous waits
+dotnet_diagnostic.VSTHRD002.severity = none
+# VSTHRD003: Avoid awaiting foreign Tasks https://github.com/dotnet/roslyn/issues/34331
+dotnet_diagnostic.VSTHRD003.severity = none
+# VSTHRD103: Call async methods when in an async method
+dotnet_diagnostic.VSTHRD103.severity = none
+# VSTHRD010: Invoke single-threaded types on Main thread https://github.com/dotnet/roslyn/issues/29275
+dotnet_diagnostic.VSTHRD010.severity = none
+# VSTHRD110: Observe result of async calls
+dotnet_diagnostic.VSTHRD110.severity = none
+
+dotnet_diagnostic.HAA0101.severity = none
+dotnet_diagnostic.HAA0102.severity = none
+dotnet_diagnostic.HAA0201.severity = none
+dotnet_diagnostic.HAA0202.severity = none
+dotnet_diagnostic.HAA0301.severity = none
+dotnet_diagnostic.HAA0302.severity = none
+dotnet_diagnostic.HAA0303.severity = none
+dotnet_diagnostic.HAA0401.severity = none
+dotnet_diagnostic.HAA0501.severity = none
+dotnet_diagnostic.HAA0502.severity = none
+dotnet_diagnostic.HAA0503.severity = none
+dotnet_diagnostic.HAA0506.severity = none
+dotnet_diagnostic.HAA0601.severity = none
+dotnet_diagnostic.HAA0602.severity = none
+dotnet_diagnostic.HAA0603.severity = none
+dotnet_diagnostic.HeapAnalyzerReadonlyMethodGroupAllocationRule.severity = none
diff --git a/eng/config/globalconfigs/NonShipping.globalconfig b/eng/config/globalconfigs/NonShipping.globalconfig
new file mode 100644
index 0000000000000..53c6ef6801131
--- /dev/null
+++ b/eng/config/globalconfigs/NonShipping.globalconfig
@@ -0,0 +1,25 @@
+is_global = true
+
+# For tests, the ConfigureAwait(true) is good enough. Either they are already running on a thread pool
+# thread where ConfigureAwait(false) does nothing, or we're running the workload from an STA thread
+# where we want to marshal the continuations back to it.
+dotnet_diagnostic.CA2007.severity = none
+
+# Mark constant field as 'const' instead of static readonly - not useful for tests
+dotnet_diagnostic.CA1802.severity = none
+
+# CodeFix providers should override GetFixAllProvider - suppress for non-shipping/test projects
+dotnet_diagnostic.RS1016.severity = none
+# DiagnosticId must be unique across analyzers - suppress for non-shipping/test projects
+dotnet_diagnostic.RS1019.severity = none
+# Configure generated code analysis - suppress for non-shipping/test projects
+dotnet_diagnostic.RS1025.severity = none
+# Enable concurrent execution - suppress for non-shipping/test projects
+dotnet_diagnostic.RS1026.severity = none
+# Do not use generic CodeAction.Create to create CodeAction - not useful for tests
+dotnet_diagnostic.RS0005.severity = none
+# Do not call 'GetTestAccessor()' from production code: does not apply to tests
+dotnet_diagnostic.RS0043.severity = none
+
+# VSTHRD200: Use "Async" suffix for async methods
+dotnet_diagnostic.VSTHRD200.severity = none
diff --git a/eng/config/globalconfigs/Shipping.globalconfig b/eng/config/globalconfigs/Shipping.globalconfig
new file mode 100644
index 0000000000000..8fc5d1432e09f
--- /dev/null
+++ b/eng/config/globalconfigs/Shipping.globalconfig
@@ -0,0 +1,6 @@
+is_global = true
+
+dotnet_diagnostic.CA1802.severity = warning
+dotnet_diagnostic.CA2007.severity = warning
+
+dotnet_diagnostic.RS0005.severity = warning
diff --git a/eng/config/rulesets/NonShipping.ruleset b/eng/config/rulesets/NonShipping.ruleset
deleted file mode 100644
index 29d0ee3f8b077..0000000000000
--- a/eng/config/rulesets/NonShipping.ruleset
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Common diagnostic rules for all non-shipping projects" Description="Enables/disable rules specific to all non-shipping projects." ToolsVersion="14.0">
-  <Include Path=".\Shipping.ruleset" Action="Default" />
-
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
-    <!-- For tests, the ConfigureAwait(true) is good enough. Either they are already running on a thread pool
-         thread where ConfigureAwait(false) does nothing, or we're running the workload from an STA thread
-         where we want to marshal the continuations back to it. -->
-    <Rule Id="CA2007" Action="None" />
-
-    <!-- Mark constant field as 'const' instead of static readonly - not useful for tests -->
-    <Rule Id="CA1802" Action="None" />
-  </Rules>
-
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.Analyzers">
-    <Rule Id="RS1001" Action="None" />
-
-    <!-- CodeFix providers should override GetFixAllProvider - suppress for non-shipping/test projects -->
-    <Rule Id="RS1016" Action="None" />
-
-    <!-- DiagnosticId must be unique across analyzers - suppress for non-shipping/test projects -->
-    <Rule Id="RS1019" Action="None" />
-
-    <!-- Configure generated code analysis - suppress for non-shipping/test projects -->
-    <Rule Id="RS1025" Action="None" />
-
-    <!-- Enable concurrent execution - suppress for non-shipping/test projects -->
-    <Rule Id="RS1026" Action="None" />
-
-    <!-- Do not use generic CodeAction.Create to create CodeAction - not useful for tests -->
-    <Rule Id="RS0005" Action="None" />
-
-    <!-- Do not call 'GetTestAccessor()' from production code: does not apply to tests -->
-    <Rule Id="RS0043" Action="None" />
-  </Rules>
-
-  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
-    <Rule Id="VSTHRD200" Action="None" /> <!-- Use "Async" suffix for async methods -->
-  </Rules>
-</RuleSet>
diff --git a/eng/config/rulesets/Shipping.ruleset b/eng/config/rulesets/Shipping.ruleset
deleted file mode 100644
index cda6d034d71a8..0000000000000
--- a/eng/config/rulesets/Shipping.ruleset
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Common diagnostic rules to run during build for all shipping Roslyn projects" Description="This file contains diagnostic settings used by all Roslyn projects. Projects that need specific settings should have their own rule set files that Include this one, and then make the necessary adjustments." ToolsVersion="14.0">
-  <IncludeAll Action="Hidden" />
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
-    <Rule Id="CA1067" Action="Warning" />
-    <Rule Id="CA1068" Action="Warning" />
-    <Rule Id="CA1200" Action="Warning" />
-    <Rule Id="CA1802" Action="Warning" />
-    <Rule Id="CA1821" Action="Warning" />
-    <Rule Id="CA2007" Action="Warning" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.CodeStyle" RuleNamespace="Microsoft.CodeAnalysis.CodeStyle">
-    <Rule Id="IDE0055" Action="Warning" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.Analyzers">
-    <Rule Id="RS1001" Action="None" />
-    <Rule Id="RS1002" Action="None" />
-    <Rule Id="RS1003" Action="None" />
-    <Rule Id="RS1004" Action="None" />
-    <Rule Id="RS1005" Action="None" />
-    <Rule Id="RS1006" Action="None" />
-    <Rule Id="RS1008" Action="None" />
-    <Rule Id="RS1009" Action="None" />
-    <Rule Id="RS1010" Action="None" />
-    <Rule Id="RS1011" Action="None" />
-    <Rule Id="RS1012" Action="None" />
-    <Rule Id="RS1013" Action="None" />
-    <Rule Id="RS1014" Action="Warning" />
-    <Rule Id="RS1022" Action="None" /> <!-- https://github.com/dotnet/roslyn/issues/26420: Enable rule RS1022 for Roslyn.sln -->
-    <Rule Id="RS1024" Action="Hidden" /> <!-- Compare symbols correctly -->
-  </Rules>
-  <Rules AnalyzerId="Roslyn.Core" RuleNamespace="Roslyn.Core">
-    <Rule Id="AD0001" Action="Error" />
-  </Rules>
-  <Rules AnalyzerId="Roslyn.Diagnostic.Analyzers" RuleNamespace="Roslyn.Diagnostics.Analyzers">
-    <Rule Id="RS0001" Action="Warning" />
-    <Rule Id="RS0002" Action="Warning" />
-    <Rule Id="RS0005" Action="Warning" />
-    <Rule Id="RS0006" Action="Error" />
-    <Rule Id="RS0012" Action="Warning" />
-    <Rule Id="RS0014" Action="Warning" />
-    <Rule Id="RS0015" Action="Warning" />
-    <Rule Id="RS0016" Action="Error" />
-    <Rule Id="RS0017" Action="Error" />
-    <Rule Id="RS0018" Action="Warning" />
-    <Rule Id="RS0022" Action="Error" />
-    <Rule Id="RS0023" Action="Error" />
-    <Rule Id="RS0024" Action="Error" />
-    <Rule Id="RS0025" Action="Error" />
-    <Rule Id="RS0026" Action="Error" />
-    <Rule Id="RS0027" Action="Error" />
-    <Rule Id="RS0040" Action="None" /> <!-- Defaultable types should have defaultable fields -->
-    <Rule Id="RS0046" Action="Info" /> <!-- Avoid the 'Opt' suffix in nullable-enabled code (too noisy right now) -->
-    <Rule Id="RS0047" Action="None" /> <!-- (Suppressor) The 'Type.FullName' property is never null when using the syntax 'typeof(T).FullName' -->
-  </Rules>
-  <Rules AnalyzerId="xunit.analyzers" RuleNamespace="Xunit.Analyzers">
-    <Rule Id="xUnit1004" Action="Hidden" /> <!-- allow skipped tests, with a code fix to unskip them -->
-    <Rule Id="xUnit2006" Action="None" /> <!-- "do not use generic Assert.Equal to test string equality" is a valid assert, but very noisy right now -->
-    <Rule Id="xUnit2009" Action="None" /> <!-- "do not use Assert.True to check for substrings" is a valid assert, but very noisy right now -->
-    <Rule Id="xUnit2012" Action="None" /> <!-- "do not use Enumerable.Any() to check if a value exists in a collection" is a valid assert, but very noisy right now -->
-    <Rule Id="xUnit2013" Action="None" /> <!-- "do not use Assert.Equal() to check for collection size" is a valid assert, but very noisy right now -->
-    <Rule Id="xUnit2017" Action="None" /> <!-- "do not use Contains() to check if a value exists in a collection" is a valid assert, but very noisy right now -->
-  </Rules>
-  <Rules AnalyzerId="Microsoft.VisualStudio.SDK.Analyzers" RuleNamespace="Microsoft.VisualStudio.SDK.Analyzers">
-    <!-- https://github.com/Microsoft/VSSDK-Analyzers/blob/master/doc/index.md -->
-    <Rule Id="VSSDK001" Action="Warning" /> <!-- Derive from AsyncPackage -->
-    <Rule Id="VSSDK003" Action="Warning" /> <!-- Support async tool windows -->
-    <Rule Id="VSSDK006" Action="None" /> <!-- Remove suppression. https://github.com/dotnet/roslyn/issues/38471 -->
-  </Rules>
-  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
-    <Rule Id="VSTHRD002" Action="None" /> <!-- Avoid problematic synchronous waits -->
-    <Rule Id="VSTHRD003" Action="None" /> <!-- Avoid awaiting foreign Tasks https://github.com/dotnet/roslyn/issues/34331 -->
-    <Rule Id="VSTHRD103" Action="None" /> <!-- Call async methods when in an async method -->
-    <Rule Id="VSTHRD010" Action="None" /> <!-- Invoke single-threaded types on Main thread https://github.com/dotnet/roslyn/issues/29275 -->
-    <Rule Id="VSTHRD110" Action="None" /> <!-- Observe result of async calls -->
-  </Rules>
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers">
-    <Rule Id="HAA0101" Action="None" />
-    <Rule Id="HAA0102" Action="None" />
-    <Rule Id="HAA0201" Action="None" />
-    <Rule Id="HAA0202" Action="None" />
-    <Rule Id="HAA0301" Action="None" />
-    <Rule Id="HAA0302" Action="None" />
-    <Rule Id="HAA0303" Action="None" />
-    <Rule Id="HAA0401" Action="None" />
-    <Rule Id="HAA0501" Action="None" />
-    <Rule Id="HAA0502" Action="None" />
-    <Rule Id="HAA0503" Action="None" />
-    <Rule Id="HAA0506" Action="None" />
-    <Rule Id="HAA0601" Action="None" />
-    <Rule Id="HAA0602" Action="None" />
-    <Rule Id="HAA0603" Action="None" />
-    <Rule Id="HeapAnalyzerReadonlyMethodGroupAllocationRule" Action="None" />
-  </Rules>
-</RuleSet>
diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets
index 4cbf2d6f342c2..71fe5f248439d 100644
--- a/eng/targets/Imports.targets
+++ b/eng/targets/Imports.targets
@@ -100,11 +100,15 @@
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
 
-  <!-- Rulesets -->
-  <PropertyGroup Condition="'$(CodeAnalysisRuleSet)' == ''">
-    <CodeAnalysisRuleSet Condition="'$(IsShipping)' == 'true'">$(RepositoryEngineeringDir)config\rulesets\Shipping.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(IsShipping)' != 'true'">$(RepositoryEngineeringDir)config\rulesets\NonShipping.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+  <!-- Global Analyzer Config -->
+  <ItemGroup>
+    <!-- Always include Common.globalconfig -->
+    <EditorConfigFiles Include="$(RepositoryEngineeringDir)config\globalconfigs\Common.globalconfig" />
+    <!-- Include Shipping.globalconfig for shipping projects -->
+    <EditorConfigFiles Condition="'$(IsShipping)' == 'true'" Include="$(RepositoryEngineeringDir)config\globalconfigs\Shipping.globalconfig" />
+    <!-- Include NonShipping.globalconfig for non-shipping projects -->
+    <EditorConfigFiles Condition="'$(IsShipping)' != 'true'" Include="$(RepositoryEngineeringDir)config\globalconfigs\NonShipping.globalconfig" />
+  </ItemGroup>
 
   <!--
     Some dependencies bring in references to UIAutomationClient and UIAutomationTypes. These conflict with the faster