diff --git a/src/CodeStyle/BannedSymbols.txt b/src/CodeStyle/BannedSymbols.txt
index c606990637777..c51a56fbf653e 100644
--- a/src/CodeStyle/BannedSymbols.txt
+++ b/src/CodeStyle/BannedSymbols.txt
@@ -1,8 +1,7 @@
-P:Microsoft.CodeAnalysis.Project.LanguageServices; Use 'GetExtendedLanguageServices' instead in CodeStyle layer (preprocessor variable 'CODE_STYLE')
-M:Microsoft.CodeAnalysis.Host.HostWorkspaceServices.GetLanguageServices(System.String); Use 'GetExtendedLanguageServices' or directly get the language service by invoking 'GetLanguageService' or 'GetRequiredLanguageService' in CodeStyle layer (preprocessor variable 'CODE_STYLE')
+P:Microsoft.CodeAnalysis.Project.LanguageServices; Use 'GetExtendedLanguageServices' instead
+M:Microsoft.CodeAnalysis.Host.HostWorkspaceServices.GetLanguageServices(System.String); Use 'GetExtendedLanguageServices' or directly get the language service by invoking 'GetLanguageService' or 'GetRequiredLanguageService'
 T:Microsoft.CodeAnalysis.Options.OptionSet; 'OptionSet' is not available in CodeStyle layer. Add a using/Imports statement defining 'OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions' when preprocessor variable 'CODE_STYLE' is defined
-T:Microsoft.CodeAnalysis.CodeStyle.CodeStyleOption`1; Use 'Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption' instead in CodeStyle layer (preprocessor variable 'CODE_STYLE')
-T:Microsoft.CodeAnalysis.CodeStyle.CodeStyleOptions; Use 'Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions' instead in CodeStyle layer (preprocessor variable 'CODE_STYLE')
-T:Microsoft.CodeAnalysis.Options.IOption; Use 'Microsoft.CodeAnalysis.Internal.Options.IOption'  instead in CodeStyle layer (preprocessor variable 'CODE_STYLE')
-T:Microsoft.CodeAnalysis.Options.OptionKey; Use 'Microsoft.CodeAnalysis.Internal.Options.OptionKey' instead in CodeStyle layer (preprocessor variable 'CODE_STYLE')
-T:Microsoft.CodeAnalysis.CodeStyle.NotificationOption; Use 'Microsoft.CodeAnalysis.Internal.Options.NotificationOption' instead in CodeStyle layer (preprocessor variable 'CODE_STYLE')
\ No newline at end of file
+T:Microsoft.CodeAnalysis.CodeStyle.CodeStyleOption`1; Use 'Microsoft.CodeAnalysis.CodeStyle.CodeStyleOption2' instead
+T:Microsoft.CodeAnalysis.CodeStyle.CodeStyleOptions; Use 'Microsoft.CodeAnalysis.CodeStyle.CodeStyleOptions2' instead
+T:Microsoft.CodeAnalysis.Options.OptionKey; Use 'Microsoft.CodeAnalysis.Options.OptionKey2' instead
+T:Microsoft.CodeAnalysis.CodeStyle.NotificationOption; Use 'Microsoft.CodeAnalysis.CodeStyle.NotificationOption2' instead
\ No newline at end of file
diff --git a/src/CodeStyle/CSharp/Analyzers/PublicAPI.Shipped.txt b/src/CodeStyle/CSharp/Analyzers/PublicAPI.Shipped.txt
index 70dcbbe5a8839..e69de29bb2d1d 100644
--- a/src/CodeStyle/CSharp/Analyzers/PublicAPI.Shipped.txt
+++ b/src/CodeStyle/CSharp/Analyzers/PublicAPI.Shipped.txt
@@ -1,56 +0,0 @@
-Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Ignore = 1 -> Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Remove = 2 -> Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Single = 0 -> Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.LeftMost = 0 -> Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.NoIndent = 2 -> Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions
-Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.OneLess = 1 -> Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBlock.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentBraces.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchCaseSection.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchCaseSectionWhenBlock.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.IndentSwitchSection.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.LabelPositioning.get -> Microsoft.CodeAnalysis.Internal.Options.Option<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForCatch.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForClausesInQuery.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForElse.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForFinally.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInAnonymousTypes.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLineForMembersInObjectInit.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAccessors.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousMethods.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInAnonymousTypes.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInControlBlocks.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInLambdaExpressionBody.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInMethods.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInObjectCollectionArrayInitializers.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInProperties.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.NewLinesForBracesInTypes.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterCast.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterColonInBaseTypeDeclaration.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterComma.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterControlFlowStatementKeyword.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterDot.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterMethodCallName.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceAfterSemicolonsInForStatement.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeColonInBaseTypeDeclaration.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeComma.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeDot.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeOpenSquareBracket.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBeforeSemicolonsInForStatement.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodCallParentheses.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodDeclarationParentheses.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptySquareBrackets.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinCastParentheses.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinExpressionParentheses.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodCallParentheses.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodDeclarationParenthesis.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinOtherParentheses.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinSquareBrackets.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAfterMethodDeclarationName.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAroundBinaryOperator.get -> Microsoft.CodeAnalysis.Internal.Options.Option<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingPreserveSingleLine.get -> Microsoft.CodeAnalysis.Internal.Options.Option<bool>
diff --git a/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj b/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj
index 1b023c00ad12f..2b2a8179756f4 100644
--- a/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj
+++ b/src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj
@@ -22,30 +22,12 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CodeStyle.UnitTestUtilities" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.CodeStyle.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Workspaces\Core\Portable\Editing\DeclarationModifiers.cs" Link="Editing\DeclarationModifiers.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\CodeStyle\CodeStyleOption.cs" Link="Options\CodeStyleOption.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\CodeStyle\CodeStyleOptions.cs" Link="Options\CodeStyleOptions.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\CodeStyle\NotificationOption.cs" Link="Options\NotificationOption.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\EditorConfig\EditorConfigStorageLocation.cs" Link="Options\EditorConfigStorageLocation.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\EditorConfig\EditorConfigStorageLocationExtensions.cs" Link="Options\EditorConfigStorageLocationExtensions.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\EditorConfig\EditorConfigStorageLocation`1.cs" Link="Options\EditorConfigStorageLocation`1.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\EditorConfig\IEditorConfigStorageLocation.cs" Link="Options\IEditorConfigStorageLocation.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\EditorConfig\IEditorConfigStorageLocation2.cs" Link="Options\IEditorConfigStorageLocation2.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\EditorConfig\NamingStylePreferenceEditorConfigStorageLocation.cs" Link="Options\NamingStylePreferenceEditorConfigStorageLocation.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\IOption.cs" Link="Options\IOption.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\IOptionWithGroup.cs" Link="Options\IOptionWithGroup.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\LocalUserProfileStorageLocation.cs" Link="Options\LocalUserProfileStorageLocation.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\OptionGroup.cs" Link="Options\OptionGroup.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\OptionKey.cs" Link="Options\OptionKey.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\OptionStorageLocation.cs" Link="Options\OptionStorageLocation.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\Option`1.cs" Link="Options\Option`1.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\PerLanguageOption.cs" Link="Options\PerLanguageOption.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Options\RoamingProfileStorageLocation.cs" Link="Options\RoamingProfileStorageLocation.cs" />
-    <Compile Include="..\..\..\Workspaces\Core\Portable\Simplification\NamingStyleOptions.cs" Link="Options\NamingStyleOptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="CodeStyleResources.resx" GenerateSource="true" />
diff --git a/src/CodeStyle/Core/Analyzers/Options/AnalyzerHelper.cs b/src/CodeStyle/Core/Analyzers/Options/AnalyzerHelper.cs
index c6b5a3d97931b..7ded71055153e 100644
--- a/src/CodeStyle/Core/Analyzers/Options/AnalyzerHelper.cs
+++ b/src/CodeStyle/Core/Analyzers/Options/AnalyzerHelper.cs
@@ -5,13 +5,13 @@
 #nullable enable
 
 using System.Threading;
-using Microsoft.CodeAnalysis.Internal.Options;
+using Microsoft.CodeAnalysis.Options;
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
     internal static partial class AnalyzerHelper
     {
-        public static T GetOption<T>(this AnalyzerOptions analyzerOptions, IOption option, string? language, SyntaxTree syntaxTree, CancellationToken cancellationToken)
+        public static T GetOption<T>(this AnalyzerOptions analyzerOptions, IOption2 option, string? language, SyntaxTree syntaxTree, CancellationToken cancellationToken)
         {
             if (analyzerOptions.TryGetEditorConfigOption<T>(option, syntaxTree, out var value))
             {
@@ -21,14 +21,14 @@ public static T GetOption<T>(this AnalyzerOptions analyzerOptions, IOption optio
             return (T)option.DefaultValue!;
         }
 
-        public static T GetOption<T>(this AnalyzerOptions analyzerOptions, Option<T> option, SyntaxTree syntaxTree, CancellationToken cancellationToken)
+        public static T GetOption<T>(this AnalyzerOptions analyzerOptions, Option2<T> option, SyntaxTree syntaxTree, CancellationToken cancellationToken)
         {
             return GetOption<T>(analyzerOptions, option, language: null, syntaxTree, cancellationToken);
         }
 
-        public static T GetOption<T>(this AnalyzerOptions analyzerOptions, PerLanguageOption<T> option, string? language, SyntaxTree syntaxTree, CancellationToken cancellationToken)
+        public static T GetOption<T>(this AnalyzerOptions analyzerOptions, PerLanguageOption2<T> option, string? language, SyntaxTree syntaxTree, CancellationToken cancellationToken)
         {
-            return GetOption<T>(analyzerOptions, (IOption)option, language, syntaxTree, cancellationToken);
+            return GetOption<T>(analyzerOptions, (IOption2)option, language, syntaxTree, cancellationToken);
         }
 
         public static AnalyzerConfigOptions GetAnalyzerOptionSet(this AnalyzerOptions analyzerOptions, SyntaxTree syntaxTree, CancellationToken cancellationToken)
diff --git a/src/CodeStyle/Core/Analyzers/PublicAPI.Shipped.txt b/src/CodeStyle/Core/Analyzers/PublicAPI.Shipped.txt
index baf9a26a1bcba..e69de29bb2d1d 100644
--- a/src/CodeStyle/Core/Analyzers/PublicAPI.Shipped.txt
+++ b/src/CodeStyle/Core/Analyzers/PublicAPI.Shipped.txt
@@ -1,74 +0,0 @@
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.CodeStyleOption(T value, Microsoft.CodeAnalysis.Internal.Options.NotificationOption notification) -> void
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Equals(Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T> other) -> bool
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Notification.get -> Microsoft.CodeAnalysis.Internal.Options.NotificationOption
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Notification.set -> void
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.ToXElement() -> System.Xml.Linq.XElement
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Value.get -> T
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Value.set -> void
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Name.get -> string
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Name.set -> void
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Severity.get -> Microsoft.CodeAnalysis.ReportDiagnostic
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Severity.set -> void
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Value.get -> Microsoft.CodeAnalysis.DiagnosticSeverity
-Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Value.set -> void
-Microsoft.CodeAnalysis.Formatting.FormattingOptions
-Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle
-Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle.Block = 1 -> Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle
-Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle.None = 0 -> Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle
-Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle.Smart = 2 -> Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle
-Microsoft.CodeAnalysis.Internal.Options.IOption
-Microsoft.CodeAnalysis.Internal.Options.IOption.DefaultValue.get -> object
-Microsoft.CodeAnalysis.Internal.Options.IOption.Feature.get -> string
-Microsoft.CodeAnalysis.Internal.Options.IOption.IsPerLanguage.get -> bool
-Microsoft.CodeAnalysis.Internal.Options.IOption.Name.get -> string
-Microsoft.CodeAnalysis.Internal.Options.IOption.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation>
-Microsoft.CodeAnalysis.Internal.Options.IOption.Type.get -> System.Type
-Microsoft.CodeAnalysis.Internal.Options.Option<T>
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.DefaultValue.get -> T
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.Feature.get -> string
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.Name.get -> string
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.Option(string feature, string name) -> void
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.Option(string feature, string name, T defaultValue) -> void
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.Option(string feature, string name, T defaultValue, params Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation[] storageLocations) -> void
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation>
-Microsoft.CodeAnalysis.Internal.Options.Option<T>.Type.get -> System.Type
-Microsoft.CodeAnalysis.Internal.Options.OptionKey
-Microsoft.CodeAnalysis.Internal.Options.OptionKey.Equals(Microsoft.CodeAnalysis.Internal.Options.OptionKey other) -> bool
-Microsoft.CodeAnalysis.Internal.Options.OptionKey.Language.get -> string
-Microsoft.CodeAnalysis.Internal.Options.OptionKey.Option.get -> Microsoft.CodeAnalysis.Internal.Options.IOption
-Microsoft.CodeAnalysis.Internal.Options.OptionKey.OptionKey(Microsoft.CodeAnalysis.Internal.Options.IOption option, string language = null) -> void
-Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation
-Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation.OptionStorageLocation() -> void
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.DefaultValue.get -> T
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.Feature.get -> string
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.Name.get -> string
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.PerLanguageOption(string feature, string name, T defaultValue) -> void
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.PerLanguageOption(string feature, string name, T defaultValue, params Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation[] storageLocations) -> void
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Internal.Options.OptionStorageLocation>
-Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.Type.get -> System.Type
-override Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Equals(object obj) -> bool
-override Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.GetHashCode() -> int
-override Microsoft.CodeAnalysis.Internal.Options.NotificationOption.ToString() -> string
-override Microsoft.CodeAnalysis.Internal.Options.Option<T>.ToString() -> string
-override Microsoft.CodeAnalysis.Internal.Options.OptionKey.Equals(object obj) -> bool
-override Microsoft.CodeAnalysis.Internal.Options.OptionKey.GetHashCode() -> int
-override Microsoft.CodeAnalysis.Internal.Options.OptionKey.ToString() -> string
-override Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<T>.ToString() -> string
-static Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.Default.get -> Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>
-static Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>.FromXElement(System.Xml.Linq.XElement element) -> Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<T>
-static Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentationSize.get -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<int>
-static Microsoft.CodeAnalysis.Formatting.FormattingOptions.NewLine.get -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<string>
-static Microsoft.CodeAnalysis.Formatting.FormattingOptions.SmartIndent.get -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Formatting.FormattingOptions.IndentStyle>
-static Microsoft.CodeAnalysis.Formatting.FormattingOptions.TabSize.get -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<int>
-static Microsoft.CodeAnalysis.Formatting.FormattingOptions.UseTabs.get -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<bool>
-static Microsoft.CodeAnalysis.Internal.Options.Option<T>.implicit operator Microsoft.CodeAnalysis.Internal.Options.OptionKey(Microsoft.CodeAnalysis.Internal.Options.Option<T> option) -> Microsoft.CodeAnalysis.Internal.Options.OptionKey
-static Microsoft.CodeAnalysis.Internal.Options.OptionKey.operator !=(Microsoft.CodeAnalysis.Internal.Options.OptionKey left, Microsoft.CodeAnalysis.Internal.Options.OptionKey right) -> bool
-static Microsoft.CodeAnalysis.Internal.Options.OptionKey.operator ==(Microsoft.CodeAnalysis.Internal.Options.OptionKey left, Microsoft.CodeAnalysis.Internal.Options.OptionKey right) -> bool
-static readonly Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Error -> Microsoft.CodeAnalysis.Internal.Options.NotificationOption
-static readonly Microsoft.CodeAnalysis.Internal.Options.NotificationOption.None -> Microsoft.CodeAnalysis.Internal.Options.NotificationOption
-static readonly Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Silent -> Microsoft.CodeAnalysis.Internal.Options.NotificationOption
-static readonly Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Suggestion -> Microsoft.CodeAnalysis.Internal.Options.NotificationOption
-static readonly Microsoft.CodeAnalysis.Internal.Options.NotificationOption.Warning -> Microsoft.CodeAnalysis.Internal.Options.NotificationOption
diff --git a/src/CodeStyle/Core/Analyzers/PublicAPI.Unshipped.txt b/src/CodeStyle/Core/Analyzers/PublicAPI.Unshipped.txt
index 1380605fc939b..af1a5be708b66 100644
--- a/src/CodeStyle/Core/Analyzers/PublicAPI.Unshipped.txt
+++ b/src/CodeStyle/Core/Analyzers/PublicAPI.Unshipped.txt
@@ -28,15 +28,6 @@ Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.WithIsVirtual(bool
 Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.WithIsWriteOnly(bool isWriteOnly) -> Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers
 Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.WithPartial(bool isPartial) -> Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers
 Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.WithWithEvents(bool withEvents) -> Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions
-Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.CodeStyleOptions() -> void
-Microsoft.CodeAnalysis.Internal.Options.IEditorConfigStorageLocation
-Microsoft.CodeAnalysis.Internal.Options.IEditorConfigStorageLocation.TryGetOption(System.Collections.Generic.IReadOnlyDictionary<string, string> rawOptions, System.Type type, out object value) -> bool
-Microsoft.CodeAnalysis.Internal.Options.IEditorConfigStorageLocation2
-Microsoft.CodeAnalysis.Internal.Options.IEditorConfigStorageLocation2.GetEditorConfigString(object value, Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions optionSet) -> string
-Microsoft.CodeAnalysis.Internal.Options.IEditorConfigStorageLocation2.GetEditorConfigStringValue(object value, Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions optionSet) -> string
-Microsoft.CodeAnalysis.Internal.Options.IEditorConfigStorageLocation2.KeyName.get -> string
-Microsoft.CodeAnalysis.Internal.Options.NamingStyleOptions
 override Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.Equals(object obj) -> bool
 override Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.GetHashCode() -> int
 override Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.ToString() -> string
@@ -63,10 +54,3 @@ static Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.operator +(M
 static Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.operator -(Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers left, Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers right) -> Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers
 static Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.operator ==(Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers left, Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers right) -> bool
 static Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers.operator |(Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers left, Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers right) -> Microsoft.CodeAnalysis.Internal.Editing.DeclarationModifiers
-static Microsoft.CodeAnalysis.Internal.Options.NamingStyleOptions.GetNamingPreferencesOptionKey(string language) -> Microsoft.CodeAnalysis.Internal.Options.OptionKey
-static readonly Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.PreferIntrinsicPredefinedTypeKeywordInDeclaration -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<bool>>
-static readonly Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.PreferIntrinsicPredefinedTypeKeywordInMemberAccess -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<bool>>
-static readonly Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.QualifyEventAccess -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<bool>>
-static readonly Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.QualifyFieldAccess -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<bool>>
-static readonly Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.QualifyMethodAccess -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<bool>>
-static readonly Microsoft.CodeAnalysis.Internal.Options.CodeStyleOptions.QualifyPropertyAccess -> Microsoft.CodeAnalysis.Internal.Options.PerLanguageOption<Microsoft.CodeAnalysis.Internal.Options.CodeStyleOption<bool>>
diff --git a/src/CodeStyle/Directory.Build.targets b/src/CodeStyle/Directory.Build.targets
index 649bb1f2df34b..78d8fbc0141ac 100644
--- a/src/CodeStyle/Directory.Build.targets
+++ b/src/CodeStyle/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\..\Directory.Build.targets"/>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsShipping)' == 'true'">
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\BannedSymbols.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file