Remove FxCop (#118)

* Replace FxCop with NetAnalyzers * Address analyzer items * Remove old ruleset files
pharring · Apr 24, 2023 · 909c73a · 909c73a
1 parent 21234c6
commit 909c73a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 47 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <Company>Paul Harrington</Company>
-    <Copyright>Copyright © 2022 Paul Harrington</Copyright>
+    <Copyright>Copyright © 2023 Paul Harrington</Copyright>
     <Version>2.2.9</Version>
     <LangVersion>7.3</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <EnlistmentRoot>$(MSBuildThisFileDirectory)</EnlistmentRoot>
     <IsTestProject>$([MSBuild]::MakeRelative($(EnlistmentRoot), $(MSBuildProjectDirectory)).StartsWith('test\'))</IsTestProject>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -27,10 +28,4 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <!-- CodeAnalysis Rules-->
-  <PropertyGroup>
-    <CodeAnalysisRuleSet Condition="'$(CodeAnalysisRuleSet)' == '' AND ('$(IsTestProject)' == 'true' OR '$(NonShipping)' == 'true')">$(MSBuildThisFileDirectory)\NonShipping.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(CodeAnalysisRuleSet)' == ''">$(MSBuildThisFileDirectory)\Shipping.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -7,8 +7,4 @@
     </PropertyGroup>
   </Target>
 
-  <ItemGroup Condition="'$(RestoreProjectStyle)' == 'PackageReference'">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="all" />
-  </ItemGroup>
-
 </Project>
diff --git a/NonShipping.ruleset b/NonShipping.ruleset
diff --git a/Shipping.ruleset b/Shipping.ruleset
diff --git a/src/ColumnGuide/ColumnGuideFactory.cs b/src/ColumnGuide/ColumnGuideFactory.cs
@@ -42,11 +42,7 @@ public void TextViewCreated(IWpfTextView textView)
         {
             // Always create the adornment, even if there are no guidelines, since we
             // respond to dynamic changes.
-#pragma warning disable IDE0067 // Dispose objects before losing scope
-#pragma warning disable CA2000 // Dispose objects before losing scope
             var _ = new ColumnGuideAdornment(textView, TextEditorGuidesSettings, GuidelineBrush, CodingConventionsManager);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-#pragma warning restore IDE0067 // Dispose objects before losing scope
         }
 
         public void OnImportsSatisfied()

diff --git a/src/ColumnGuide/EditorGuidelinesPackage.cs b/src/ColumnGuide/EditorGuidelinesPackage.cs
@@ -67,12 +67,12 @@ public EditorGuidelinesPackage()
         }
 
         /////////////////////////////////////////////////////////////////////////////
-        // Overriden Package Implementation
+        // Overridden Package Implementation
         #region Package Members
 
         /// <summary>
         /// Initialization of the package; this method is called right after the package is sited, so this is the place
-        /// where you can put all the initilaization code that rely on services provided by VisualStudio.
+        /// where you can put all the initialization code that rely on services provided by VisualStudio.
         /// </summary>
         protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
@@ -95,8 +95,7 @@ protected override async System.Threading.Tasks.Task InitializeAsync(Cancellatio
         private string GetShellVersion()
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            var shell = GetService(typeof(SVsShell)) as IVsShell;
-            if (shell != null)
+            if (GetService(typeof(SVsShell)) is IVsShell shell)
             {
                 if (ErrorHandler.Succeeded(shell.GetProperty((int)__VSSPROPID5.VSSPROPID_ReleaseVersion, out var obj)) && obj != null)
                 {
@@ -215,6 +214,7 @@ private static IVsTextView GetActiveView(IVsWindowFrame windowFrame)
                     ErrorHandler.ThrowOnFailure(codeWin.GetLastActiveView(out textView));
                 }
             }
+
             return textView;
         }
 

diff --git a/src/ColumnGuide/Telemetry.cs b/src/ColumnGuide/Telemetry.cs
@@ -31,7 +31,6 @@ public static EventTelemetry CreateInitializeTelemetryItem(string name)
 
         private static TelemetryClient CreateClient()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope. The TelemetryClient will own it.
             var configuration = new TelemetryConfiguration
             {
                 InstrumentationKey = c_instrumentationKey,
@@ -44,7 +43,6 @@ private static TelemetryClient CreateClient()
 #endif
                 }
             };
-#pragma warning restore CA2000 // Dispose objects before losing scope
 
             // Keep this context as small as possible since it's sent with every event.
             var client = new TelemetryClient(configuration);

diff --git a/src/ColumnGuide/TextEditorGuidesSettings.cs b/src/ColumnGuide/TextEditorGuidesSettings.cs
@@ -161,6 +161,7 @@ private int GetCountOfGuidelines()
             {
                 i++;
             }
+
             return i;
         }
 
@@ -186,6 +187,7 @@ private string GuidelinesConfiguration
                 {
                     _guidelinesConfiguration = GetUserSettingsString(c_textEditor, "Guides").Trim();
                 }
+
                 return _guidelinesConfiguration;
             }
 
@@ -227,6 +229,7 @@ public Color GuidelinesColor
                         }
                     }
                 }
+
                 return Colors.DarkRed;
             }
 
@@ -243,6 +246,7 @@ public IEnumerable<int> GuideLinePositionsInChars
                 {
                     yield break;
                 }
+
                 if (!config.StartsWith("RGB(", StringComparison.Ordinal))
                 {
                     yield break;

diff --git a/src/Editor Guidelines.sln b/src/Editor Guidelines.sln
@@ -10,9 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\Directory.Build.props = ..\Directory.Build.props
 		..\Directory.Build.targets = ..\Directory.Build.targets
 		..\global.json = ..\global.json
-		..\NonShipping.ruleset = ..\NonShipping.ruleset
 		..\NuGet.Config = ..\NuGet.Config
-		..\Shipping.ruleset = ..\Shipping.ruleset
 	EndProjectSection
 	ProjectSection(FolderGlobals) = preProject
 		D_5_4EditorGuidelines_4global_1json__JsonSchema = 
@@ -40,11 +38,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSIX_Dev17", "VSIX_Dev17\VSIX_Dev17.csproj", "{FEB7F80E-E565-4119-A18E-D2B9F5E95383}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		ColumnGuide\ColumnGuide.projitems*{5ade1b3f-bc61-42f3-a467-f782d4eff07e}*SharedItemsImports = 5
-		ColumnGuide\ColumnGuide.projitems*{61d4b2d7-4433-4c71-be24-57a36758ed99}*SharedItemsImports = 13
-		ColumnGuide\ColumnGuide.projitems*{feb7f80e-e565-4119-a18e-d2b9f5e95383}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -72,4 +65,9 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {64E283A2-5918-46A4-9D2B-83B601BBEBBD}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		ColumnGuide\ColumnGuide.projitems*{5ade1b3f-bc61-42f3-a467-f782d4eff07e}*SharedItemsImports = 5
+		ColumnGuide\ColumnGuide.projitems*{61d4b2d7-4433-4c71-be24-57a36758ed99}*SharedItemsImports = 13
+		ColumnGuide\ColumnGuide.projitems*{feb7f80e-e565-4119-a18e-d2b9f5e95383}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal