diff --git a/.gitignore b/.gitignore index f9ca77d..fb37a94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ ################# ## Visual Studio ################# +.vs/ # User-specific files *.suo diff --git a/CleanCode/src/CleanCode.nuspec b/CleanCode/src/CleanCode.nuspec index 5acc271..6c20be9 100644 --- a/CleanCode/src/CleanCode.nuspec +++ b/CleanCode/src/CleanCode.nuspec @@ -2,7 +2,7 @@ CleanCode.CleanCode - 5.1.0 + 5.3.0 Clean Code Hadi Hariri, Matt Ellis, SuperJMN Hadi Hariri, Matt Ellis @@ -12,6 +12,12 @@ false Automates some of the concepts in Uncle Bob's Clean Code book +• Updated to ReSharper 2017.3 + +From 5.2.0: +• Updated to ReSharper 2017.2 + +From 5.1.0: • Updated to ReSharper 2017.1 From 5.0.3: @@ -34,9 +40,9 @@ From 4.0.0: • Suggestion highlight if class has too many methods • Suggestion highlight if method has too many statements - Copyright 2014-2016 Hadi Hariri and Contributors + Copyright 2014-2017 Hadi Hariri and Contributors - + clean code diff --git a/CleanCode/src/CleanCode/CleanCode.csproj b/CleanCode/src/CleanCode/CleanCode.csproj index d6ea69a..3fbf304 100644 --- a/CleanCode/src/CleanCode/CleanCode.csproj +++ b/CleanCode/src/CleanCode/CleanCode.csproj @@ -1,5 +1,33 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug @@ -14,7 +42,8 @@ v4.5 512 - aa44b150 + + true @@ -33,338 +62,261 @@ 4 bin\Release\ + + + + + + + + + + + + + + + + + + Code + + + + Code + + + + + Code + + + + + + + True + True + Settings.resx + + + Warnings.resx + True + True + + + + + + + + PublicResXFileCodeGenerator + Designer + Settings.Designer.cs + + + PublicResXFileCodeGenerator + Warnings.Designer.cs + Designer + + + + + MSBuild:Compile + Designer + + + + + + + + CleanCode.nuspec + Designer + + + ..\packages\Antlr2.Runtime.2.7.7.02\lib\antlr.runtime.dll - True - - ..\packages\Appccelerate.StateMachine.JetBrains.2.2.0.1\lib\net45\Appccelerate.Fundamentals.dll - True - - - ..\packages\Appccelerate.StateMachine.JetBrains.2.2.0.1\lib\net45\Appccelerate.StateMachine.dll - True + + ..\packages\Appccelerate.StateMachine.3.3.0\lib\netstandard1.0\Appccelerate.StateMachine.dll ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - True - ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20150224.0\lib\Net\DevExpress.Data.v7.1.dll - True + ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20170610\lib\net20\DevExpress.Data.v7.1.dll - ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20150224.0\lib\Net\DevExpress.Utils.v7.1.dll - True + ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20170610\lib\net20\DevExpress.Utils.v7.1.dll - ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20150224.0\lib\Net\DevExpress.XtraEditors.v7.1.dll - True + ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20170610\lib\net20\DevExpress.XtraEditors.v7.1.dll - ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20150224.0\lib\Net\DevExpress.XtraTreeList.v7.1.dll - True + ..\packages\JetBrains.Platform.Lib.DevExpress.2.0.20170610\lib\net20\DevExpress.XtraTreeList.v7.1.dll - - ..\packages\SharpZipLib.JetBrains.Stripped.0.87.20161027.6\lib\net40\ICSharpCode.SharpZipLib.dll - True + + ..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll - - ..\packages\DotNetZip.Reduced.1.9.1.8\lib\net20\Ionic.Zip.Reduced.dll - True + + ..\packages\JetBrains.SharpZipLib.Stripped.0.87.20170720.14\lib\net40\ICSharpCode.SharpZipLib.dll - - ..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll - True + + ..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll - - ..\packages\JetBrains.Platform.MSBuild.Logger.1.0.20170130.0\lib\net\JetBrains.MSBuild.Logger.dll - True + + ..\packages\JetBrains.Platform.MSBuild.Logger.Api.1.0.20170809\lib\net\JetBrains.MSBuild.Logger.Api.dll True - ..\packages\JetBrains.System.Reflection.Metadata.1.0.0\lib\net45\JetBrains.System.Reflection.Metadata.dll - True + ..\packages\JetBrains.System.Reflection.Metadata.20170417.0.0.0\lib\net45\JetBrains.System.Reflection.Metadata.dll - - ..\packages\JetBrains.MahApps.Metro.1.3.1\lib\net45\MahApps.Metro.dll - True + + ..\packages\JetBrains.Toolset.ScriptSourcesCompiler.Interface.1.0.20170420.0\lib\net\JetBrains.Toolset.ScriptSourcesCompiler.Interface.dll + True + + + ..\packages\JetBrains.MahApps.Metro.1.5.0.1\lib\net45\MahApps.Metro.dll + + - ..\packages\JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab.2.0.20140304.0\lib\Microsoft.Deployment.Compression.dll - True + ..\packages\JetBrains.Microsoft.Deployment.Compression.Cab.3.11.0\lib\net20\Microsoft.Deployment.Compression.dll - ..\packages\JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab.2.0.20140304.0\lib\Microsoft.Deployment.Compression.Cab.dll - True + ..\packages\JetBrains.Microsoft.Deployment.Compression.Cab.3.11.0\lib\net20\Microsoft.Deployment.Compression.Cab.dll ..\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 + + + ..\packages\JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild.2.0.20141005.1\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll True ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - True ..\packages\Windows7APICodePack.JetBrains.Stripped.1.1.20150225.0\lib\Net\Microsoft.WindowsAPICodePack.dll - True ..\packages\Windows7APICodePack.JetBrains.Stripped.1.1.20150225.0\lib\Net\Microsoft.WindowsAPICodePack.Shell.dll - True - - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Client.dll - True - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Commands.dll - True + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Common.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Commands.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Configuration.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Common.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.ContentModel.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Configuration.dll ..\packages\JetBrains.NuGet.Core.2.14.1\lib\net40-Client\NuGet.Core.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.DependencyResolver.Core.dll - True - - ..\packages\JetBrains.NuGet.Frameworks.4.0.0\lib\net45\NuGet.Frameworks.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.DependencyResolver.Core.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.LibraryModel.dll - True + + ..\packages\JetBrains.NuGet.Frameworks.4.5.0.0\lib\net45\NuGet.Frameworks.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.PackageManagement.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.LibraryModel.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Packaging.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.PackageManagement.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Packaging.Core.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Packaging.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Packaging.Core.Types.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Packaging.Core.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.ProjectManagement.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.ProjectModel.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.ProjectModel.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Protocol.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Protocol.Core.Types.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Protocol.Core.v2.dll - True + + ..\packages\JetBrains.NuGet.Ultimate.4.5.0.0\lib\net45\NuGet.Resolver.dll - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Protocol.Core.v3.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Protocol.VisualStudio.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Repositories.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.Resolver.dll - True - - - ..\packages\JetBrains.NuGet.Ultimate.4.0.0\lib\net45\NuGet.RuntimeModel.dll - True - - - ..\packages\JetBrains.NuGet.Versioning.4.0.0\lib\net45\NuGet.Versioning.dll - True + + ..\packages\JetBrains.NuGet.Versioning.4.5.0.0\lib\net45\NuGet.Versioning.dll ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - True ..\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\JetBrains.Should.1.1.20\lib\Should.dll ..\packages\Sprache.JetBrains.2.1.0\lib\net40\Sprache.dll - True - + - - ..\packages\JetBrains.Platform.Lib.System.Windows.Interactivity.3.0.40218\lib\System.Windows.Interactivity.dll + ..\packages\JetBrains.System.Windows.Interactivity.3.0.40218.0\lib\net45\System.Windows.Interactivity.dll True - - - - - + ..\packages\Vestris.ResourceLib.JetBrains.1.4.20150303.0\lib\Net\Vestris.ResourceLib.dll - True - ..\packages\JetBrains.Platform.Lib.WpfContrib.2.0.20150225.0\lib\Net\WpfContrib.dll - True + ..\packages\JetBrains.Platform.Lib.WpfContrib.2.0.20170610\lib\net20\WpfContrib.dll ..\packages\xunit.JetBrains.1.9.2\lib\net20\xunit.dll - True ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - True ..\packages\xunit.runner.utility.2.2.0\lib\net35\xunit.runner.utility.net35.dll - True - - - - - - - - - - - - - - - - - - - Code - - - - Code - - - - - Code - - - - - - - True - True - Settings.resx - - - Warnings.resx - True - True - - - - - - - - PublicResXFileCodeGenerator - Designer - Settings.Designer.cs - - - PublicResXFileCodeGenerator - Warnings.Designer.cs - Designer - - - - - MSBuild:Compile - Designer - - - - - - - - CleanCode.nuspec - Designer - - + + ..\packages\YamlDotNet.Signed.4.2.1\lib\net35\YamlDotNet.dll + @@ -373,37 +325,89 @@ 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}. + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CleanCode/src/CleanCode/Settings/CleanCodeOptionsPage.cs b/CleanCode/src/CleanCode/Settings/CleanCodeOptionsPage.cs index 05f81fb..3aba8ad 100644 --- a/CleanCode/src/CleanCode/Settings/CleanCodeOptionsPage.cs +++ b/CleanCode/src/CleanCode/Settings/CleanCodeOptionsPage.cs @@ -1,9 +1,9 @@ using System.Drawing; using CleanCode.Resources.Icons; +using JetBrains.Application.UI.Options; +using JetBrains.Application.UI.Options.OptionsDialog; using JetBrains.DataFlow; using JetBrains.ReSharper.Feature.Services.Daemon.OptionPages; -using JetBrains.UI.Options; -using JetBrains.UI.Options.OptionsDialog2.SimpleOptions; using JetBrains.UI.RichText; namespace CleanCode.Settings diff --git a/CleanCode/src/CleanCode/packages.config b/CleanCode/src/CleanCode/packages.config index bf0f33c..fb2fb09 100644 --- a/CleanCode/src/CleanCode/packages.config +++ b/CleanCode/src/CleanCode/packages.config @@ -2,58 +2,75 @@ - - - + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + \ No newline at end of file diff --git a/README.md b/README.md index 1dea790..8640f85 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,6 @@ Install from ReSharper → Extension Manager. ## License -Licensed under MIT (c) 2012 - 2016 Hadi Hariri and Contributors +Licensed under MIT (c) 2012 - 2017 Hadi Hariri and Contributors Note: All references to [Clean Code](http://www.cleancoders.com/), including but not limited to the Clean Code icon are used with permission of Robert C. Martin (a.k.a. UncleBob)