remove more stylecop references

mrlacey · May 22, 2024 · e549ddf · e549ddf
1 parent 18a5bf6
commit e549ddf
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 57 deletions.
diff --git a/VSIX/RapidXaml.AnalysisExe/RapidXaml.AnalysisExe.csproj b/VSIX/RapidXaml.AnalysisExe/RapidXaml.AnalysisExe.csproj
@@ -48,9 +48,6 @@
     <Compile Remove="..\RapidXamlToolkit\Analysis\XamlAnalysis\VsTextSnapshot.cs" />
     <Compile Remove="..\RapidXamlToolkit\Analysis\XamlAnalysis\VsTextSpan.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\RapidXaml.AnalysisCore\RapidXaml.AnalysisCore.csproj" />
     <ProjectReference Include="..\RapidXaml.Resources\RapidXaml.Resources.csproj" />

diff --git a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj
@@ -22,9 +22,6 @@
     <NoWarn>NU1608</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalSuppressions.cs">
-      <Link>GlobalSuppressions.cs</Link>
-    </Compile>
     <Compile Include="..\RapidXaml.AnalysisCore\XamlAnalysis\Attributes.cs" Link="_AnalysisCore\Attributes.cs" />
     <Compile Include="..\RapidXaml.AnalysisCore\XamlAnalysis\AttributeType.cs" Link="_AnalysisCore\AttributeType.cs" />
     <Compile Include="..\RapidXaml.AnalysisCore\XamlAnalysis\CustomAnalysis\BuiltInXamlAnalyzer.cs" Link="_AnalysisCore\BuiltInXamlAnalyzer.cs" />
@@ -51,17 +48,13 @@
     <Compile Include="..\RapidXaml.AnalysisCore\XamlAnalysis\Tags\TagErrorTypeExtensions.cs" Link="_AnalysisCore\TagErrorTypeExtensions.cs" />
     <Compile Include="..\RapidXaml.AnalysisCore\XamlAnalysis\XamlElementExtractor.cs" Link="_AnalysisCore\XamlElementExtractor.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
-  </ItemGroup>
   <ItemGroup>
         <PackageReference Include="NuGet.CommandLine" Version="6.10.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="RapidXaml.CustomAnalysis" Version="0.14.3" />
+        <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="WarnAboutTODOs">
       <Version>1.6.0</Version>
     </PackageReference>

diff --git a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec
@@ -17,8 +17,8 @@
     <tags>XAML, MAUI, MVVM, UNO, UWP, WinUI, WPF, Xamarin.Forms</tags>
     <dependencies>
       <group targetFramework="netstandard2.0">
-                <dependency id="RapidXaml.CustomAnalysis" version="0.13.0" exclude="Build,Analyzers" />
-        <dependency id="System.Memory" version="4.5.4" exclude="Build,Analyzers" />
+        <dependency id="RapidXaml.CustomAnalysis" version="0.13.0" exclude="Build,Analyzers" />
+        <dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>

diff --git a/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.csproj b/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.csproj
@@ -15,9 +15,6 @@
         <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
         <NuspecProperties>publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
     </PropertyGroup>
-    <ItemGroup>
-        <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
-    </ItemGroup>
     <ItemGroup>
         <PackageReference Include="GuiLabs.Language.Xml" Version="1.2.60" />
         <PackageReference Include="NuGet.CommandLine" Version="6.10.0">

diff --git a/...apidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers.csproj b/...apidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers.csproj
@@ -23,14 +23,6 @@
 	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />

diff --git a/VSIX/RapidXamlToolkit.Tests.AutoFix/ProjectTests.cs b/VSIX/RapidXamlToolkit.Tests.AutoFix/ProjectTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RapidXaml;
@@ -189,7 +188,7 @@ public void AllFilesAreAnalyzed()
             var (success, details) = sut.ConvertAllFilesInProject("MyApp.csproj", new[] { new WebViewMultipleActionsAnalyzer() });
 
             Assert.AreEqual(true, success);
-            Assert.AreEqual(20, details.Count());
+            Assert.AreEqual(20, details.Count(), "Unexpected number of details returned.");
             Assert.AreEqual(expectedXaml1, fs.WrittenFiles["Page1.xaml"]);
             Assert.AreEqual(expectedXaml2, fs.WrittenFiles["Page2.xaml"]);
             Assert.AreEqual(expectedXaml3, fs.WrittenFiles["Page3.xaml"]);

diff --git a/VSIX/RapidXamlToolkit.Tests/GlobalSuppressions.cs b/VSIX/RapidXamlToolkit.Tests/GlobalSuppressions.cs
@@ -1,10 +1,4 @@
 // Copyright (c) Matt Lacey Ltd. All rights reserved.
 // Licensed under the MIT license.
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "CS1591:Missing XML Comment", Justification="Documentation of code in test projects is not required.")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification="Documentation of code in test projects is not required.")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1122:Use string.Empty for empty strings", Justification = "Excused in tests")]
-
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "VSTHRD200:Use \"Async\" suffix for async methods", Justification = "Not for tests as names are already long enough.")]
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1312:Variable names should begin with lower-case letter", Justification = "Disabled to allow for discard names.")]
diff --git a/VSIX/RapidXamlToolkit.Tests/RapidXamlToolkit.Tests.csproj b/VSIX/RapidXamlToolkit.Tests/RapidXamlToolkit.Tests.csproj
@@ -161,9 +161,6 @@
     <Compile Include="XamlAnalysis\XamlElementProcessorTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
     <AdditionalFiles Include="..\todo-warn.config" Condition=" '$(Configuration)' == 'Release' ">
       <Link>todo-warn.config</Link>
     </AdditionalFiles>

diff --git a/VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj b/VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj
@@ -71,9 +71,6 @@
     <NoWarn>,1573,1591,1712,1762,NU1605,NU1608</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalSuppressions.cs">
-      <Link>GlobalSuppressions.cs</Link>
-    </Compile>
     <Compile Include="Analysis\AnalysisOptionsGrid.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -301,9 +298,6 @@
     <Compile Include="VisualStudioIntegration\VisualStudioTextManipulation.cs" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="..\stylecop.json">
-      <Link>stylecop.json</Link>
-    </AdditionalFiles>
     <Content Include="EditorExtras\SymbolVisualizer\FontAwesome.otf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>

diff --git a/VSIX/stylecop.json b/VSIX/stylecop.json