From ea4cf937496676452d01af65ed8430f3f056c99a Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Sun, 1 Nov 2020 07:33:18 +0000
Subject: [PATCH] Enforce code style in build (#13957)

* Enable EnforceCodeStyleInBuild

* Disable rules breaking build
---
 .globalconfig           | 6 +++---
 PowerShell.Common.props | 4 ++++
 test/Test.Common.props  | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.globalconfig b/.globalconfig
index bdb7d56b6b..0439bba294 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -832,7 +832,7 @@ dotnet_diagnostic.IDE0034.severity = silent
 dotnet_diagnostic.IDE0035.severity = silent
 
 # OrderModifiers
-dotnet_diagnostic.IDE0036.severity = warning
+dotnet_diagnostic.IDE0036.severity = suggestion
 
 # UseInferredMemberName
 dotnet_diagnostic.IDE0037.severity = silent
@@ -868,7 +868,7 @@ dotnet_diagnostic.IDE0046.severity = silent
 dotnet_diagnostic.IDE0047.severity = silent
 
 # AddRequiredParentheses
-dotnet_diagnostic.IDE0048.severity = warning
+dotnet_diagnostic.IDE0048.severity = suggestion
 
 # PreferBuiltInOrFrameworkType
 dotnet_diagnostic.IDE0049.severity = silent
@@ -943,7 +943,7 @@ dotnet_diagnostic.IDE0071.severity = silent
 dotnet_diagnostic.IDE0072.severity = silent
 
 # FileHeaderMismatch
-dotnet_diagnostic.IDE0073.severity = warning
+dotnet_diagnostic.IDE0073.severity = suggestion
 
 # UseCoalesceCompoundAssignment
 dotnet_diagnostic.IDE0074.severity = silent
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 77ec5a627b..e03bf2cd1a 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -157,4 +157,8 @@
   <PropertyGroup>
     <Features>strict</Features>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
 </Project>
diff --git a/test/Test.Common.props b/test/Test.Common.props
index d7c66b6b96..998cb66546 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -16,6 +16,10 @@
     <Features>strict</Features>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(IsWindows)' != 'true' ">
     <DefineConstants>$(DefineConstants);UNIX</DefineConstants>
   </PropertyGroup>