(GH-785) Fix stylecop and dupfinder errors

Had to introduce a region to exclude certain repeated sections of code.
chocolatey · Jul 13, 2020 · 027bb1c · 027bb1c
1 parent b5d7a72
commit 027bb1c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs
@@ -33,8 +33,6 @@ namespace ChocolateyGui.Common.Windows
 {
     public class Bootstrapper : BootstrapperBase
     {
-        private static readonly IFileSystem _fileSystem = new DotNetFileSystem();
-
         public static readonly string ChocolateyGuiInstallLocation = _fileSystem.get_directory_name(_fileSystem.get_current_assembly_path());
         public static readonly string ChocolateyInstallEnvironmentVariableName = "ChocolateyInstall";
         public static readonly string ChocolateyInstallLocation = System.Environment.GetEnvironmentVariable(ChocolateyInstallEnvironmentVariableName) ?? _fileSystem.get_directory_name(_fileSystem.get_current_assembly_path());
@@ -53,6 +51,8 @@ public class Bootstrapper : BootstrapperBase
 
         public static readonly string LicensedChocolateyGuiAssemblySimpleName = "chocolateygui.licensed";
 
+        private static readonly IFileSystem _fileSystem = new DotNetFileSystem();
+
         public Bootstrapper()
         {
             Initialize();

diff --git a/Source/ChocolateyGui/App.xaml.cs b/Source/ChocolateyGui/App.xaml.cs
@@ -23,6 +23,7 @@ public partial class App
     {
         private static readonly App _application = new App();
 
+        #region DupFinder Exclusion
         public App()
         {
             AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
@@ -67,6 +68,7 @@ public App()
 
             InitializeComponent();
         }
+        #endregion
 
         internal static SplashScreen SplashScreen { get; set; }
 

diff --git a/Source/ChocolateyGuiCli/Bootstrapper.cs b/Source/ChocolateyGuiCli/Bootstrapper.cs
@@ -18,8 +18,6 @@ namespace ChocolateyGuiCli
 {
     public static class Bootstrapper
     {
-        private static readonly IFileSystem _fileSystem = new DotNetFileSystem();
-
         public static readonly string ChocolateyGuiInstallLocation = _fileSystem.get_directory_name(_fileSystem.get_current_assembly_path());
         public static readonly string ChocolateyInstallEnvironmentVariableName = "ChocolateyInstall";
         public static readonly string ChocolateyInstallLocation = System.Environment.GetEnvironmentVariable(ChocolateyInstallEnvironmentVariableName) ?? _fileSystem.get_directory_name(_fileSystem.get_current_assembly_path());
@@ -38,6 +36,8 @@ public static class Bootstrapper
 
         public static readonly string LicensedChocolateyGuiAssemblySimpleName = "chocolateygui.licensed";
 
+        private static readonly IFileSystem _fileSystem = new DotNetFileSystem();
+
         internal static ILogger Logger { get; private set; }
 
         internal static IContainer Container { get; private set; }

diff --git a/Source/ChocolateyGuiCli/Program.cs b/Source/ChocolateyGuiCli/Program.cs
@@ -95,6 +95,7 @@ public static void Main(string[] args)
             });
         }
 
+        #region DupFinder Exclusion
         private static void AddAssemblyResolver()
         {
             _handler = (sender, args) =>
@@ -137,6 +138,7 @@ private static void AddAssemblyResolver()
 
             AppDomain.CurrentDomain.AssemblyResolve += _handler;
         }
+        #endregion
 
         private static void SetUpGlobalOptions(IList<string> args, ChocolateyGuiConfiguration configuration, IContainer container)
         {

diff --git a/Source/ChocolateyGuiRules.ruleset b/Source/ChocolateyGuiRules.ruleset
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="ChocoolateyGUI Rules" Description="This rule set contains all rules. Running this rule set may result in a large number of warnings being reported. Use this rule set to get a comprehensive picture of all issues in your code. This can help you decide which of the more focused rule sets are most appropriate to run for your projects." ToolsVersion="14.0">
-  <IncludeAll  Action="Warning" />
+<RuleSet Name="ChocoolateyGUI Rules" Description="This rule set contains all rules. Running this rule set may result in a large number of warnings being reported. Use this rule set to get a comprehensive picture of all issues in your code. This can help you decide which of the more focused rule sets are most appropriate to run for your projects." ToolsVersion="16.0">
+  <IncludeAll Action="Warning" />
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA1101" Action="None" />
+    <Rule Id="SA1118" Action="None" />
+    <Rule Id="SA1124" Action="None" />
     <Rule Id="SA1200" Action="None" />
     <Rule Id="SA1309" Action="None" />
     <Rule Id="SA1652" Action="None" />
-    <Rule Id="SA1118" Action="None" />
   </Rules>
 </RuleSet>