From 893f618abfc4e58644e764a5b3511a264144ec97 Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Mon, 10 Oct 2016 15:43:28 +0100 Subject: [PATCH] Remove nunit pattern from file layout The nunit file format is nice (cleanup puts setup/teardown methods first, then members, then alphabetical test methods), but StyleCop doesn't recognise this, so remove it. --- install/StyleCop.nuspec | 5 +++- src/StyleCop.ReSharper/StyleCop.dotSettings | 33 --------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/install/StyleCop.nuspec b/install/StyleCop.nuspec index 3673039..92246e6 100644 --- a/install/StyleCop.nuspec +++ b/install/StyleCop.nuspec @@ -3,12 +3,15 @@ StyleCop.StyleCop StyleCop by JetBrains - 2016.2.0 + 2016.2.1 Matt Ellis, Andy Reeves JetBrains, Matt Ellis StyleCop analyzes C# source code to enforce a set of style and consistency rules. Maintained by JetBrains StyleCop analyzes C# source code to enforce a set of style and consistency rules. This plugin is compatible with StyleCop 4.7.54, and maintained by JetBrains. +• Remove NUnit file layout pattern, since it doesn't match StyleCop guidelines + +From 2016.2.0: • Updated to ReSharper 2016.2 (StyleCop/StyleCop#55) From 2016.1.4: diff --git a/src/StyleCop.ReSharper/StyleCop.dotSettings b/src/StyleCop.ReSharper/StyleCop.dotSettings index eb83508..9b51148 100644 --- a/src/StyleCop.ReSharper/StyleCop.dotSettings +++ b/src/StyleCop.ReSharper/StyleCop.dotSettings @@ -278,39 +278,6 @@ </And> </TypePattern.Match> </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> <TypePattern DisplayName="Default Pattern (StyleCop)" RemoveRegions="All"> <Entry DisplayName="Constants"> <Entry.Match>