Support for ReSharper 8.1

.gitignore

@@ -130,7 +130,7 @@ publish/
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+packages/
 
 # Windows Azure Build Output
 csx

CleanCode/src/CleanCode.sln

@@ -1,8 +1,12 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CleanCode", "CleanCode\CleanCode.csproj", "{4FF42D42-187D-4332-8154-49506B1DB698}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CleanCode.8.1", "CleanCode\CleanCode.8.1.csproj", "{5F96119C-2646-4298-AD40-30209E7E7BB2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -13,6 +17,10 @@ Global
 		{4FF42D42-187D-4332-8154-49506B1DB698}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FF42D42-187D-4332-8154-49506B1DB698}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FF42D42-187D-4332-8154-49506B1DB698}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F96119C-2646-4298-AD40-30209E7E7BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F96119C-2646-4298-AD40-30209E7E7BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F96119C-2646-4298-AD40-30209E7E7BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F96119C-2646-4298-AD40-30209E7E7BB2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CleanCode/src/CleanCode/CleanCode.8.1.csproj

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\JetBrains.ReSharper.SDK.8.1.296-EAP\build\JetBrains.ReSharper.SDK.Props" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.1.296-EAP\build\JetBrains.ReSharper.SDK.Props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5F96119C-2646-4298-AD40-30209E7E7BB2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CleanCode</RootNamespace>
+    <AssemblyName>CleanCode.8.1</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;JET_MODE_ASSERT,RESHARPER_81</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;RESHARPER_81</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartAction>Program</StartAction>
+    <StartProgram>$(VsInstallDir)devenv.exe</StartProgram>
+    <StartArguments>/ReSharper.Plugin $(AssemblyName).dll /ReSharper.Internal</StartArguments>
+    <StartWorkingDirectory>$(MSBuildProjectDirectory)\$(OutputPath)</StartWorkingDirectory>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Resources\Icons-8.1\Settings\ThemedIcons.Settings.Generated.cs" />
+    <Compile Include="TooManyDependencies\TooManyDependenciesDaemonStage.cs" />
+    <Compile Include="TooManyDependencies\TooManyDependenciesDaemonStageProcess.cs" />
+    <Compile Include="TooManyDependencies\TooManyDependenciesElementProcessor.cs" />
+    <Compile Include="TooManyDependencies\TooManyDependenciesInvalidateOnMaximumDependenciesChange.cs" />
+    <Compile Include="TooManyDependencies\TooManyDependenciesHighlighting.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Settings\Stringtable.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Stringtable.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Settings\CleanCodeOptionsPage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Settings\CleanCodeSettings.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Settings\Stringtable.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Stringtable.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CleanCode.nuspec">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ThemedIconPng Include="Resources\Icons-8.1\Settings\CleanCode.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\JetBrains.ReSharper.SDK.8.1.296-EAP\build\JetBrains.ReSharper.SDK.Targets" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.1.296-EAP\build\JetBrains.ReSharper.SDK.Targets')" />
+  <Import Project="..\packages\JetBrains.ReSharper.SDK.8.1.296-EAP\tools\MSBuild\JetBrains.Build.Platform.ThemedIconsConverter.Targets" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.1.296-EAP\tools\MSBuild\JetBrains.Build.Platform.ThemedIconsConverter.Targets')" />
+</Project>

CleanCode/src/CleanCode/CleanCode.csproj

@@ -12,7 +12,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CleanCode</RootNamespace>
-    <AssemblyName>CleanCode</AssemblyName>
+    <AssemblyName>CleanCode.8.0</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -22,15 +22,15 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;JET_MODE_ASSERT,RESHARPER_80</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;RESHARPER_80</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -44,7 +44,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Settings\ThemedIcons.Settings.Generated.cs" />
+    <Compile Include="Resources\Icons-8.0\Settings\ThemedIcons.Settings.Generated.cs" />
     <Compile Include="TooManyDependencies\TooManyDependenciesDaemonStage.cs" />
     <Compile Include="TooManyDependencies\TooManyDependenciesDaemonStageProcess.cs" />
     <Compile Include="TooManyDependencies\TooManyDependenciesElementProcessor.cs" />
@@ -69,9 +69,13 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ThemedIconPng Include="Settings\CleanCode.png" />
+    <None Include="CleanCode.nuspec" />
   </ItemGroup>
+  <ItemGroup>
+    <ThemedIconPng Include="Resources\Icons-8.0\Settings\CleanCode.png" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(ReSharperSdkTargets)\Plugin.Targets" />
   <Import Project="$(ReSharperSdkTools)\MSBuild\JetBrains.Build.Platform.ThemedIconsConverter.Targets" />
-</Project>
+</Project>

CleanCode/src/CleanCode/CleanCode.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>CleanCode</id>
-    <version>3.0.0</version>
+    <version>3.0.1-EAP-20131112</version>
     <title>CleanCode</title>
     <authors>Hadi Hariri</authors>
     <owners>Hadi Hariri, Matt Ellis</owners>
@@ -18,6 +18,7 @@
     <tags>clean code</tags>
   </metadata>
   <files>
-    <file src="bin\Release\CleanCode.dll" target="ReSharper\v8.0\plugins" />
+    <file src="bin\Release\CleanCode.8.0.dll" target="ReSharper\v8.0\plugins" />
+    <file src="bin\Release\CleanCode.8.1.dll" target="ReSharper\v8.1\plugins" />
   </files>
 </package>

CleanCode/src/CleanCode/Settings/ThemedIcons.Settings.Generated.cs → CleanCode/src/CleanCode/Resources/Icons-8.0/Settings/ThemedIcons.Settings.Generated.cs

@@ -1,18 +1,19 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.32559
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: global::System.Windows.Markup.XmlnsDefinitionAttribute("urn:shemas-jetbrains-com:ui-application-icons-settings", "CleanCode")]
-[assembly: global::JetBrains.UI.Icons.CompiledIcons.CompiledIconsPackAttribute(IconPackResourceIdentification="CleanCode;component/Settings/ThemedIcons.Settings.Generated.Xaml", IconNames=new string[] {
+[assembly: global::System.Windows.Markup.XmlnsDefinitionAttribute("urn:shemas-jetbrains-com:ui-application-icons-settings", "CleanCode.Resources.Icons80")]
+[assembly: global::JetBrains.UI.Icons.CompiledIcons.CompiledIconsPackAttribute(IconPackResourceIdentification="CleanCode.8.0;component/Resources/Icons-8.0/Settings/ThemedIcons.Settings.Generat" +
+	"ed.Xaml", IconNames=new string[] {
 		"CleanCode"})]
 
-namespace CleanCode
+namespace CleanCode.Resources.Icons80
 {
 
 
@@ -27,17 +28,17 @@ namespace CleanCode
 	///  <para>It has two primary goals: load the icons of this assembly to be registered with <see cref="JetBrains.UI.Icons.IThemedIconManager" /> so that they were WPF-accessible and theme-sensitive; and emit early-bound accessors for referencing icons in codebehind in a compile-time-validated manner.</para>
 	///  <h1>XAML</h1>
 	///  <para>For performance reasons, the icons are not individually exposed with application resources. There is a custom markup extension to bind an image source in markup.</para>
-	///  <para>To use an icon from XAML, set an <see cref="System.Windows.Media.ImageSource" /> property to the <see cref="JetBrains.UI.Icons.ThemedIconExtension" /> markup extension, which takes an icon identifier class (nested in <see cref="CleanCode.SettingsThemedIcons" /> class) as a parameter.</para>
+	///  <para>To use an icon from XAML, set an <see cref="System.Windows.Media.ImageSource" /> property to the <see cref="JetBrains.UI.Icons.ThemedIconExtension" /> markup extension, which takes an icon identifier class (nested in <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons" /> class) as a parameter.</para>
 	///  <para>Example:</para>
 	///  <code>&lt;Image Source="{icons:ThemedIcon myres:SettingsThemedIcons+CleanCode}" /&gt;</code>
 	///  <h1>Attributes</h1>
 	///  <para>Sometimes you have to reference an icon from a type attriute when you're defining objects in code. Typical examples are Options pages and Tool Windows.</para>
-	///  <para>To avoid the use of string IDs which are not validated very well, we've emitted identifier classes to be used with <c>typeof()</c> expression, one per each icon. Use the attribute overload which takes a <see cref="System.Type" /> for an image, and choose your icon class from nested classes in the <see cref="CleanCode.SettingsThemedIcons" /> class.</para>
+	///  <para>To avoid the use of string IDs which are not validated very well, we've emitted identifier classes to be used with <c>typeof()</c> expression, one per each icon. Use the attribute overload which takes a <see cref="System.Type" /> for an image, and choose your icon class from nested classes in the <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons" /> class.</para>
 	///  <para>Example:</para>
 	///  <code>[Item(Name="Sample", Icon=typeof(SettingsThemedIcons.CleanCode))]</code>
 	///  <h1>CodeBehind</h1>
 	///  <para>In codebehind, we have two distinct tasks: (a) specify some icon in the APIs and (b) render icon images onscreen.</para>
-	///  <para>On the APIs stage you should only manipulate icon identifier objects (of type <see cref="JetBrains.UI.Icons.IconId" />, statically defined in <see cref="CleanCode.SettingsThemedIcons" /> in <c>Id</c> fields). Icon identifier classes (nested in <see cref="CleanCode.SettingsThemedIcons" />) should be turned into icon identifier objects as early as possible. Rendering is about getting an <see cref="System.Windows.Media.ImageSource" /> to assign to WPF, or <see cref="System.Drawing.Bitmap" /> to use with GDI+ / Windows Forms.</para>
+	///  <para>On the APIs stage you should only manipulate icon identifier objects (of type <see cref="JetBrains.UI.Icons.IconId" />, statically defined in <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons" /> in <c>Id</c> fields). Icon identifier classes (nested in <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons" />) should be turned into icon identifier objects as early as possible. Rendering is about getting an <see cref="System.Windows.Media.ImageSource" /> to assign to WPF, or <see cref="System.Drawing.Bitmap" /> to use with GDI+ / Windows Forms.</para>
 	///  <para>You should turn an identifier object into a rendered image as late as possible. The identifier is static and lightweight and does not depend on the current theme, while the image is themed and has to be loaded or generated/rasterized. You need an <see cref="JetBrains.UI.Icons.IThemedIconManager" /> instance to get the image out of an icon identifier object. Once you got the image, you should take care to change it with theme changes — either by using a live image property, or by listening to the theme change event. See <see cref="JetBrains.UI.Icons.IThemedIconManager" /> and its extensions for the related facilities.</para>
 	///  <para>Example:</para>
 	///  <code>// Getting IconId identifier object to use with APIs
@@ -57,13 +58,13 @@ public sealed class SettingsThemedIcons
 		/// <summary>
 		///  <para>
 		///    <para>Autogenerated identifier class for the CleanCode Themed Icon.</para>
-		///    <para>Identifier classes should be used in attributes, XAML, or generic parameters. Where an <see cref="JetBrains.UI.Icons.IconId" /> value is expected, use the identifier object in the <see cref="CleanCode.SettingsThemedIcons.CleanCode.Id" /> field of the identifier class.</para>
+		///    <para>Identifier classes should be used in attributes, XAML, or generic parameters. Where an <see cref="JetBrains.UI.Icons.IconId" /> value is expected, use the identifier object in the <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons.CleanCode.Id" /> field of the identifier class.</para>
 		///  </para>
 		///</summary>
 		///<remarks>
-		///  <para>For details on Themed Icons and their use, see Remarks on <see cref="CleanCode.SettingsThemedIcons" /> class.</para>
+		///  <para>For details on Themed Icons and their use, see Remarks on <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons" /> class.</para>
 		///</remarks>
-		///<seealso cref="CleanCode.SettingsThemedIcons" />
+		///<seealso cref="CleanCode.Resources.Icons80.SettingsThemedIcons" />
 		///<example>
 		///  <code>&lt;Image Source="{icons:ThemedIcon myres:SettingsThemedIcons+CleanCode}" /&gt;        &lt;!-- XAML --&gt;</code>
 		///</example>
@@ -76,20 +77,21 @@ public sealed class SettingsThemedIcons
 		///<example>
 		///  <code>themediconmanager.GetIcon&lt;SettingsThemedIcons.CleanCode&gt;()        // Icon image for rendering</code>
 		///</example>
-		[global::JetBrains.UI.Icons.CompiledIcons.CompiledIconClassAttribute("CleanCode;component/Settings/ThemedIcons.Settings.Generated.Xaml", 0, "CleanCode")]
+		[global::JetBrains.UI.Icons.CompiledIcons.CompiledIconClassAttribute("CleanCode.8.0;component/Resources/Icons-8.0/Settings/ThemedIcons.Settings.Generat" +
+			"ed.Xaml", 0, "CleanCode")]
 		public sealed class CleanCode : global::JetBrains.UI.Icons.CompiledIcons.CompiledIconClass
 		{
 
 			/// <summary>
 			///  <para>
 			///    <para>Autogenerated identifier object for the CleanCode Themed Icon.</para>
-			///    <para>Identifier objects should be used where an <see cref="JetBrains.UI.Icons.IconId" /> value is expected. In attributes, XAML, or generic parameters use the containing <see cref="CleanCode.SettingsThemedIcons.CleanCode" /> identifier class.</para>
+			///    <para>Identifier objects should be used where an <see cref="JetBrains.UI.Icons.IconId" /> value is expected. In attributes, XAML, or generic parameters use the containing <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons.CleanCode" /> identifier class.</para>
 			///  </para>
 			///</summary>
 			///<remarks>
-			///  <para>For details on Themed Icons and their use, see Remarks on <see cref="CleanCode.SettingsThemedIcons" /> class.</para>
+			///  <para>For details on Themed Icons and their use, see Remarks on <see cref="CleanCode.Resources.Icons80.SettingsThemedIcons" /> class.</para>
 			///</remarks>
-			///<seealso cref="CleanCode.SettingsThemedIcons" />
+			///<seealso cref="CleanCode.Resources.Icons80.SettingsThemedIcons" />
 			///<example>
 			///  <code>&lt;Image Source="{icons:ThemedIcon myres:SettingsThemedIcons+CleanCode}" /&gt;        &lt;!-- XAML --&gt;</code>
 			///</example>
@@ -102,7 +104,8 @@ public sealed class CleanCode : global::JetBrains.UI.Icons.CompiledIcons.Compile
 			///<example>
 			///  <code>themediconmanager.GetIcon&lt;SettingsThemedIcons.CleanCode&gt;()        // Icon image for rendering</code>
 			///</example>
-			public static global::JetBrains.UI.Icons.IconId Id = new global::JetBrains.UI.Icons.CompiledIcons.CompiledIconId("CleanCode;component/Settings/ThemedIcons.Settings.Generated.Xaml", 0, "CleanCode");
+			public static global::JetBrains.UI.Icons.IconId Id = new global::JetBrains.UI.Icons.CompiledIcons.CompiledIconId("CleanCode.8.0;component/Resources/Icons-8.0/Settings/ThemedIcons.Settings.Generat" +
+					"ed.Xaml", 0, "CleanCode");
 		}
 	}
 }