Upgraded to StyleCop 4.7

AArnott · Feb 27, 2012 · ae07c33 · ae07c33
1 parent 09ddda9
commit ae07c33
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+*.log
+*.vs10x
 bin
 obj
 TestResults

diff --git a/lib/Microsoft.StyleCop.CSharp.dll b/lib/Microsoft.StyleCop.CSharp.dll
diff --git a/lib/Microsoft.StyleCop.dll b/lib/Microsoft.StyleCop.dll
diff --git a/lib/StyleCop.CSharp.dll b/lib/StyleCop.CSharp.dll
diff --git a/lib/StyleCop.dll b/lib/StyleCop.dll
diff --git a/src/NerdBank.StyleCop.Rules/NerdBank.StyleCop.Rules.csproj b/src/NerdBank.StyleCop.Rules/NerdBank.StyleCop.Rules.csproj
@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StyleCop_Path Condition=" '$(StyleCop_Path)' == '' ">..\..\lib</StyleCop_Path>
-    <StyleCopVersion>4.4.0.14</StyleCopVersion>
+    <StyleCopVersion>4.7</StyleCopVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -74,10 +74,10 @@
       <HintPath>..\..\lib\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.StyleCop">
-      <HintPath Condition=" '$(StyleCop_Path)' != '' ">$(StyleCop_Path)\Microsoft.StyleCop.dll</HintPath>
+      <HintPath Condition=" '$(StyleCop_Path)' != '' ">$(StyleCop_Path)\StyleCop.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.StyleCop.CSharp">
-      <HintPath Condition=" '$(StyleCop_Path)' != '' ">$(StyleCop_Path)\Microsoft.StyleCop.CSharp.dll</HintPath>
+      <HintPath Condition=" '$(StyleCop_Path)' != '' ">$(StyleCop_Path)\StyleCop.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -133,6 +133,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\tools\NerdBank.StyleCop.Rules.Versioning.targets" />
   <PropertyGroup>
-    <PostBuildEvent Condition=" '$(TeamCity_Version)' == '' ">cmd /c copy "$(TargetPath)" "$(ProgramFiles)\Microsoft StyleCop $(StyleCopVersion)\Custom Rules"</PostBuildEvent>
+    <PostBuildEvent Condition=" '$(TeamCity_Version)' == '' ">cmd /c copy "$(TargetPath)" "$(ProgramFiles)\StyleCop $(StyleCopVersion)\Custom Rules"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/src/NerdBank.StyleCop.Rules/NerdBankRules.cs b/src/NerdBank.StyleCop.Rules/NerdBankRules.cs
@@ -11,8 +11,8 @@ namespace NerdBank.StyleCop.Rules {
 	using System.Text;
 	using System.Text.RegularExpressions;
 
-	using Microsoft.StyleCop;
-	using Microsoft.StyleCop.CSharp;
+	using global::StyleCop;
+	using global::StyleCop.CSharp;
 
 	/// <summary>
 	/// The several rules that can be enabled/disabled individually.