From 74b71f2f39820a769e624c8cc29b4183ea6b352b Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 2 Apr 2019 22:09:56 -0700
Subject: [PATCH] Style: Update StyleCop rules (#8500)

---
 Settings.StyleCop | 61 ++++++++++++++++++++++++++++++++++++++++++++++-
 stylecop.json     |  2 +-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/Settings.StyleCop b/Settings.StyleCop
index 4df1222193..bb65d39f6e 100644
--- a/Settings.StyleCop
+++ b/Settings.StyleCop
@@ -12,6 +12,19 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>
           </RuleSettings>
         </Rule>
+        <Rule Name="FieldsMustBePrivate">
+          <!-- it's OK to have internal or public fields -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="CodeAnalysisSuppressionMustHaveJustification">
+          <!-- code analysis SuppressMessage attributes are from legacy code,
+               it's OK to not include a justification. -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
       </Rules>
       <AnalyzerSettings />
     </Analyzer>
@@ -83,7 +96,10 @@
           </RuleSettings>
         </Rule>
       </Rules>
-      <AnalyzerSettings />
+      <AnalyzerSettings>
+        <BooleanProperty Name="IgnorePrivates">True</BooleanProperty>
+        <BooleanProperty Name="IgnoreInternals">True</BooleanProperty>
+      </AnalyzerSettings>
     </Analyzer>
     <Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
       <Rules>
@@ -92,6 +108,24 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>
           </RuleSettings>
         </Rule>
+        <Rule Name="VariableNamesMustNotBePrefixed">
+          <!-- this rule disallows the prefix 's_' to static fields -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="StaticReadonlyFieldsMustBeginWithUpperCaseLetter">
+          <!-- this rule requires first letter upper-case even for private fields -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="FieldNamesMustNotContainUnderscore">
+          <!-- this rule disallows '_' in field name -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
       </Rules>
       <AnalyzerSettings />
     </Analyzer>
@@ -117,6 +151,31 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>
           </RuleSettings>
         </Rule>
+        <Rule Name="StaticElementsMustAppearBeforeInstanceElements">
+          <!-- it's OK to have static members after instance members -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
+      <Rules>
+        <Rule Name="ElementMustNotBeOnSingleLine">
+          <!-- it's OK to have simple member on a single line.
+               think about the 'Visit*' methods in Ast visitor class. -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="AllAccessorsMustBeSingleLineOrMultiLine">
+          <!-- it's OK to have the getter be on a single line and the
+               setter be on multiple lines, or vice versa -->
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
       </Rules>
       <AnalyzerSettings />
     </Analyzer>
diff --git a/stylecop.json b/stylecop.json
index aec3dca80d..b4d772bbe2 100644
--- a/stylecop.json
+++ b/stylecop.json
@@ -25,7 +25,7 @@
         },
         "namingRules" : {
             "allowCommonHungarianPrefixes" : true,
-            "allowedHungarianPrefixes" : [ "c", "r" ]
+            "allowedHungarianPrefixes" : [ "n", "r", "l", "i", "io", "fs", "lp", "dw", "h", "rs", "ps", "op" ]
         },
         "maintainabilityRules" : {
             "topLevelTypes" : [