diff --git a/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.Designer.cs b/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.Designer.cs
index 2d32956ccf87adfdda383b8e71b1dee93d06a12b..fd9668217097b1299523afb745d5cb27d8c7975f 100644
--- a/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.Designer.cs
+++ b/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.Designer.cs
@@ -10,6 +10,7 @@
namespace Microsoft.CodeAnalysis.CSharp {
using System;
+ using System.Reflection;
///
@@ -19,7 +20,7 @@ namespace Microsoft.CodeAnalysis.CSharp {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class CSharpCodeStyleResources {
@@ -39,7 +40,7 @@ internal class CSharpCodeStyleResources {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.CSharp.CSharpCodeStyleResources", typeof(CSharpCodeStyleResources).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CodeAnalysis.CSharp.CSharpCodeStyleResources", typeof(CSharpCodeStyleResources).GetTypeInfo().Assembly);
resourceMan = temp;
}
return resourceMan;
@@ -61,47 +62,11 @@ internal class CSharpCodeStyleResources {
}
///
- /// Looks up a localized string similar to .
+ /// Looks up a localized string similar to Remove this value when another is added..
///
- internal static string Expected_string_or_char_literal {
+ internal static string EmptyResource {
get {
- return ResourceManager.GetString("Expected_string_or_char_literal", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to .
- ///
- internal static string Indentation_preferences {
- get {
- return ResourceManager.GetString("Indentation_preferences", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to .
- ///
- internal static string New_line_preferences {
- get {
- return ResourceManager.GetString("New_line_preferences", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to .
- ///
- internal static string Space_preferences {
- get {
- return ResourceManager.GetString("Space_preferences", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to .
- ///
- internal static string Wrapping_preferences {
- get {
- return ResourceManager.GetString("Wrapping_preferences", resourceCulture);
+ return ResourceManager.GetString("EmptyResource", resourceCulture);
}
}
}
diff --git a/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.resx b/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.resx
index 9189ced5fee00a34041cc144b6594a85eaabbd42..14ed010cf9ebb0d55baa117bf5bbe0eb09c13961 100644
--- a/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.resx
+++ b/src/CodeStyle/CSharp/Analyzers/CSharpCodeStyleResources.resx
@@ -117,19 +117,8 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Remove this value when another is added.
+ https://github.com/Microsoft/msbuild/issues/1661
\ No newline at end of file
diff --git a/src/CodeStyle/CSharp/Analyzers/Formatting/CSharpFormattingOptions.cs b/src/CodeStyle/CSharp/Analyzers/Formatting/CSharpFormattingOptions.cs
index 27a2794f4e851cddaea7f4e640f6f390c8a89991..af15e61786867e817b96eccd384e469c5b64fad1 100644
--- a/src/CodeStyle/CSharp/Analyzers/Formatting/CSharpFormattingOptions.cs
+++ b/src/CodeStyle/CSharp/Analyzers/Formatting/CSharpFormattingOptions.cs
@@ -67,9 +67,9 @@ internal static partial class CSharpFormattingOptions
private static ImmutableDictionary
///
- internal class PerLanguageOption : IOptionWithGroup
+ internal class PerLanguageOption : IOption
{
///
/// Feature this option is associated with.
///
public string Feature { get; }
- ///
- /// Optional group/sub-feature for this option.
- ///
- internal OptionGroup Group { get; }
-
///
/// The name of the option.
///
@@ -45,29 +39,18 @@ public PerLanguageOption(string feature, string name, T defaultValue)
}
public PerLanguageOption(string feature, string name, T defaultValue, params OptionStorageLocation[] storageLocations)
- : this(feature, group: OptionGroup.Default, name, defaultValue, storageLocations)
- {
- }
-
- internal PerLanguageOption(string feature, OptionGroup group, string name, T defaultValue, params OptionStorageLocation[] storageLocations)
{
if (string.IsNullOrWhiteSpace(feature))
{
throw new ArgumentNullException(nameof(feature));
}
- if (group == null)
- {
- throw new ArgumentNullException(nameof(group));
- }
-
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentException(nameof(name));
}
this.Feature = feature;
- this.Group = group;
this.Name = name;
this.DefaultValue = defaultValue;
this.StorageLocations = storageLocations.ToImmutableArray();
@@ -77,8 +60,6 @@ internal PerLanguageOption(string feature, OptionGroup group, string name, T def
bool IOption.IsPerLanguage => true;
- OptionGroup IOptionWithGroup.Group => this.Group;
-
public override string ToString()
{
return string.Format("{0} - {1}", this.Feature, this.Name);