Added ReSharper 8.2 support.

idg10 · Mar 28, 2014 · c2e9aaa · c2e9aaa
1 parent 51f5ea3
commit c2e9aaa
Show file tree

Hide file tree

Showing 15 changed files with 331 additions and 10 deletions.
diff --git a/nuget/OrderUsings.nuspec b/nuget/OrderUsings.nuspec
@@ -9,20 +9,25 @@
     <description>Enables configurable fine control over the ordering, grouping, and spacing of C# using directives. Instead of being limited to two groups - System*, and everything else - you can define any number of groups in any order to arrange using directives however makes most sense for your project.</description>
     <summary>Control over the ordering, grouping, and spacing of C# using directives.</summary>
     <copyright>Copyright &#x00A9; 2014 Ian Griffiths</copyright>
-    <releaseNotes>&#x2022; 1.1.1 - Fixed alias handling bug
+    <releaseNotes>&#x2022; 1.2.0 - Added ReSharper 8.2 supprt
+&#x2022; 1.1.1 - Fixed alias handling bug
 &#x2022; 1.1.0 - Added ReSharper code cleanup support
 &#x2022; 1.0.0 - First release (supporting only ReSharper 8.1)</releaseNotes>
     <projectUrl>https://github.com/idg10/order-usings</projectUrl>
     <licenseUrl>https://github.com/idg10/order-usings/blob/master/LICENSE</licenseUrl>
     <iconUrl>http://b.interact-sw.co.uk/images/OrderUsingIcon.png</iconUrl>
     <dependencies>
-      <dependency id="ReSharper" version="[8.1, 8.2)" />
+      <dependency id="ReSharper" version="[8.1, 8.3)" />
     </dependencies>
   </metadata>
   <files>
     <file src="..\src\ReSharper810\bin\Release\OrderUsings.ReSharper810.dll"
           target="ReSharper\v8.1\plugins" />
     <file src="..\src\OrderUsings.Core\bin\Release\OrderUsings.Core.dll"
           target="ReSharper\v8.1\plugins" />
+    <file src="..\src\ReSharper810\bin\Release\OrderUsings.ReSharper820.dll"
+          target="ReSharper\v8.2\plugins" />
+    <file src="..\src\OrderUsings.Core\bin\Release\OrderUsings.Core.dll"
+          target="ReSharper\v8.2\plugins" />
   </files>
 </package>
diff --git a/src/OrderUsings.sln b/src/OrderUsings.sln
@@ -28,6 +28,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{00A0C9
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSharper820", "ReSharper820\ReSharper820.csproj", "{0EFF7BD1-E944-4CFD-BBF4-91563372BCAF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSharper820.Tests", "ReSharper820.Tests\ReSharper820.Tests.csproj", "{396DEB61-5CC3-48C8-8877-1E344C564E29}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,6 +54,14 @@ Global
 		{638CD37F-59CB-42AE-873D-5E09E9C32EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{638CD37F-59CB-42AE-873D-5E09E9C32EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{638CD37F-59CB-42AE-873D-5E09E9C32EAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EFF7BD1-E944-4CFD-BBF4-91563372BCAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EFF7BD1-E944-4CFD-BBF4-91563372BCAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EFF7BD1-E944-4CFD-BBF4-91563372BCAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EFF7BD1-E944-4CFD-BBF4-91563372BCAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{396DEB61-5CC3-48C8-8877-1E344C564E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{396DEB61-5CC3-48C8-8877-1E344C564E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{396DEB61-5CC3-48C8-8877-1E344C564E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{396DEB61-5CC3-48C8-8877-1E344C564E29}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/ReSharper810/Properties/AssemblyInfo.cs b/src/ReSharper810/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
 
 [assembly: ComVisible(false)]
 

diff --git a/src/ReSharper820.Tests/Properties/AssemblyInfo.cs b/src/ReSharper820.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+using NUnit.Framework;
+
+using JetBrains.Application;
+using JetBrains.Threading;
+
+using OrderUsings.Configuration;
+using OrderUsings.ReSharper.Settings;
+
+[assembly: AssemblyTitle("OrderUsings.ReSharper810.Tests")]
+[assembly: AssemblyDescription("Tests for ReSharper v8.1 Order Usings plug-in")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Ian Griffiths")]
+[assembly: AssemblyProduct("Order Usings")]
+[assembly: AssemblyCopyright("Copyright © Ian Griffiths, 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
+
+[assembly: ComVisible(false)]
+
+/// <summary>
+/// Test environment. Must be in the global namespace.
+/// </summary>
+[SetUpFixture]
+// ReSharper disable once CheckNamespace
+public class TestEnvironmentAssembly : ReSharperTestEnvironmentAssembly
+{
+    /// <summary>
+    /// Gets the assemblies to load into test environment.
+    /// Should include all assemblies which contain components.
+    /// </summary>
+    private static IEnumerable<Assembly> GetAssembliesToLoad()
+    {
+        // Test assembly
+        yield return Assembly.GetExecutingAssembly();
+
+        yield return typeof(GroupRule).Assembly;
+        yield return typeof(OrderUsingsSettings).Assembly;
+    }
+
+    public override void SetUp()
+    {
+        base.SetUp();
+        ReentrancyGuard.Current.Execute(
+          "LoadAssemblies",
+          () => Shell.Instance.GetComponent<AssemblyManager>().LoadAssemblies(
+            GetType().Name, GetAssembliesToLoad()));
+    }
+
+    public override void TearDown()
+    {
+        ReentrancyGuard.Current.Execute(
+          "UnloadAssemblies",
+          () => Shell.Instance.GetComponent<AssemblyManager>().UnloadAssemblies(
+            GetType().Name, GetAssembliesToLoad()));
+        base.TearDown();
+    }
+}
diff --git a/src/ReSharper820.Tests/ReSharper820.Tests.csproj b/src/ReSharper820.Tests/ReSharper820.Tests.csproj
@@ -0,0 +1,87 @@
+<?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.Tests.8.2.1158\build\JetBrains.ReSharper.SDK.Tests.Props" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.Tests.8.2.1158\build\JetBrains.ReSharper.SDK.Tests.Props')" />
+  <Import Project="..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Props" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Props')" />
+  <PropertyGroup>
+    <ReSharperSdkMode>Tests</ReSharperSdkMode>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{396DEB61-5CC3-48C8-8877-1E344C564E29}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ReSharper.Tests</RootNamespace>
+    <AssemblyName>ReSharper820.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</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>JET_MODE_ASSERT;DEBUG;TRACE</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>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Resharper810.Tests\CodeCleanup\WhenOrderIsWrong.cs">
+      <Link>CodeCleanup\WhenOrderIsWrong.cs</Link>
+    </Compile>
+    <Compile Include="..\Resharper810.Tests\Highlighting\WhenOrderIsWrong.cs">
+      <Link>Highlighting\WhenOrderIsWrong.cs</Link>
+    </Compile>
+    <Compile Include="..\Resharper810.Tests\Highlighting\WhenSpacingIsWrong.cs">
+      <Link>Highlighting\WhenSpacingIsWrong.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OrderUsings.Core\OrderUsings.Core.csproj">
+      <Project>{9875da0a-db09-47b2-80b5-80b08e430cef}</Project>
+      <Name>OrderUsings.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ReSharper820\ReSharper820.csproj">
+      <Project>{0eff7bd1-e944-4cfd-bbf4-91563372bcaf}</Project>
+      <Name>ReSharper820</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>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}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Props'))" />
+    <Error Condition="!Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets'))" />
+    <Error Condition="!Exists('..\packages\JetBrains.ReSharper.SDK.Tests.8.2.1158\build\JetBrains.ReSharper.SDK.Tests.Props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.ReSharper.SDK.Tests.8.2.1158\build\JetBrains.ReSharper.SDK.Tests.Props'))" />
+  </Target>
+  <Import Project="..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets')" />
+</Project>
diff --git a/src/ReSharper820.Tests/ReadMe.txt b/src/ReSharper820.Tests/ReadMe.txt
@@ -0,0 +1,7 @@
+You have just generated an empty ReSharper plugin test project.
+
+To add additional tests to your project, use the Add|New Item... menu.
+
+To add test data to your project, open or create a \test\data folder inside
+the solution folder. Then, in each of the tests you create, be sure to override
+the RelativeTestDataPath property to correctly point ReSharper to your tests.
diff --git a/src/ReSharper820.Tests/packages.config b/src/ReSharper820.Tests/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="JetBrains.ReSharper.SDK" version="8.2.1158" targetFramework="net40" />
+  <package id="JetBrains.ReSharper.SDK.Tests" version="8.2.1158" targetFramework="net40" />
+</packages>
diff --git a/src/ReSharper820/Properties/AssemblyInfo.cs b/src/ReSharper820/Properties/AssemblyInfo.cs
@@ -0,0 +1,25 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using JetBrains.ActionManagement;
+using JetBrains.Application.PluginSupport;
+
+[assembly: AssemblyTitle("ReSharper820")]
+[assembly: AssemblyDescription("Rules-based ordering for C# using directives")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Ian Griffiths")]
+[assembly: AssemblyProduct("Order Usings")]
+[assembly: AssemblyCopyright("Copyright © Ian Griffiths, 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
+
+[assembly: ActionsXml("ReSharper820.Actions.xml")]
+
+// The following information is displayed by ReSharper in the Plugins dialog
+[assembly: PluginTitle("Order Usings")]
+[assembly: PluginDescription("Rules-based ordering for C# using directives")]
+[assembly: PluginVendor("Ian Griffiths")]
+
+[assembly: InternalsVisibleTo("ReSharper820.Tests")]
diff --git a/src/ReSharper820/ReSharper820.csproj b/src/ReSharper820/ReSharper820.csproj
@@ -0,0 +1,112 @@
+<?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.2.1158\build\JetBrains.ReSharper.SDK.Props" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\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>{0EFF7BD1-E944-4CFD-BBF4-91563372BCAF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OrderUsings.ReSharper</RootNamespace>
+    <AssemblyName>OrderUsings.ReSharper820</AssemblyName>
+    <TargetFrameworkVersion>v4.0</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>JET_MODE_ASSERT;DEBUG;TRACE</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>
+    <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.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\ReSharper810\CodeCleanup\OrderAndSpaceCleanupDescriptor.cs">
+      <Link>CodeCleanup\OrderAndSpaceCleanupDescriptor.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\CodeCleanup\OrderAndSpacingCodeCleanupModule.cs">
+      <Link>CodeCleanup\OrderAndSpacingCodeCleanupModule.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\CodeModel\ImportReader.cs">
+      <Link>CodeModel\ImportReader.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Fixes.cs">
+      <Link>Fixes.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Highlightings\BaseHighlighting.cs">
+      <Link>Highlightings\BaseHighlighting.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Highlightings\UsingOrderHighlighting.cs">
+      <Link>Highlightings\UsingOrderHighlighting.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Highlightings\UsingSpacingHighlighting.cs">
+      <Link>Highlightings\UsingSpacingHighlighting.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Inspection\OrderUsingsDaemonStage.cs">
+      <Link>Inspection\OrderUsingsDaemonStage.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Inspection\OrderUsingsDaemonStageProcess.cs">
+      <Link>Inspection\OrderUsingsDaemonStageProcess.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\QuickFixes\UsingOrderAndSpacingQuickFix.cs">
+      <Link>QuickFixes\UsingOrderAndSpacingQuickFix.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Settings\OrderUsingsOptionsPage.cs">
+      <Link>Settings\OrderUsingsOptionsPage.cs</Link>
+    </Compile>
+    <Compile Include="..\ReSharper810\Settings\OrderUsingsSettings.cs">
+      <Link>Settings\OrderUsingsSettings.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OrderUsings.Core\OrderUsings.Core.csproj">
+      <Project>{9875da0a-db09-47b2-80b5-80b08e430cef}</Project>
+      <Name>OrderUsings.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>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}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Props'))" />
+    <Error Condition="!Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets'))" />
+  </Target>
+  <Import Project="..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets" Condition="Exists('..\packages\JetBrains.ReSharper.SDK.8.2.1158\build\JetBrains.ReSharper.SDK.Targets')" />
+</Project>
diff --git a/src/ReSharper820/packages.config b/src/ReSharper820/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="JetBrains.ReSharper.SDK" version="8.2.1158" targetFramework="net40" />
+</packages>
diff --git a/src/Resharper810.Tests/CodeCleanup/WhenOrderIsWrong.cs b/src/Resharper810.Tests/CodeCleanup/WhenOrderIsWrong.cs
@@ -1,4 +1,4 @@
-namespace Resharper810.Tests.CodeCleanup
+namespace Resharper.Tests.CodeCleanup
 {
     using NUnit.Framework;
 

diff --git a/src/Resharper810.Tests/Highlighting/WhenOrderIsWrong.cs b/src/Resharper810.Tests/Highlighting/WhenOrderIsWrong.cs
@@ -1,4 +1,4 @@
-namespace Resharper810.Tests.Highlighting
+namespace Resharper.Tests.Highlighting
 {
     using System;
 

diff --git a/src/Resharper810.Tests/Highlighting/WhenSpacingIsWrong.cs b/src/Resharper810.Tests/Highlighting/WhenSpacingIsWrong.cs
@@ -1,4 +1,4 @@
-namespace Resharper810.Tests.Highlighting
+namespace Resharper.Tests.Highlighting
 {
     using System;