From 72e325139064f44a938b49562c91f6ff42966374 Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Wed, 14 Dec 2016 16:00:00 +0000 Subject: [PATCH] Support ReSharper 2016.3 --- install/StyleCop.nuspec | 7 +- .../Framework/SuppressMessageBulbItem.cs | 4 +- .../Options/HighlightingRegistering.cs | 1 + .../Properties/AssemblyInfo.cs | 2 +- .../StyleCop.ReSharper.csproj | 304 ++++++++++++++---- src/StyleCop.ReSharper/packages.config | 108 ++++--- 6 files changed, 317 insertions(+), 109 deletions(-) diff --git a/install/StyleCop.nuspec b/install/StyleCop.nuspec index 92246e6..ad4445b 100644 --- a/install/StyleCop.nuspec +++ b/install/StyleCop.nuspec @@ -3,12 +3,15 @@ StyleCop.StyleCop StyleCop by JetBrains - 2016.2.1 + 2016.3.0 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. +• Updated to ReSharper 2016.3 + +From 2016.2.1: • Remove NUnit file layout pattern, since it doesn't match StyleCop guidelines From 2016.2.0: @@ -49,7 +52,7 @@ From previous releases: https://github.com/StyleCop/StyleCop/blob/master/License.html https://raw.githubusercontent.com/StyleCop/StyleCop/master/logo.png - + StyleCop analysis diff --git a/src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs b/src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs index e9c4634..cf480d0 100644 --- a/src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs +++ b/src/StyleCop.ReSharper/BulbItems/Framework/SuppressMessageBulbItem.cs @@ -21,9 +21,7 @@ namespace StyleCop.ReSharper.BulbItems.Framework using JetBrains.Application.Settings; using JetBrains.ProjectModel; using JetBrains.ReSharper.Psi; - using JetBrains.ReSharper.Psi.CodeStyle; using JetBrains.ReSharper.Psi.CSharp; - using JetBrains.ReSharper.Psi.CSharp.CodeStyle; using JetBrains.ReSharper.Psi.CSharp.Tree; using JetBrains.TextControl; @@ -51,7 +49,7 @@ internal class SuppressMessageBulbItem : V5BulbItemImpl /// public override void ExecuteTransactionInner(ISolution solution, ITextControl textControl) { - ICSharpModifiersOwnerDeclaration declaration = Utils.GetTypeClosestToTextControl(solution, textControl); + IAttributesOwnerDeclaration declaration = Utils.GetTypeClosestToTextControl(solution, textControl); if (declaration != null) { diff --git a/src/StyleCop.ReSharper/Options/HighlightingRegistering.cs b/src/StyleCop.ReSharper/Options/HighlightingRegistering.cs index e8dd29d..5d2b7a9 100644 --- a/src/StyleCop.ReSharper/Options/HighlightingRegistering.cs +++ b/src/StyleCop.ReSharper/Options/HighlightingRegistering.cs @@ -125,6 +125,7 @@ private void Register(StyleCopCore core) Severity.WARNING, false, false, + null, null); configurableSeverityItems.Add(Tuple.Create((PsiLanguageType)CSharpLanguage.Instance, severityItem)); } diff --git a/src/StyleCop.ReSharper/Properties/AssemblyInfo.cs b/src/StyleCop.ReSharper/Properties/AssemblyInfo.cs index 1a19e90..03fb923 100644 --- a/src/StyleCop.ReSharper/Properties/AssemblyInfo.cs +++ b/src/StyleCop.ReSharper/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // Many of the R# base types are not CLS compliant so we can't be. [assembly: CLSCompliant(false)] [assembly: Guid("1064F4C2-0AB3-43EA-AE01-0408B2D4DDFE")] -[assembly: RegisterConfigurableSeverity("StyleCop.DefaultSeverity", null, HighlightingGroupIds.CodeSmell, "item title", "item description", Severity.WARNING, false)] +[assembly: RegisterConfigurableSeverity("StyleCop.DefaultSeverity", null, HighlightingGroupIds.CodeSmell, "item title", "item description", Severity.WARNING)] diff --git a/src/StyleCop.ReSharper/StyleCop.ReSharper.csproj b/src/StyleCop.ReSharper/StyleCop.ReSharper.csproj index 2106952..3d1f3b5 100644 --- a/src/StyleCop.ReSharper/StyleCop.ReSharper.csproj +++ b/src/StyleCop.ReSharper/StyleCop.ReSharper.csproj @@ -9,10 +9,10 @@ Properties StyleCop.ReSharper StyleCop.ReSharper - v4.0 + v4.5 512 - da9b7b31 + d8db029a true @@ -23,6 +23,7 @@ prompt 4 true + false pdbonly @@ -32,6 +33,7 @@ prompt 4 true + false false @@ -44,16 +46,16 @@ ..\packages\Antlr2.Runtime.2.7.7.02\lib\antlr.runtime.dll True - - ..\packages\AsyncBridge.JetBrains.0.1.1.0\lib\net40-Client\AsyncBridge.dll + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll True - - ..\packages\AsyncIO.0.1.18.0\lib\net40\AsyncIO.dll + + ..\packages\Mono.Debugging.Win32.1.0.20161020.46\lib\net40\CorApi.dll True - - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + ..\packages\Mono.Debugging.Win32.1.0.20161020.46\lib\net40\CorApi2.dll True @@ -82,16 +84,44 @@ ..\packages\VSSDK.DTE.8.8.0.4\lib\net20\envdte80.dll True - - ..\packages\SharpZipLib.JetBrains.Stripped.0.86.20150204.1\lib\20\ICSharpCode.SharpZipLib.dll + + ..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.dll + True + + + ..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Cecil.dll + True + + + ..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.CSharp.dll + True + + + ..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Xml.dll + True + + + ..\packages\SharpZipLib.JetBrains.Stripped.0.87.20160802.0\lib\net40\ICSharpCode.SharpZipLib.dll True ..\packages\DotNetZip.Reduced.1.9.1.8\lib\net20\Ionic.Zip.Reduced.dll True - - ..\packages\JetBrains.Annotations.10.1.5\lib\net\JetBrains.Annotations.dll + + ..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll + True + + + ..\packages\JetBrains.MSBuild.Xplat.Engine.20161013.1.0\lib\net45\Microsoft.Build.dll + True + + + ..\packages\JetBrains.MSBuild.Xplat.Engine.20161013.1.0\lib\net45\Microsoft.Build.Framework.dll + True + + + ..\packages\JetBrains.MSBuild.Xplat.Engine.20161013.1.0\lib\net45\Microsoft.Build.Utilities.Core.dll True @@ -102,6 +132,26 @@ ..\packages\JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab.2.0.20140304.0\lib\Microsoft.Deployment.Compression.Cab.dll True + + ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll + True + + + ..\packages\Microsoft.Owin.FileSystems.3.0.1\lib\net45\Microsoft.Owin.FileSystems.dll + True + + + ..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll + True + + + ..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll + True + + + ..\packages\Microsoft.Owin.StaticFiles.3.0.1\lib\net45\Microsoft.Owin.StaticFiles.dll + True + ..\packages\JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild.2.0.20140304.0\lib\Microsoft.VisualStudio.Shell.Interop.dll True @@ -118,20 +168,136 @@ ..\packages\Windows7APICodePack.JetBrains.Stripped.1.1.20150225.0\lib\Net\Microsoft.WindowsAPICodePack.Shell.dll True - - ..\packages\JetBrains.Mono.Posix.0.1\lib\net40\Mono.Posix.dll + + ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + True + + + ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + True + + + ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + True + + + ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + True + + + ..\packages\Mono.Debugger.Soft.1.0.20161020.46\lib\net40\Mono.Debugger.Soft.dll + True + + + ..\packages\Mono.Debugging.1.0.20161020.46\lib\net40\Mono.Debugging.dll + True + + + ..\packages\Mono.Debugging.Soft.1.0.20161020.46\lib\net40\Mono.Debugging.Soft.dll True - - ..\packages\NetMQ.3.3.3.1\lib\net40\NetMQ.dll + + ..\packages\Mono.Debugging.Win32.1.0.20161020.46\lib\net40\Mono.Debugging.Win32.dll True - ..\packages\Newtonsoft35.Json.7.0.1\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Client.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Commands.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Common.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Configuration.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.ContentModel.dll + True + + + ..\packages\JetBrains.NuGet.Core.2.13.0\lib\net40-Client\NuGet.Core.dll True - - ..\packages\NuGet.Core.2.12.0\lib\net40-Client\NuGet.Core.dll + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.DependencyResolver.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.DependencyResolver.Core.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Frameworks.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.LibraryModel.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.PackageManagement.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Packaging.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Packaging.Core.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Packaging.Core.Types.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.ProjectManagement.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.ProjectModel.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Protocol.Core.Types.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Protocol.Core.v2.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Protocol.Core.v3.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Protocol.VisualStudio.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Repositories.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Resolver.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.RuntimeModel.dll + True + + + ..\packages\JetBrains.NuGet.Ultimate.3.5.0.1\lib\net45\NuGet.Versioning.dll True @@ -147,8 +313,16 @@ ..\packages\NVelocity.1.0.3\lib\NVelocity.dll True + + ..\packages\Owin.1.0\lib\net40\Owin.dll + True + + + ..\packages\sharpcompress.0.11.6\lib\net40\SharpCompress.dll + True + ..\packages\Sprache.JetBrains.2.0.0.44\lib\portable-net4+netcore45+win8+wp8+sl5+MonoAndroid1+MonoTouch1\Sprache.dll True @@ -162,8 +336,22 @@ ..\..\lib\StyleCop.4.7.54\StyleCop.dll + + + + + + + + + + + + ..\packages\JetBrains.MSBuild.Xplat.Engine.20161013.1.0\lib\net45\System.Threading.Tasks.Dataflow.dll + True + @@ -180,6 +368,10 @@ ..\packages\Vestris.ResourceLib.JetBrains.1.4.20150303.0\lib\Net\Vestris.ResourceLib.dll True + + ..\packages\Mono.VSCodeDebugging.1.0.20161019.44\lib\net45\VSCodeDebugging.dll + True + False ..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj.dll @@ -478,49 +670,51 @@ + + + + + - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +