Skip to content

Commit

Permalink
Updated to StyleCop 4.7.54
Browse files Browse the repository at this point in the history
  • Loading branch information
citizenmatt committed Aug 29, 2016
1 parent 88d6b61 commit a6644ba
Show file tree
Hide file tree
Showing 19 changed files with 240 additions and 33 deletions.
63 changes: 33 additions & 30 deletions install/StyleCop.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,34 @@
<metadata>
<id>StyleCop.StyleCop</id>
<title>StyleCop by JetBrains</title>
<version>2016.1.1</version>
<version>2016.1.2</version>
<authors>Matt Ellis, Andy Reeves</authors>
<owners>JetBrains, Matt Ellis</owners>
<summary>StyleCop analyzes C# source code to enforce a set of style and consistency rules. Maintained by JetBrains</summary>
<description>StyleCop analyzes C# source code to enforce a set of style and consistency rules. This plugin is compatible with StyleCop 4.7.49, and maintained by JetBrains.</description>
<description>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.</description>
<releaseNotes>
&#8226; Suppress message quick fix available again (#59)
&#8226; Fix duplicate warning tooltips (#34)
&#8226; Fix insert header documentation quick fix (#57)
&#8226; Disable inspection warnings with ReSharper comments (#60)
&#8226; Don't add trailing space after last comma on line (#25)
&#8226; Updated to StyleCop 4.7.54 (StyleCop/StyleCop#52)

From 2016.1.1
&#8226; Suppress message quick fix available again (StyleCop/StyleCop#59)
&#8226; Fix duplicate warning tooltips (StyleCop/StyleCop#34)
&#8226; Fix insert header documentation quick fix (StyleCop/StyleCop#57)
&#8226; Disable inspection warnings with ReSharper comments (StyleCop/StyleCop#60)
&#8226; Don't add trailing space after last comma on line (StyleCop/StyleCop#25)
&#8226; Display StyleCop parse errors
&#8226; Display StyleCop.dll version in plugin options page

From previous releases:
&#8226; Support for ReSharper 2016.1 (#47)
&#8226; Fix to allow filtering by StyleCop issues in code inspection window (#37)
&#8226; Fix error messages in installer (#32)
&#8226; Fix to stop code cleanup opening unedited files (#27)
&#8226; Automatically disable analysis if StyleCop.Analyzers is referenced in VS2015 (#20)
&#8226; Supports loading custom StyleCop addins. Specify location in settings (#18)
&#8226; Fix duplication of constructor summary XML doc element in Code Cleanup (#17)
&#8226; StyleCop issues now grouped under "StyleCop" in Inspection Results (#16)
&#8226; Separate Code Cleanup option to create XML doc stubs (#15)
&#8226; Not honouring settings when adjusting file header in Code Cleanup (#14)
&#8226; Support for ReSharper 2016.1 (StyleCop/StyleCop#47)
&#8226; Fix to allow filtering by StyleCop issues in code inspection window (StyleCop/StyleCop#37)
&#8226; Fix error messages in installer (StyleCop/StyleCop#32)
&#8226; Fix to stop code cleanup opening unedited files (StyleCop/StyleCop#27)
&#8226; Automatically disable analysis if StyleCop.Analyzers is referenced in VS2015 (StyleCop/StyleCop#20)
&#8226; Supports loading custom StyleCop addins. Specify location in settings (StyleCop/StyleCop#18)
&#8226; Fix duplication of constructor summary XML doc element in Code Cleanup (StyleCop/StyleCop#17)
&#8226; StyleCop issues now grouped under "StyleCop" in Inspection Results (StyleCop/StyleCop#16)
&#8226; Separate Code Cleanup option to create XML doc stubs (StyleCop/StyleCop#15)
&#8226; Not honouring settings when adjusting file header in Code Cleanup (StyleCop/StyleCop#14)
</releaseNotes>
<projectUrl>https://github.com/StyleCop/StyleCop.ReSharper</projectUrl>
<licenseUrl>https://github.com/StyleCop/StyleCop/blob/master/License.html</licenseUrl>
Expand All @@ -49,8 +52,8 @@ From previous releases:
the EN spell checker, and has limited fallback - it will fallback to the
parent Culture, e.g. en-US -> en -> Invariant, but won't fallback to another
language, e.g. de-DE doesn't fallback to en -->
<file src="..\lib\StyleCop.4.7.49\mssp7en.dll" target="DotFiles" />
<file src="..\lib\StyleCop.4.7.49\mssp7en.lex" target="DotFiles" />
<file src="..\lib\StyleCop.4.7.54\mssp7en.dll" target="DotFiles" />
<file src="..\lib\StyleCop.4.7.54\mssp7en.lex" target="DotFiles" />

<!-- The default settings file needs to be located next to StyleCop.dll.
NuGet very helpfully thinks that any target with a different file extension is
Expand All @@ -63,22 +66,22 @@ From previous releases:
put ours in an Extensions folder (this only prevents overwriting clashes,
StyleCop will still try and load similarly named files, if they exist.
However, it does guard against the file not being xml) -->
<file src="..\lib\StyleCop.4.7.49\Dictionaries\CustomDictionary.xml" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopDictionaries\" />
<file src="..\lib\StyleCop.4.7.49\Dictionaries\CustomDictionary.en-GB.xml" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopDictionaries\" />
<file src="..\lib\StyleCop.4.7.49\Dictionaries\CustomDictionary.en-US.xml" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopDictionaries\" />
<file src="..\lib\StyleCop.4.7.54\Dictionaries\CustomDictionary.xml" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopDictionaries\" />
<file src="..\lib\StyleCop.4.7.54\Dictionaries\CustomDictionary.en-GB.xml" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopDictionaries\" />
<file src="..\lib\StyleCop.4.7.54\Dictionaries\CustomDictionary.en-US.xml" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopDictionaries\" />

<!-- These files get loaded dynamically, rather than by ReSharper.
The code loads all assemblies in a given folder, so let's not load/scan all of DotFiles -->
<file src="..\lib\StyleCop.4.7.49\Addins\StyleCop.CSharp.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\" />
<file src="..\lib\StyleCop.4.7.49\Addins\StyleCop.CSharp.Rules.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\" />
<file src="..\lib\StyleCop.4.7.54\Addins\StyleCop.CSharp.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\" />
<file src="..\lib\StyleCop.4.7.54\Addins\StyleCop.CSharp.Rules.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\" />

<!-- Annoyingly, the installer doesn't like multiple files with the same name, and complains
<file src="..\lib\StyleCop.4.7.49\Addins\de-DE\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\de-DE\" />
<file src="..\lib\StyleCop.4.7.49\Addins\en-GB\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\en-GB\" />
<file src="..\lib\StyleCop.4.7.49\Addins\fr-FR\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\fr-FR\" />
<file src="..\lib\StyleCop.4.7.49\Addins\pl-PL\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\pl-PL\" />
<file src="..\lib\StyleCop.4.7.49\Addins\pt-BR\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\pt-BR\" />
<file src="..\lib\StyleCop.4.7.49\Addins\ru-RU\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\ru-RU\" />
<file src="..\lib\StyleCop.4.7.54\Addins\de-DE\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\de-DE\" />
<file src="..\lib\StyleCop.4.7.54\Addins\en-GB\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\en-GB\" />
<file src="..\lib\StyleCop.4.7.54\Addins\fr-FR\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\fr-FR\" />
<file src="..\lib\StyleCop.4.7.54\Addins\pl-PL\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\pl-PL\" />
<file src="..\lib\StyleCop.4.7.54\Addins\pt-BR\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\pt-BR\" />
<file src="..\lib\StyleCop.4.7.54\Addins\ru-RU\StyleCop.CSharp.Rules.resources.dll" target="DotFiles\Extensions\StyleCop.StyleCop\StyleCopAddins\ru-RU\" />
-->

<!-- Settings -->
Expand Down
Binary file not shown.
Binary file added lib/StyleCop.4.7.54/Addins/StyleCop.CSharp.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
29 changes: 29 additions & 0 deletions lib/StyleCop.4.7.54/Dictionaries/CustomDictionary.en-GB.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Dictionary>
<Words>
<Recognized>
<Word>canonicalise</Word>
<Word>canonicalised</Word>
<Word>canonicaliser</Word>
<Word>canonicalisers</Word>
<Word>canonicalises</Word>
<Word>deserialise</Word>
<Word>deserialised</Word>
<Word>deserialiser</Word>
<Word>deserialisers</Word>
<Word>deserialises</Word>
<Word>favourited</Word>
<Word>initialiser</Word>
<Word>initialisers</Word>
<Word>serialisable</Word>
<Word>serialiser</Word>
<Word>uninitialise</Word>
<Word>uninitialises</Word>
</Recognized>
<Deprecated>
<Term PreferredAlternate="pre-processed">preprocessed</Term>
<Term PreferredAlternate="short-lived">shortlived</Term>
</Deprecated>
</Words>
</Dictionary>

24 changes: 24 additions & 0 deletions lib/StyleCop.4.7.54/Dictionaries/CustomDictionary.en-US.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Dictionary>
<Words>
<Recognized>
<Word>canonicalize</Word>
<Word>canonicalized</Word>
<Word>canonicalizer</Word>
<Word>canonicalizers</Word>
<Word>canonicalizes</Word>
<Word>deserialize</Word>
<Word>deserialized</Word>
<Word>deserializes</Word>
<Word>deserialized</Word>
<Word>favorited</Word>
<Word>initializer</Word>
<Word>initializers</Word>
<Word>serializable</Word>
<Word>serializer</Word>
<Word>uninitialize</Word>
<Word>uninitializes</Word>
</Recognized>
</Words>
</Dictionary>

106 changes: 106 additions & 0 deletions lib/StyleCop.4.7.54/Dictionaries/CustomDictionary.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<Dictionary>
<Words>
<Recognized>
<Word>accessor</Word>
<Word>accessors</Word>
<Word>addin</Word>
<Word>addins</Word>
<Word>Args</Word>
<Word>args</Word>
<Word>async</Word>
<Word>cacheability</Word>
<Word>callee</Word>
<Word>captcha</Word>
<Word>CodePlex</Word>
<Word>comparand</Word>
<Word>comparands</Word>
<Word>config</Word>
<Word>csproj</Word>
<Word>declarator</Word>
<Word>declarators</Word>
<Word>decryptable</Word>
<Word>dependant</Word>
<Word>dialog</Word>
<Word>elif</Word>
<Word>endif</Word>
<Word>enqueue</Word>
<Word>enqueued</Word>
<Word>enqueueing</Word>
<Word>enqueues</Word>
<Word>enum</Word>
<Word>Env</Word>
<Word>etc</Word>
<Word>Foo</Word>
<Word>foreach</Word>
<Word>goto</Word>
<Word>guids</Word>
<Word>guid</Word>
<Word>ietf</Word>
<Word>inlined</Word>
<Word>iterator</Word>
<Word>iterators</Word>
<Word>leaderboard</Word>
<Word>leaderboards</Word>
<Word>leafname</Word>
<Word>lexer</Word>
<Word>loggable</Word>
<Word>lossiness</Word>
<Word>minification</Word>
<Word>mutex</Word>
<Word>muxer</Word>
<Word>muxing</Word>
<Word>nameof</Word>
<Word>overridable</Word>
<Word>ownable</Word>
<Word>packshot</Word>
<Word>plugin</Word>
<Word>plugins</Word>
<Word>prepend</Word>
<Word>prepends</Word>
<Word>readonly</Word>
<Word>refactored</Word>
<Word>reformatter</Word>
<Word>remoted</Word>
<Word>restartable</Word>
<Word>rethrow</Word>
<Word>retriable</Word>
<Word>retval</Word>
<Word>rewindable</Word>
<Word>rfc</Word>
<Word>seekable</Word>
<Word>settings</Word>
<Word>signalled</Word>
<Word>sizeof</Word>
<Word>stackalloc</Word>
<Word>streamable</Word>
<Word>struct</Word>
<Word>structs</Word>
<Word>StyleCop</Word>
<Word>subkey</Word>
<Word>typeof</Word>
<Word>typeless</Word>
<Word>uname</Word>
<Word>unassessed</Word>
<Word>unbias</Word>
<Word>undefine</Word>
<Word>undefines</Word>
<Word>unencoded</Word>
<Word>unescaped</Word>
<Word>Unescapes</Word>
<Word>unix</Word>
<Word>unowned</Word>
<Word>Unsecures</Word>
<Word>unsecuring</Word>
<Word>uploader</Word>
<Word>url</Word>
<Word>Usings</Word>
<Word>utils</Word>
<Word>wildcarded</Word>
<Word>xpath</Word>
<Word>xxxx</Word>
<Word>yyyy</Word>
</Recognized>
</Words>
</Dictionary>

45 changes: 45 additions & 0 deletions lib/StyleCop.4.7.54/Settings.StyleCop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<StyleCopSettings Version="4.3">
<GlobalSettings>
<CollectionProperty Name="DeprecatedWords">
<Value>preprocessor,pre-processor</Value>
<Value>shortlived,short-lived</Value>
</CollectionProperty>
</GlobalSettings>
<Parsers>
<Parser ParserId="StyleCop.CSharp.CsParser">
<ParserSettings>
<CollectionProperty Name="GeneratedFileFilters">
<Value>\.g\.cs$</Value>
<Value>\.generated\.cs$</Value>
<Value>\.g\.i\.cs$</Value>
<Value>TemporaryGeneratedFile_.*\.cs$</Value>
</CollectionProperty>
</ParserSettings>
</Parser>
</Parsers>
<Analyzers>
<Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
<AnalyzerSettings>
<CollectionProperty Name="Hungarian">
<Value>as</Value>
<Value>do</Value>
<Value>id</Value>
<Value>if</Value>
<Value>in</Value>
<Value>ip</Value>
<Value>is</Value>
<Value>mx</Value>
<Value>my</Value>
<Value>no</Value>
<Value>on</Value>
<Value>to</Value>
<Value>ui</Value>
<Value>vs</Value>
<Value>x</Value>
<Value>y</Value>
<Value>z</Value>
</CollectionProperty>
</AnalyzerSettings>
</Analyzer>
</Analyzers>
</StyleCopSettings>
Binary file added lib/StyleCop.4.7.54/StyleCop.dll
Binary file not shown.
Binary file added lib/StyleCop.4.7.54/mssp7en.dll
Binary file not shown.
Binary file added lib/StyleCop.4.7.54/mssp7en.lex
Binary file not shown.
2 changes: 1 addition & 1 deletion src/AssemblyVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@

[assembly: AssemblyVersion("4.7.1000.0")] // Fixed at 4.7.1000.0 until version 5.

[assembly: AssemblyFileVersion("4.7.49.0")]
[assembly: AssemblyFileVersion("4.7.54.0")]
4 changes: 2 additions & 2 deletions src/StyleCop.ReSharper/StyleCop.ReSharper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</Reference>
<Reference Include="StyleCop, Version=4.7.1000.0, Culture=neutral, PublicKeyToken=f904653c63bc2738, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\StyleCop.4.7.49\StyleCop.dll</HintPath>
<HintPath>..\..\lib\StyleCop.4.7.54\StyleCop.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -522,4 +522,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

0 comments on commit a6644ba

Please sign in to comment.