From e549ddff3bb72a1b1716c5c1c5d72ae2042476c1 Mon Sep 17 00:00:00 2001 From: Matt Lacey Date: Wed, 22 May 2024 15:07:35 +0100 Subject: [PATCH] remove more stylecop references --- .../RapidXaml.AnalysisExe.csproj | 3 --- VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj | 9 +-------- VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec | 4 ++-- .../RapidXaml.CustomAnalysis.csproj | 3 --- .../RapidXaml.InternalAnalyzers.csproj | 8 -------- .../ProjectTests.cs | 3 +-- .../RapidXamlToolkit.Tests/GlobalSuppressions.cs | 6 ------ .../RapidXamlToolkit.Tests.csproj | 3 --- VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj | 6 ------ VSIX/stylecop.json | 16 ---------------- 10 files changed, 4 insertions(+), 57 deletions(-) delete mode 100644 VSIX/stylecop.json diff --git a/VSIX/RapidXaml.AnalysisExe/RapidXaml.AnalysisExe.csproj b/VSIX/RapidXaml.AnalysisExe/RapidXaml.AnalysisExe.csproj index e6f1ea79..3d396a41 100644 --- a/VSIX/RapidXaml.AnalysisExe/RapidXaml.AnalysisExe.csproj +++ b/VSIX/RapidXaml.AnalysisExe/RapidXaml.AnalysisExe.csproj @@ -48,9 +48,6 @@ - - - diff --git a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj index 9107e82b..caa6702f 100644 --- a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj +++ b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.csproj @@ -22,9 +22,6 @@ NU1608 - - GlobalSuppressions.cs - @@ -51,17 +48,13 @@ - - - stylecop.json - - all runtime; build; native; contentfiles; analyzers; buildtransitive + 1.6.0 diff --git a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec index 3e9422d2..cd8d7101 100644 --- a/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec +++ b/VSIX/RapidXaml.AutoFix/RapidXaml.AutoFix.nuspec @@ -17,8 +17,8 @@ XAML, MAUI, MVVM, UNO, UWP, WinUI, WPF, Xamarin.Forms - - + + diff --git a/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.csproj b/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.csproj index 81676b87..0da72b8b 100644 --- a/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.csproj +++ b/VSIX/RapidXaml.CustomAnalysis/RapidXaml.CustomAnalysis.csproj @@ -15,9 +15,6 @@ $(IntermediatePackDir)$(TargetFramework)/ publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir))) - - - diff --git a/VSIX/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers.csproj b/VSIX/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers.csproj index 8fd9ec95..c6cd7726 100644 --- a/VSIX/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers.csproj +++ b/VSIX/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers/RapidXaml.InternalAnalyzers.csproj @@ -23,14 +23,6 @@ true - - - - - - - - diff --git a/VSIX/RapidXamlToolkit.Tests.AutoFix/ProjectTests.cs b/VSIX/RapidXamlToolkit.Tests.AutoFix/ProjectTests.cs index 4964f430..1934237a 100644 --- 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 index 7f658b06..c75648db 100644 --- 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 index 0eb44fc4..eb69e71e 100644 --- a/VSIX/RapidXamlToolkit.Tests/RapidXamlToolkit.Tests.csproj +++ b/VSIX/RapidXamlToolkit.Tests/RapidXamlToolkit.Tests.csproj @@ -161,9 +161,6 @@ - - stylecop.json - todo-warn.config diff --git a/VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj b/VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj index 300a208c..5260da9e 100644 --- a/VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj +++ b/VSIX/RapidXamlToolkit/RapidXamlToolkit.csproj @@ -71,9 +71,6 @@ ,1573,1591,1712,1762,NU1605,NU1608 - - GlobalSuppressions.cs - Component @@ -301,9 +298,6 @@ - - stylecop.json - PreserveNewest true diff --git a/VSIX/stylecop.json b/VSIX/stylecop.json deleted file mode 100644 index 6c972c58..00000000 --- a/VSIX/stylecop.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "documentationRules": { - "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the MIT license.", - "companyName": "Matt Lacey Ltd", - "xmlHeader": false - }, - "layoutRules": { - "newlineAtEndOfFile": "require" - }, - "orderingRules": { - "usingDirectivesPlacement": "outsideNamespace" - } - } -}