Revert "Merge commit '7f9a8e08' into move-optionset-to-compiler"

This reverts commit c016937c, reversing
changes made to 363f479c.

src/Compilers/Core/Portable/CodeAnalysisResources.Designer.cs

@@ -61,24 +61,6 @@ internal class CodeAnalysisResources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to A language name cannot be specified for this option..
-        /// </summary>
-        internal static string A_language_name_cannot_be_specified_for_this_option {
-            get {
-                return ResourceManager.GetString("A_language_name_cannot_be_specified_for_this_option", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A language name must be specified for this option..
-        /// </summary>
-        internal static string A_language_name_must_be_specified_for_this_option {
-            get {
-                return ResourceManager.GetString("A_language_name_must_be_specified_for_this_option", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Absolute path expected..
         /// </summary>

src/Compilers/Core/Portable/PublicAPI.Unshipped.txt

 *REMOVED*Microsoft.CodeAnalysis.Operations.IEventAssignmentOperation.EventReference.get -> Microsoft.CodeAnalysis.Operations.IEventReferenceOperation
-*REMOVED*Microsoft.CodeAnalysis.Operations.IEventAssignmentOperation.EventReference.get -> Microsoft.CodeAnalysis.Operations.IEventReferenceOperation
 abstract Microsoft.CodeAnalysis.Compilation.ClassifyCommonConversion(Microsoft.CodeAnalysis.ITypeSymbol source, Microsoft.CodeAnalysis.ITypeSymbol destination) -> Microsoft.CodeAnalysis.Operations.CommonConversion
 abstract Microsoft.CodeAnalysis.Compilation.ContainsSymbolsWithName(string name, Microsoft.CodeAnalysis.SymbolFilter filter = Microsoft.CodeAnalysis.SymbolFilter.TypeAndMember, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> bool
 abstract Microsoft.CodeAnalysis.Compilation.GetSymbolsWithName(string name, Microsoft.CodeAnalysis.SymbolFilter filter = Microsoft.CodeAnalysis.SymbolFilter.TypeAndMember, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ISymbol>
@@ -13,8 +12,6 @@ abstract Microsoft.CodeAnalysis.Diagnostics.SymbolStartAnalysisContext.RegisterO
 abstract Microsoft.CodeAnalysis.Diagnostics.SymbolStartAnalysisContext.RegisterOperationBlockStartAction(System.Action<Microsoft.CodeAnalysis.Diagnostics.OperationBlockStartAnalysisContext> action) -> void
 abstract Microsoft.CodeAnalysis.Diagnostics.SymbolStartAnalysisContext.RegisterSymbolEndAction(System.Action<Microsoft.CodeAnalysis.Diagnostics.SymbolAnalysisContext> action) -> void
 abstract Microsoft.CodeAnalysis.Diagnostics.SymbolStartAnalysisContext.RegisterSyntaxNodeAction<TLanguageKindEnum>(System.Action<Microsoft.CodeAnalysis.Diagnostics.SyntaxNodeAnalysisContext> action, System.Collections.Immutable.ImmutableArray<TLanguageKindEnum> syntaxKinds) -> void
-abstract Microsoft.CodeAnalysis.Options.OptionSet.GetOption(Microsoft.CodeAnalysis.Options.OptionKey optionKey) -> object
-abstract Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption(Microsoft.CodeAnalysis.Options.OptionKey optionAndLanguage, object value) -> Microsoft.CodeAnalysis.Options.OptionSet
 Microsoft.CodeAnalysis.CommandLineArguments.AnalyzerConfigPaths.get -> System.Collections.Immutable.ImmutableArray<string>
 Microsoft.CodeAnalysis.Compilation.HasImplicitConversion(Microsoft.CodeAnalysis.ITypeSymbol fromType, Microsoft.CodeAnalysis.ITypeSymbol toType) -> bool
 Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions
@@ -144,49 +141,8 @@ Microsoft.CodeAnalysis.Operations.ISwitchOperation.ExitLabel.get -> Microsoft.Co
 Microsoft.CodeAnalysis.Operations.ISwitchOperation.Locals.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ILocalSymbol>
 Microsoft.CodeAnalysis.Operations.ITryOperation.ExitLabel.get -> Microsoft.CodeAnalysis.ILabelSymbol
 Microsoft.CodeAnalysis.Operations.IUsingOperation.Locals.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.ILocalSymbol>
-Microsoft.CodeAnalysis.Options.IOption
-Microsoft.CodeAnalysis.Options.IOption.DefaultValue.get -> object
-Microsoft.CodeAnalysis.Options.IOption.Feature.get -> string
-Microsoft.CodeAnalysis.Options.IOption.IsPerLanguage.get -> bool
-Microsoft.CodeAnalysis.Options.IOption.Name.get -> string
-Microsoft.CodeAnalysis.Options.IOption.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation>
-Microsoft.CodeAnalysis.Options.IOption.Type.get -> System.Type
-Microsoft.CodeAnalysis.Options.Option<T>
-Microsoft.CodeAnalysis.Options.Option<T>.DefaultValue.get -> T
-Microsoft.CodeAnalysis.Options.Option<T>.Feature.get -> string
-Microsoft.CodeAnalysis.Options.Option<T>.Name.get -> string
-Microsoft.CodeAnalysis.Options.Option<T>.Option(string feature, string name) -> void
-Microsoft.CodeAnalysis.Options.Option<T>.Option(string feature, string name, T defaultValue) -> void
-Microsoft.CodeAnalysis.Options.Option<T>.Option(string feature, string name, T defaultValue, params Microsoft.CodeAnalysis.Options.OptionStorageLocation[] storageLocations) -> void
-Microsoft.CodeAnalysis.Options.Option<T>.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation>
-Microsoft.CodeAnalysis.Options.Option<T>.Type.get -> System.Type
-Microsoft.CodeAnalysis.Options.OptionKey
-Microsoft.CodeAnalysis.Options.OptionKey.Equals(Microsoft.CodeAnalysis.Options.OptionKey other) -> bool
-Microsoft.CodeAnalysis.Options.OptionKey.Language.get -> string
-Microsoft.CodeAnalysis.Options.OptionKey.Option.get -> Microsoft.CodeAnalysis.Options.IOption
-Microsoft.CodeAnalysis.Options.OptionKey.OptionKey(Microsoft.CodeAnalysis.Options.IOption option, string language = null) -> void
-Microsoft.CodeAnalysis.Options.OptionSet
-Microsoft.CodeAnalysis.Options.OptionSet.GetOption<T>(Microsoft.CodeAnalysis.Options.Option<T> option) -> T
-Microsoft.CodeAnalysis.Options.OptionSet.GetOption<T>(Microsoft.CodeAnalysis.Options.PerLanguageOption<T> option, string language) -> T
-Microsoft.CodeAnalysis.Options.OptionSet.OptionSet() -> void
-Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption<T>(Microsoft.CodeAnalysis.Options.Option<T> option, T value) -> Microsoft.CodeAnalysis.Options.OptionSet
-Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption<T>(Microsoft.CodeAnalysis.Options.PerLanguageOption<T> option, string language, T value) -> Microsoft.CodeAnalysis.Options.OptionSet
-Microsoft.CodeAnalysis.Options.OptionStorageLocation
-Microsoft.CodeAnalysis.Options.OptionStorageLocation.OptionStorageLocation() -> void
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.DefaultValue.get -> T
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.Feature.get -> string
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.Name.get -> string
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.PerLanguageOption(string feature, string name, T defaultValue) -> void
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.PerLanguageOption(string feature, string name, T defaultValue, params Microsoft.CodeAnalysis.Options.OptionStorageLocation[] storageLocations) -> void
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation>
-Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.Type.get -> System.Type
 override Microsoft.CodeAnalysis.FlowAnalysis.CaptureId.Equals(object obj) -> bool
 override Microsoft.CodeAnalysis.FlowAnalysis.CaptureId.GetHashCode() -> int
-override Microsoft.CodeAnalysis.Options.Option<T>.ToString() -> string
-override Microsoft.CodeAnalysis.Options.OptionKey.Equals(object obj) -> bool
-override Microsoft.CodeAnalysis.Options.OptionKey.GetHashCode() -> int
-override Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.ToString() -> string
 static Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions.KeyComparer.get -> System.StringComparer
 static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph.Create(Microsoft.CodeAnalysis.Operations.IBlockOperation body, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph
 static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph.Create(Microsoft.CodeAnalysis.Operations.IConstructorBodyOperation constructorBody, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph
@@ -196,9 +152,6 @@ static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph.Create(Microsoft.Cod
 static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph.Create(Microsoft.CodeAnalysis.Operations.IPropertyInitializerOperation initializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph
 static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph.Create(Microsoft.CodeAnalysis.SyntaxNode node, Microsoft.CodeAnalysis.SemanticModel semanticModel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph
 static Microsoft.CodeAnalysis.Operations.OperationExtensions.GetCorrespondingOperation(this Microsoft.CodeAnalysis.Operations.IBranchOperation operation) -> Microsoft.CodeAnalysis.IOperation
-static Microsoft.CodeAnalysis.Options.Option<T>.implicit operator Microsoft.CodeAnalysis.Options.OptionKey(Microsoft.CodeAnalysis.Options.Option<T> option) -> Microsoft.CodeAnalysis.Options.OptionKey
-static Microsoft.CodeAnalysis.Options.OptionKey.operator !=(Microsoft.CodeAnalysis.Options.OptionKey left, Microsoft.CodeAnalysis.Options.OptionKey right) -> bool
-static Microsoft.CodeAnalysis.Options.OptionKey.operator ==(Microsoft.CodeAnalysis.Options.OptionKey left, Microsoft.CodeAnalysis.Options.OptionKey right) -> bool
 static readonly Microsoft.CodeAnalysis.SyntaxTree.EmptyDiagnosticOptions -> System.Collections.Immutable.ImmutableDictionary<string, Microsoft.CodeAnalysis.ReportDiagnostic>
 virtual Microsoft.CodeAnalysis.Diagnostics.AnalysisContext.RegisterSymbolStartAction(System.Action<Microsoft.CodeAnalysis.Diagnostics.SymbolStartAnalysisContext> action, Microsoft.CodeAnalysis.SymbolKind symbolKind) -> void
 virtual Microsoft.CodeAnalysis.Diagnostics.CompilationStartAnalysisContext.RegisterSymbolStartAction(System.Action<Microsoft.CodeAnalysis.Diagnostics.SymbolStartAnalysisContext> action, Microsoft.CodeAnalysis.SymbolKind symbolKind) -> void

src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb

@@ -507,9 +507,9 @@ End Class
         Public Sub OptionInferConstTypeInference_1()
 
             Dim alloptions = {({"On", "On"}), ({"Off", "On"}), ({"Off", "Off"})}
-            For Each compilationOptions In alloptions
-                Dim strict = compilationOptions(0)
-                Dim infer = compilationOptions(1)
+            For Each options In alloptions
+                Dim strict = options(0)
+                Dim infer = options(1)
 
                 Dim source =
         <compilation>

src/VisualStudio/Core/Impl/Options/AbstractOptionPreviewViewModel.cs

@@ -66,10 +66,7 @@ protected AbstractOptionPreviewViewModel(OptionSet options, IServiceProvider ser
 
         internal OptionSet ApplyChangedOptions(OptionSet optionSet)
         {
-            if (!(this.Options is IInternalOptionSet internalOptions))
-                throw new NotSupportedException();
-
-            foreach (var optionKey in internalOptions.GetChangedOptions(_originalOptions))
+            foreach (var optionKey in this.Options.GetChangedOptions(_originalOptions))
             {
                 optionSet = optionSet.WithChangedOption(optionKey, this.Options.GetOption(optionKey));
             }

src/VisualStudio/Core/Impl/Options/OptionLogger.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Options;
 
@@ -15,10 +14,7 @@ internal static class OptionLogger
 
         public static void Log(OptionSet oldOptions, OptionSet newOptions)
         {
-            if (!(newOptions is IInternalOptionSet internalNewOptions))
-                throw new NotSupportedException();
-
-            foreach (var optionKey in internalNewOptions.GetChangedOptions(oldOptions))
+            foreach (var optionKey in newOptions.GetChangedOptions(oldOptions))
             {
                 var oldValue = oldOptions.GetOption(optionKey);
                 var currentValue = newOptions.GetOption(optionKey);

src/VisualStudio/Core/Test.Next/Mocks/TestOptionSet.cs

@@ -7,7 +7,7 @@
 
 namespace Roslyn.VisualStudio.Next.UnitTests.Mocks
 {
-    internal class TestOptionSet : OptionSet, IInternalOptionSet
+    internal class TestOptionSet : OptionSet
     {
         private readonly ImmutableDictionary<OptionKey, object> _values;
 
@@ -33,7 +33,7 @@ public override OptionSet WithChangedOption(OptionKey optionAndLanguage, object
             return new TestOptionSet(_values.SetItem(optionAndLanguage, value));
         }
 
-        public virtual IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
+        internal override IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
         {
             foreach (var kvp in _values)
             {

src/Workspaces/Core/Portable/Execution/AbstractOptionsSerializationService.cs

@@ -364,7 +364,7 @@ private OptionSet ReadOptionFrom(OptionSet options, string language, PerLanguage
         /// this is not real option set. it doesn't have all options defined in host. but only those
         /// we pre-selected.
         /// </summary>
-        protected class SerializedPartialOptionSet : OptionSet, IInternalOptionSet
+        protected class SerializedPartialOptionSet : OptionSet
         {
             private readonly ImmutableDictionary<OptionKey, object> _values;
 
@@ -390,7 +390,7 @@ public override OptionSet WithChangedOption(OptionKey optionAndLanguage, object
                 return new SerializedPartialOptionSet(_values.SetItem(optionAndLanguage, value));
             }
 
-            internal virtual IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
+            internal override IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
             {
                 foreach (var kvp in _values)
                 {
@@ -401,11 +401,6 @@ internal virtual IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
                     }
                 }
             }
-
-            IEnumerable<OptionKey> IInternalOptionSet.GetChangedOptions(OptionSet optionSet)
-            {
-                return GetChangedOptions(optionSet);
-            }
         }
     }
 }

src/Workspaces/Core/Portable/ForwardedTypes.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-using System.Runtime.CompilerServices;
-using Microsoft.CodeAnalysis.Options;
-
-[assembly: TypeForwardedTo(typeof(IOption))]
-[assembly: TypeForwardedTo(typeof(Option<>))]
-[assembly: TypeForwardedTo(typeof(OptionKey))]
-[assembly: TypeForwardedTo(typeof(OptionSet))]
-[assembly: TypeForwardedTo(typeof(OptionStorageLocation))]
-[assembly: TypeForwardedTo(typeof(PerLanguageOption<>))]

src/Workspaces/Core/Portable/Options/DocumentOptionSet.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 
 namespace Microsoft.CodeAnalysis.Options
@@ -10,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Options
     /// <see cref="OptionSet"/> but remembers which language the <see cref="Document"/> is, so you don't have to
     /// pass that information redundantly when calling <see cref="GetOption{T}(PerLanguageOption{T})"/>.
     /// </summary>
-    public sealed class DocumentOptionSet : OptionSet, IInternalOptionSet
+    public sealed class DocumentOptionSet : OptionSet
     {
         private readonly OptionSet _backingOptionSet;
         private readonly string _language;
@@ -36,12 +35,9 @@ public override OptionSet WithChangedOption(OptionKey optionAndLanguage, object
             return new DocumentOptionSet(_backingOptionSet.WithChangedOption(optionAndLanguage, value), _language);
         }
 
-        IEnumerable<OptionKey> IInternalOptionSet.GetChangedOptions(OptionSet optionSet)
+        internal override IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
         {
-            if (!(_backingOptionSet is IInternalOptionSet otherOptionSet))
-                throw new NotSupportedException();
-
-            return otherOptionSet.GetChangedOptions(optionSet);
+            return _backingOptionSet.GetChangedOptions(optionSet);
         }
     }
 }

src/Workspaces/Core/Portable/Options/IInternalOptionSet.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-
-namespace Microsoft.CodeAnalysis.Options
-{
-    internal interface IInternalOptionSet
-    {
-        IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet);
-    }
-}

src/Compilers/Core/Portable/Options/OptionKey.cs → src/Workspaces/Core/Portable/Options/OptionKey.cs

@@ -14,11 +14,11 @@ public OptionKey(IOption option, string language = null)
         {
             if (language != null && !option.IsPerLanguage)
             {
-                throw new ArgumentException(CodeAnalysisResources.A_language_name_cannot_be_specified_for_this_option);
+                throw new ArgumentException(WorkspacesResources.A_language_name_cannot_be_specified_for_this_option);
             }
             else if (language == null && option.IsPerLanguage)
             {
-                throw new ArgumentNullException(CodeAnalysisResources.A_language_name_must_be_specified_for_this_option);
+                throw new ArgumentNullException(WorkspacesResources.A_language_name_must_be_specified_for_this_option);
             }
 
             this.Option = option ?? throw new ArgumentNullException(nameof(option));

src/Workspaces/Core/Portable/Options/OptionServiceFactory.cs

@@ -157,7 +157,7 @@ public async Task<OptionSet> GetUpdatedOptionSetForDocumentAsync(Document docume
                 return new DocumentSpecificOptionSet(realizedDocumentOptions, optionSet);
             }
 
-            private class DocumentSpecificOptionSet : OptionSet, IInternalOptionSet
+            private class DocumentSpecificOptionSet : OptionSet
             {
                 private readonly OptionSet _underlyingOptions;
                 private readonly List<IDocumentOptions> _documentOptions;
@@ -207,7 +207,7 @@ public override OptionSet WithChangedOption(OptionKey optionAndLanguage, object
                     return new DocumentSpecificOptionSet(_documentOptions, _underlyingOptions, _values.Add(optionAndLanguage, value));
                 }
 
-                IEnumerable<OptionKey> IInternalOptionSet.GetChangedOptions(OptionSet optionSet)
+                internal override IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
                 {
                     // GetChangedOptions only needs to be supported for OptionSets that need to be compared during application,
                     // but that's already enforced it must be a full WorkspaceOptionSet.

src/Compilers/Core/Portable/Options/OptionSet.cs → src/Workspaces/Core/Portable/Options/OptionSet.cs

@@ -47,5 +47,7 @@ public OptionSet WithChangedOption<T>(PerLanguageOption<T> option, string langua
         {
             return WithChangedOption(new OptionKey(option, language), value);
         }
+
+        internal abstract IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet);
     }
 }

src/Workspaces/Core/Portable/Options/WorkspaceOptionSet.cs

@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Options
     /// An implementation of <see cref="OptionSet"/> that fetches values it doesn't know about to the workspace's option service. It ensures a contract
     /// that values are immutable from this instance once observed.
     /// </summary>
-    internal sealed class WorkspaceOptionSet : OptionSet, IInternalOptionSet
+    internal sealed class WorkspaceOptionSet : OptionSet
     {
         private readonly IOptionService _service;
 
@@ -59,7 +59,7 @@ internal IEnumerable<OptionKey> GetAccessedOptions()
             return GetChangedOptions(optionSet);
         }
 
-        public IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
+        internal override IEnumerable<OptionKey> GetChangedOptions(OptionSet optionSet)
         {
             foreach (var kvp in _values)
             {

src/Workspaces/Core/Portable/PublicAPI.Unshipped.txt

-*REMOVED*abstract Microsoft.CodeAnalysis.Options.OptionSet.GetOption(Microsoft.CodeAnalysis.Options.OptionKey optionKey) -> object
-*REMOVED*abstract Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption(Microsoft.CodeAnalysis.Options.OptionKey optionAndLanguage, object value) -> Microsoft.CodeAnalysis.Options.OptionSet
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption.DefaultValue.get -> object
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption.Feature.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption.IsPerLanguage.get -> bool
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption.Name.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation>
-*REMOVED*Microsoft.CodeAnalysis.Options.IOption.Type.get -> System.Type
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.DefaultValue.get -> T
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.Feature.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.Name.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.Option(string feature, string name) -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.Option(string feature, string name, T defaultValue) -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.Option(string feature, string name, T defaultValue, params Microsoft.CodeAnalysis.Options.OptionStorageLocation[] storageLocations) -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation>
-*REMOVED*Microsoft.CodeAnalysis.Options.Option<T>.Type.get -> System.Type
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionKey
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionKey.Equals(Microsoft.CodeAnalysis.Options.OptionKey other) -> bool
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionKey.Language.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionKey.Option.get -> Microsoft.CodeAnalysis.Options.IOption
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionKey.OptionKey(Microsoft.CodeAnalysis.Options.IOption option, string language = null) -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionSet
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionSet.GetOption<T>(Microsoft.CodeAnalysis.Options.Option<T> option) -> T
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionSet.GetOption<T>(Microsoft.CodeAnalysis.Options.PerLanguageOption<T> option, string language) -> T
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionSet.OptionSet() -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption<T>(Microsoft.CodeAnalysis.Options.Option<T> option, T value) -> Microsoft.CodeAnalysis.Options.OptionSet
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption<T>(Microsoft.CodeAnalysis.Options.PerLanguageOption<T> option, string language, T value) -> Microsoft.CodeAnalysis.Options.OptionSet
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionStorageLocation
-*REMOVED*Microsoft.CodeAnalysis.Options.OptionStorageLocation.OptionStorageLocation() -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.DefaultValue.get -> T
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.Feature.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.Name.get -> string
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.PerLanguageOption(string feature, string name, T defaultValue) -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.PerLanguageOption(string feature, string name, T defaultValue, params Microsoft.CodeAnalysis.Options.OptionStorageLocation[] storageLocations) -> void
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation>
-*REMOVED*Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.Type.get -> System.Type
-*REMOVED*override Microsoft.CodeAnalysis.Options.Option<T>.ToString() -> string
-*REMOVED*override Microsoft.CodeAnalysis.Options.OptionKey.Equals(object obj) -> bool
-*REMOVED*override Microsoft.CodeAnalysis.Options.OptionKey.GetHashCode() -> int
-*REMOVED*override Microsoft.CodeAnalysis.Options.PerLanguageOption<T>.ToString() -> string
-*REMOVED*static Microsoft.CodeAnalysis.Options.Option<T>.implicit operator Microsoft.CodeAnalysis.Options.OptionKey(Microsoft.CodeAnalysis.Options.Option<T> option) -> Microsoft.CodeAnalysis.Options.OptionKey
-*REMOVED*static Microsoft.CodeAnalysis.Options.OptionKey.operator !=(Microsoft.CodeAnalysis.Options.OptionKey left, Microsoft.CodeAnalysis.Options.OptionKey right) -> bool
-*REMOVED*static Microsoft.CodeAnalysis.Options.OptionKey.operator ==(Microsoft.CodeAnalysis.Options.OptionKey left, Microsoft.CodeAnalysis.Options.OptionKey right) -> bool
 *REMOVED*static Microsoft.CodeAnalysis.ProjectInfo.Create(Microsoft.CodeAnalysis.ProjectId id, Microsoft.CodeAnalysis.VersionStamp version, string name, string assemblyName, string language, string filePath = null, string outputFilePath = null, Microsoft.CodeAnalysis.CompilationOptions compilationOptions = null, Microsoft.CodeAnalysis.ParseOptions parseOptions = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.DocumentInfo> documents = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ProjectReference> projectReferences = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.MetadataReference> metadataReferences = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.Diagnostics.AnalyzerReference> analyzerReferences = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.DocumentInfo> additionalDocuments = null, bool isSubmission = false, System.Type hostObjectType = null) -> Microsoft.CodeAnalysis.ProjectInfo
-abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.AliasImportDeclaration(string aliasIdentifierName, Microsoft.CodeAnalysis.SyntaxNode name) -> Microsoft.CodeAnalysis.SyntaxNode
-abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.NameExpression(Microsoft.CodeAnalysis.INamespaceOrTypeSymbol namespaceOrTypeSymbol) -> Microsoft.CodeAnalysis.SyntaxNode
-abstract Microsoft.CodeAnalysis.Options.OptionSet.GetOption(Microsoft.CodeAnalysis.Options.OptionKey optionKey) -> object (forwarded, contained in Microsoft.CodeAnalysis)
-abstract Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption(Microsoft.CodeAnalysis.Options.OptionKey optionAndLanguage, object value) -> Microsoft.CodeAnalysis.Options.OptionSet (forwarded, contained in Microsoft.CodeAnalysis)
-const Microsoft.CodeAnalysis.Classification.ClassificationTypeNames.StringEscapeCharacter = "string - escape character" -> string
-const Microsoft.CodeAnalysis.WorkspaceKind.MSBuild = "MSBuildWorkspace" -> string
 Microsoft.CodeAnalysis.CodeStyle.NotificationOption.Severity.get -> Microsoft.CodeAnalysis.ReportDiagnostic
 Microsoft.CodeAnalysis.CodeStyle.NotificationOption.Severity.set -> void
 Microsoft.CodeAnalysis.Editing.SyntaxGenerator.AliasImportDeclaration(string aliasIdentifierName, Microsoft.CodeAnalysis.INamespaceOrTypeSymbol symbol) -> Microsoft.CodeAnalysis.SyntaxNode
@@ -58,38 +6,16 @@ Microsoft.CodeAnalysis.FileTextLoader
 Microsoft.CodeAnalysis.FileTextLoader.DefaultEncoding.get -> System.Text.Encoding
 Microsoft.CodeAnalysis.FileTextLoader.FileTextLoader(string path, System.Text.Encoding defaultEncoding) -> void
 Microsoft.CodeAnalysis.FileTextLoader.Path.get -> string
-Microsoft.CodeAnalysis.Options.IOption (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.IOption.DefaultValue.get -> object (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.IOption.Feature.get -> string (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.IOption.IsPerLanguage.get -> bool (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.IOption.Name.get -> string (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.IOption.StorageLocations.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Options.OptionStorageLocation> (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.IOption.Type.get -> System.Type (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.Option<> (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionKey (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionKey.Equals(Microsoft.CodeAnalysis.Options.OptionKey other) -> bool (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionKey.Language.get -> string (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionKey.Option.get -> Microsoft.CodeAnalysis.Options.IOption (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionKey.OptionKey(Microsoft.CodeAnalysis.Options.IOption option, string language = null) -> void (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionSet (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionSet.GetOption<T>(Microsoft.CodeAnalysis.Options.Option<T> option) -> T (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionSet.GetOption<T>(Microsoft.CodeAnalysis.Options.PerLanguageOption<T> option, string language) -> T (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionSet.OptionSet() -> void (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption<T>(Microsoft.CodeAnalysis.Options.Option<T> option, T value) -> Microsoft.CodeAnalysis.Options.OptionSet (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionSet.WithChangedOption<T>(Microsoft.CodeAnalysis.Options.PerLanguageOption<T> option, string language, T value) -> Microsoft.CodeAnalysis.Options.OptionSet (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionStorageLocation (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.OptionStorageLocation.OptionStorageLocation() -> void (forwarded, contained in Microsoft.CodeAnalysis)
-Microsoft.CodeAnalysis.Options.PerLanguageOption<> (forwarded, contained in Microsoft.CodeAnalysis)
+abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.AliasImportDeclaration(string aliasIdentifierName, Microsoft.CodeAnalysis.SyntaxNode name) -> Microsoft.CodeAnalysis.SyntaxNode
+abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.NameExpression(Microsoft.CodeAnalysis.INamespaceOrTypeSymbol namespaceOrTypeSymbol) -> Microsoft.CodeAnalysis.SyntaxNode
 Microsoft.CodeAnalysis.ProjectChanges.GetChangedDocuments(bool onlyGetDocumentsWithTextChanges) -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.DocumentId>
 Microsoft.CodeAnalysis.Workspace.OnOutputRefFilePathChanged(Microsoft.CodeAnalysis.ProjectId projectId, string outputFilePath) -> void
+const Microsoft.CodeAnalysis.Classification.ClassificationTypeNames.StringEscapeCharacter = "string - escape character" -> string
+const Microsoft.CodeAnalysis.WorkspaceKind.MSBuild = "MSBuildWorkspace" -> string
 override Microsoft.CodeAnalysis.FileTextLoader.LoadTextAndVersionAsync(Microsoft.CodeAnalysis.Workspace workspace, Microsoft.CodeAnalysis.DocumentId documentId, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<Microsoft.CodeAnalysis.TextAndVersion>
-override Microsoft.CodeAnalysis.Options.OptionKey.Equals(object obj) -> bool (forwarded, contained in Microsoft.CodeAnalysis)
-override Microsoft.CodeAnalysis.Options.OptionKey.GetHashCode() -> int (forwarded, contained in Microsoft.CodeAnalysis)
 static Microsoft.CodeAnalysis.FindSymbols.SymbolFinder.FindSourceDeclarationsWithPatternAsync(Microsoft.CodeAnalysis.Project project, string pattern, Microsoft.CodeAnalysis.SymbolFilter filter, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ISymbol>>
 static Microsoft.CodeAnalysis.FindSymbols.SymbolFinder.FindSourceDeclarationsWithPatternAsync(Microsoft.CodeAnalysis.Project project, string pattern, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ISymbol>>
 static Microsoft.CodeAnalysis.FindSymbols.SymbolFinder.FindSourceDeclarationsWithPatternAsync(Microsoft.CodeAnalysis.Solution solution, string pattern, Microsoft.CodeAnalysis.SymbolFilter filter, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ISymbol>>
 static Microsoft.CodeAnalysis.FindSymbols.SymbolFinder.FindSourceDeclarationsWithPatternAsync(Microsoft.CodeAnalysis.Solution solution, string pattern, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ISymbol>>
-static Microsoft.CodeAnalysis.Options.OptionKey.operator !=(Microsoft.CodeAnalysis.Options.OptionKey left, Microsoft.CodeAnalysis.Options.OptionKey right) -> bool (forwarded, contained in Microsoft.CodeAnalysis)
-static Microsoft.CodeAnalysis.Options.OptionKey.operator ==(Microsoft.CodeAnalysis.Options.OptionKey left, Microsoft.CodeAnalysis.Options.OptionKey right) -> bool (forwarded, contained in Microsoft.CodeAnalysis)
 static readonly Microsoft.CodeAnalysis.CodeStyle.NotificationOption.Silent -> Microsoft.CodeAnalysis.CodeStyle.NotificationOption
 virtual Microsoft.CodeAnalysis.FileTextLoader.CreateText(System.IO.Stream stream, Microsoft.CodeAnalysis.Workspace workspace) -> Microsoft.CodeAnalysis.Text.SourceText

src/Workspaces/Core/Portable/WorkspacesResources.Designer.cs

@@ -169,6 +169,24 @@ internal class WorkspacesResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to A language name cannot be specified for this option..
+        /// </summary>
+        internal static string A_language_name_cannot_be_specified_for_this_option {
+            get {
+                return ResourceManager.GetString("A_language_name_cannot_be_specified_for_this_option", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A language name must be specified for this option..
+        /// </summary>
+        internal static string A_language_name_must_be_specified_for_this_option {
+            get {
+                return ResourceManager.GetString("A_language_name_must_be_specified_for_this_option", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Absolute path expected..
         /// </summary>

src/Workspaces/Core/Portable/WorkspacesResources.resx

@@ -225,6 +225,12 @@
   <data name="_0_is_not_open" xml:space="preserve">
     <value>'{0}' is not open.</value>
   </data>
+  <data name="A_language_name_cannot_be_specified_for_this_option" xml:space="preserve">
+    <value>A language name cannot be specified for this option.</value>
+  </data>
+  <data name="A_language_name_must_be_specified_for_this_option" xml:space="preserve">
+    <value>A language name must be specified for this option.</value>
+  </data>
   <data name="File_was_externally_modified_colon_0" xml:space="preserve">
     <value>File was externally modified: {0}.</value>
   </data>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0} není otevřený.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Pro tuto možnost se nesmí zadat název jazyka.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Pro tuto možnost se musí zadat název jazyka.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Došlo k externí úpravě souboru: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'"{0}" ist nicht geöffnet.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Für diese Option kann kein Sprachenname angegeben werden.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Für diese Option muss ein Sprachenname angegeben werden.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Datei wurde extern modifiziert: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}' no está abierto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">No se puede especificar un nombre de lenguaje para esta opción.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Se debe especificar un nombre de lenguaje para esta opción.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">El archivo se modificó externamente: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}' n'est pas ouvert.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Impossible de spécifier un nom de langage pour cette option.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Un nom de langage doit être spécifié pour cette option.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Le fichier a été modifié en externe : {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}' non è aperto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Non è possibile specificare un nome di linguaggio per questa opzione.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">È necessario specificare un nome di linguaggio per questa opzione.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Il file è stato modificato esternamente: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}' が開いていません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">言語名は、このオプションでは指定できません。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">このオプションの言語名を指定する必要があります。</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">ファイルが外部で変更されました: {0}。</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}'이(가) 열리지 않았습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">이 옵션에 대한 언어 이름을 지정할 수 없습니다.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">이 옵션에 대한 언어 이름을 지정해야 합니다.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">파일이 외부에서 수정되었습니다({0}).</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'Element „{0}” nie jest otwarty.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Nie można określić nazwy języka dla tej opcji.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Nazwa języka musi zostać określona dla tej opcji.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Plik został zmodyfikowany na zewnątrz: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'"{0}" não está aberto.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Um nome de idioma não pode ser especificado para essa opção.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Um nome de idioma deve ser especificado para esta opção.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Arquivo foi modificado externamente: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'"{0}" не открыт.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Для данного параметра невозможно указать имя языка.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Для данного параметра необходимо указать имя языка.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Файл был изменен извне: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}' açık değil.</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">Bu seçenek için bir dil adı belirtilemiyor.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">Bu seçenek için bir dil adı belirtilmelidir.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">Dosya dışarıdan değiştirildi: {0}.</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'未打开“{0}”。</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">无法为此选项指定语言名称。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">必须为此选项指定语言名称。</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">已从外部修改文件: {0}。</target>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf

@@ -187,6 +187,16 @@
         <target state="translated">'{0}' 未開啟。</target>
         <note />
       </trans-unit>
+      <trans-unit id="A_language_name_cannot_be_specified_for_this_option">
+        <source>A language name cannot be specified for this option.</source>
+        <target state="translated">無法指定此選項的語言名稱。</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="A_language_name_must_be_specified_for_this_option">
+        <source>A language name must be specified for this option.</source>
+        <target state="translated">必須指定此選項的語言名稱。</target>
+        <note />
+      </trans-unit>
       <trans-unit id="File_was_externally_modified_colon_0">
         <source>File was externally modified: {0}.</source>
         <target state="translated">已在外部修改檔案: {0}。</target>

src/Workspaces/CoreTest/Execution/SnapshotSerializationTests.cs

@@ -625,8 +625,7 @@ private static async Task VerifyOptionSetsAsync(Workspace workspace, string lang
                     Assert.Equal(asset.Checksum, assetFromStorage.Checksum);
 
                     // option should be exactly same
-                    Assert.IsAssignableFrom<IInternalOptionSet>(recovered);
-                    Assert.Equal(0, ((IInternalOptionSet)recovered).GetChangedOptions(workspace.Options).Count());
+                    Assert.Equal(0, recovered.GetChangedOptions(workspace.Options).Count());
                 }
             }
         }

src/Workspaces/Remote/Core/Diagnostics/DiagnosticComputer.cs

@@ -169,11 +169,8 @@ private ImmutableArray<DiagnosticAnalyzer> GetAnalyzers(BidirectionalMap<string,
 
         private OptionSet MergeOptions(OptionSet workspaceOptions, OptionSet userOptions)
         {
-            if (!(userOptions is IInternalOptionSet internalUserOptions))
-                throw new NotSupportedException();
-
             var newOptions = workspaceOptions;
-            foreach (var key in internalUserOptions.GetChangedOptions(workspaceOptions))
+            foreach (var key in userOptions.GetChangedOptions(workspaceOptions))
             {
                 newOptions = newOptions.WithChangedOption(key, userOptions.GetOption(key));
             }