From cee5050f620ddbe6d120f71030b492a97512453d Mon Sep 17 00:00:00 2001
From: BugAgain <bug.errorcode5@gmail.com>
Date: Tue, 30 Jan 2018 17:47:14 -0200
Subject: [PATCH 1/9] Not the cat

We are not referring to the :cat: here
---
 .../Refactoring/AllowMembersOrderingAnalyzerTests.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs b/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs
index 07c58f2cc..724a2cfd6 100644
--- a/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs
+++ b/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs
@@ -14,7 +14,7 @@ protected override DiagnosticAnalyzer GetDiagnosticAnalyzer()
         [Theory]
         [InlineData("class")]
         [InlineData("struct")]
-        public async void AllowMembersOrderingForEmptyTypeShouldNotTiggerDiagnostic(string typeDeclaration)
+        public async void AllowMembersOrderingForEmptyTypeShouldNotTriggerDiagnostic(string typeDeclaration)
         {
             var test = @"
             " + typeDeclaration + @" Foo
@@ -27,7 +27,7 @@ public async void AllowMembersOrderingForEmptyTypeShouldNotTiggerDiagnostic(stri
         [Theory]
         [InlineData("class")]
         [InlineData("struct")]
-        public async void AllowMembersOrderingForOneMemberShouldNotTiggerDiagnostic(string typeDeclaration)
+        public async void AllowMembersOrderingForOneMemberShouldNotTriggerDiagnostic(string typeDeclaration)
         {
             var test = @"
             " + typeDeclaration + @" Foo
@@ -41,7 +41,7 @@ public async void AllowMembersOrderingForOneMemberShouldNotTiggerDiagnostic(stri
         [Theory]
         [InlineData("class")]
         [InlineData("struct")]
-        public async void AllowMembersOrderingForMoreThanOneMemberShouldTiggerDiagnostic(string typeDeclaration)
+        public async void AllowMembersOrderingForMoreThanOneMemberShouldTriggerDiagnostic(string typeDeclaration)
         {
             var test = @"
             " + typeDeclaration + @" Foo

From 49692f909d8385ff851fc13ab2986295a5dc153c Mon Sep 17 00:00:00 2001
From: BugAgain <bug.errorcode5@gmail.com>
Date: Sun, 29 Apr 2018 21:48:38 -0300
Subject: [PATCH 2/9] Project update

---
 CodeCracker.sln                               |  5 ++++-
 runTestsCS.ps1                                |  6 ++++--
 .../CodeCracker.Test/CodeCracker.Test.csproj  | 21 ++++++++++++-------
 test/CSharp/CodeCracker.Test/packages.config  | 13 ++++++------
 .../CodeCracker.Test.Common.csproj            | 19 +++++++++++------
 .../CodeCracker.Test.Common/packages.config   | 13 ++++++------
 .../CodeCracker.Test/CodeCracker.Test.vbproj  | 20 +++++++++++-------
 .../CodeCracker.Test/packages.config          | 13 ++++++------
 8 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/CodeCracker.sln b/CodeCracker.sln
index 64406cda0..a51161b9c 100644
--- a/CodeCracker.sln
+++ b/CodeCracker.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCracker.Common", "src\Common\CodeCracker.Common\CodeCracker.Common.csproj", "{753D4757-FCBA-43BA-B1BE-89201ACDA192}"
 EndProject
@@ -137,4 +137,7 @@ Global
 		{234973E7-794D-4BC5-8D5F-FB98D8BFA967} = {E1B8ADBF-3442-4EF3-8C6B-146B576340E9}
 		{C5584F20-6E93-4D2D-B6F0-141B977AFC9F} = {E1B8ADBF-3442-4EF3-8C6B-146B576340E9}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {15B937E4-F880-478B-B387-3438FDD895F7}
+	EndGlobalSection
 EndGlobal
diff --git a/runTestsCS.ps1 b/runTestsCS.ps1
index 930bdccb4..b3f56a286 100644
--- a/runTestsCS.ps1
+++ b/runTestsCS.ps1
@@ -1,8 +1,10 @@
 param([String]$testClass)
-$testDllDirPath = "$PSScriptRoot\test\CSharp\CodeCracker.Test\bin\Debug\"
+# $testDllDirPath = "$PSScriptRoot\test\CSharp\CodeCracker.Test\bin\Debug\"
+$testDllDirPath = "test\CSharp\CodeCracker.Test\bin\Debug\"
 $testDllFileName = "CodeCracker.Test.CSharp.dll"
 $testDllFullFileName = "$testDllDirPath$testDllFileName"
-$xunitConsole = "$PSScriptRoot\packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe"
+# $xunitConsole = "$PSScriptRoot\packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe"
+$xunitConsole = "packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe"
 
 if (!(gcm nodemon -ErrorAction Ignore)) {
     Write-Host -ForegroundColor DarkRed 'Nodemon not found, install it with npm: `npm i -g nodemon`'
diff --git a/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj b/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
index dcf1020ca..57f152c68 100644
--- a/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
+++ b/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -101,14 +102,14 @@
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -231,14 +232,18 @@
     <Analyzer Include="..\..\..\packages\codecracker.CSharp.1.0.3\analyzers\dotnet\cs\CodeCracker.CSharp.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </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. Use 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\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/CSharp/CodeCracker.Test/packages.config b/test/CSharp/CodeCracker.Test/packages.config
index 22638264b..da764ee5b 100644
--- a/test/CSharp/CodeCracker.Test/packages.config
+++ b/test/CSharp/CodeCracker.Test/packages.config
@@ -19,11 +19,12 @@
   <package id="System.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
   <package id="System.Threading" version="4.0.0" targetFramework="net452" />
-  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit" version="2.3.1" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
+  <package id="xunit.assert" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj b/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj
index 905792f36..9cbc4286d 100644
--- a/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj
+++ b/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -102,14 +104,14 @@
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -133,13 +135,18 @@
     <Analyzer Include="..\..\..\packages\codecracker.CSharp.1.0.3\analyzers\dotnet\cs\CodeCracker.CSharp.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </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. Use 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\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/Common/CodeCracker.Test.Common/packages.config b/test/Common/CodeCracker.Test.Common/packages.config
index c24c4bdc2..fa7ed6cc5 100644
--- a/test/Common/CodeCracker.Test.Common/packages.config
+++ b/test/Common/CodeCracker.Test.Common/packages.config
@@ -24,11 +24,12 @@
   <package id="System.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
   <package id="System.Threading" version="4.0.0" targetFramework="net452" />
-  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit" version="2.3.1" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.runner.console" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
+  <package id="xunit.assert" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.runner.console" version="2.3.1" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj b/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj
index a0ead244c..88e25bc4b 100644
--- a/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj
+++ b/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -112,14 +113,14 @@
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -226,8 +227,11 @@
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/VisualBasic/CodeCracker.Test/packages.config b/test/VisualBasic/CodeCracker.Test/packages.config
index 4e3b70206..7d8254892 100644
--- a/test/VisualBasic/CodeCracker.Test/packages.config
+++ b/test/VisualBasic/CodeCracker.Test/packages.config
@@ -19,11 +19,12 @@
   <package id="System.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
   <package id="System.Threading" version="4.0.0" targetFramework="net452" />
-  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit" version="2.3.1" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
+  <package id="xunit.assert" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file

From aaf0f2988193cdce204d5850d1a880c655159345 Mon Sep 17 00:00:00 2001
From: BugAgain <bug.errorcode5@gmail.com>
Date: Sun, 29 Apr 2018 23:53:36 -0300
Subject: [PATCH 3/9] xUnit corrections

---
 test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs | 1 +
 .../Style/ConvertToExpressionBodiedMemberTests.cs               | 2 ++
 .../CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs | 1 +
 test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs | 1 +
 4 files changed, 5 insertions(+)

diff --git a/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs b/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs
index 20637f936..74fce5482 100644
--- a/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs
+++ b/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs
@@ -54,6 +54,7 @@ public async Task FixReplacesLiteral(string literal, string fixedLiteral)
             await VerifyCSharpFixAsync(source, fixtest);
         }
 
+        [Fact]
         public async Task FixOnMethodCallReplacesLiteral()
         {
             var source = @"
diff --git a/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs b/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs
index dd4f00c79..331b8282a 100644
--- a/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs
@@ -373,6 +373,7 @@ public Foo this[int id]
             await VerifyCSharpHasNoDiagnosticsAsync(test);
         }
 
+        [Fact]
         public async Task IgnoresIndexersWithArrows()
         {
             const string test = @"
@@ -431,6 +432,7 @@ public string Foo
             await VerifyCSharpHasNoDiagnosticsAsync(test);
         }
 
+        [Fact]
         public async Task IgnoresPropertiesWithArrows()
         {
             const string test = @"
diff --git a/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs b/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs
index 553b62189..4880ea42f 100644
--- a/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs
@@ -21,6 +21,7 @@ public class Foo
             await VerifyCSharpHasNoDiagnosticsAsync(source);
         }
 
+        [Fact]
         public async Task MethodAsyncWithoutAsyncKeyword()
         {
             const string source = @"
diff --git a/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs b/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs
index 7732bb536..3f5f12a5d 100644
--- a/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs
+++ b/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs
@@ -9,6 +9,7 @@ public class RemoveUnusedVariablesTest : CodeFixVerifier
     {
         protected override CodeFixProvider GetCodeFixProvider() => new RemoveUnusedVariablesCodeFixProvider();
 
+        [Fact]
         public async Task UsingExternNoDiagnostics()
         {
             const string source = @"

From f1b3291df7b2d4ce8d64ba163fdb909fb799733d Mon Sep 17 00:00:00 2001
From: BugAgain <bug.errorcode5@gmail.com>
Date: Sun, 20 May 2018 18:16:36 -0300
Subject: [PATCH 4/9] SortUsings

---
 src/CSharp/CodeCracker/CodeCracker.csproj     |  2 +
 .../Refactoring/SortUsingsAnalyzer.cs         | 37 +++++++++++
 .../Refactoring/SortUsingsCodeFixProvider.cs  | 60 +++++++++++++++++
 src/Common/CodeCracker.Common/DiagnosticId.cs |  1 +
 .../CodeCracker.Test/CodeCracker.Test.csproj  |  1 +
 .../Refactoring/SortUsingsTest.cs             | 65 +++++++++++++++++++
 6 files changed, 166 insertions(+)
 create mode 100644 src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs
 create mode 100644 src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs
 create mode 100644 test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs

diff --git a/src/CSharp/CodeCracker/CodeCracker.csproj b/src/CSharp/CodeCracker/CodeCracker.csproj
index 22c6e50a0..729e0abda 100644
--- a/src/CSharp/CodeCracker/CodeCracker.csproj
+++ b/src/CSharp/CodeCracker/CodeCracker.csproj
@@ -71,6 +71,8 @@
     <Compile Include="Refactoring\ReplaceWithGetterOnlyAutoPropertyCodeFixProvider.cs" />
     <Compile Include="Refactoring\PropertyChangedEventArgsUnnecessaryAllocationAnalyzer.cs" />
     <Compile Include="Refactoring\PropertyChangedEventArgsUnnecessaryAllocationCodeFixProvider.cs" />
+    <Compile Include="Refactoring\SortUsingsAnalyzer.cs" />
+    <Compile Include="Refactoring\SortUsingsCodeFixProvider.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfFixAllProvider.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfCodeFixProvider.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfAnalyzer.cs" />
diff --git a/src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs b/src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs
new file mode 100644
index 000000000..2c0cdd16d
--- /dev/null
+++ b/src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs
@@ -0,0 +1,37 @@
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace CodeCracker.CSharp.Refactoring
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class SortUsingsAnalyzer : DiagnosticAnalyzer
+    {
+        internal const string Title = "Sort by length.";
+        internal const string MessageFormat = "Sort Using directives by length";
+        internal const string Category = SupportedCategories.Refactoring;
+
+        internal static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(
+            DiagnosticId.SortUsings.ToDiagnosticId(),
+            Title,
+            MessageFormat,
+            Category,
+            DiagnosticSeverity.Hidden,
+            isEnabledByDefault: true,
+            helpLinkUri: HelpLink.ForDiagnostic(DiagnosticId.SortUsings));
+
+        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
+
+        public override void Initialize(AnalysisContext context) => context.RegisterSyntaxNodeAction(AnalyzeNode, SyntaxKind.CompilationUnit);
+
+        private static void AnalyzeNode(SyntaxNodeAnalysisContext context)
+        {
+            if (context.IsGenerated()) return;
+            var root = (CompilationUnitSyntax)context.Node;
+            if (root.Usings.Count > 0)
+                context.ReportDiagnostic(Diagnostic.Create(Rule, root.GetLocation()));
+        }
+    }
+}
diff --git a/src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs b/src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs
new file mode 100644
index 000000000..e96dbb46e
--- /dev/null
+++ b/src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs
@@ -0,0 +1,60 @@
+using System.Linq;
+using System.Threading;
+using System.Composition;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace CodeCracker.CSharp.Refactoring
+{
+    [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SortUsingsCodeFixProvider)), Shared]
+    public class SortUsingsCodeFixProvider : CodeFixProvider
+    {
+        public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(DiagnosticId.SortUsings.ToDiagnosticId());
+
+        public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+        public override Task RegisterCodeFixesAsync(CodeFixContext context)
+        {
+            var diagnostic = context.Diagnostics.First();
+            context.RegisterCodeFix(CodeAction.Create("Sort by length", ct => SortUsingsAsync(context.Document, diagnostic, ct), nameof(SortUsingsCodeFixProvider)), diagnostic);
+            return Task.FromResult(0);
+        }
+
+        private static async Task<Document> SortUsingsAsync(Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
+        {
+            var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var sourceSpan = (CompilationUnitSyntax)root.FindNode(diagnostic.Location.SourceSpan);
+
+            var collector = new UsingCollector();
+            collector.Visit(root);
+
+            var sections = new List<UsingDirectiveSyntax>();
+            sections.AddRange(collector.Usings
+                .OrderBy(u => u.ToString().Contains(" static "))
+                .ThenBy(u => u.ToString().Length));
+
+            var newUsings = sourceSpan.WithUsings(SyntaxFactory.List(sections)).WithAdditionalAnnotations(Formatter.Annotation);
+            var newRoot = root.ReplaceNode(sourceSpan, newUsings);
+            return document.WithSyntaxRoot(newRoot);
+        }
+    }
+
+    internal sealed class UsingCollector : CSharpSyntaxWalker
+    {
+        private readonly List<UsingDirectiveSyntax> usingCollection = new List<UsingDirectiveSyntax>();
+
+        public IEnumerable<UsingDirectiveSyntax> Usings => usingCollection;
+
+        public override void VisitUsingDirective(UsingDirectiveSyntax node)
+        {
+            this.usingCollection.Add(node);
+        }
+    }
+}
diff --git a/src/Common/CodeCracker.Common/DiagnosticId.cs b/src/Common/CodeCracker.Common/DiagnosticId.cs
index 4dfc7ecb6..3884c00dd 100644
--- a/src/Common/CodeCracker.Common/DiagnosticId.cs
+++ b/src/Common/CodeCracker.Common/DiagnosticId.cs
@@ -85,5 +85,6 @@ public enum DiagnosticId
         SwitchCaseWithoutDefault = 120,
         ReadOnlyComplexTypes = 121,
         ReplaceWithGetterOnlyAutoProperty = 125,
+        SortUsings = 126,
     }
 }
\ No newline at end of file
diff --git a/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj b/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
index 57f152c68..de36aaf4b 100644
--- a/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
+++ b/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
@@ -132,6 +132,7 @@
     <Compile Include="Refactoring\ComputeExpressionTests.cs" />
     <Compile Include="Refactoring\ReplaceWithGetterOnlyAutoPropertyTests.cs" />
     <Compile Include="Refactoring\PropertyChangedEventArgsUnnecessaryAllocationTests.cs" />
+    <Compile Include="Refactoring\SortUsingsTest.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfTests.cs" />
     <Compile Include="Refactoring\ParameterRefectoryTests.cs" />
     <Compile Include="Refactoring\AllowMembersOrderingCodeFixProviderTests.StyleCop.cs" />
diff --git a/test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs b/test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs
new file mode 100644
index 000000000..0b61016dd
--- /dev/null
+++ b/test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs
@@ -0,0 +1,65 @@
+using Xunit;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using CodeCracker.CSharp.Refactoring;
+
+namespace CodeCracker.Test.CSharp.Refactoring
+{
+    public class SortUsingsTest : CodeFixVerifier<SortUsingsAnalyzer, SortUsingsCodeFixProvider>
+    {
+        [Fact]
+        public async Task CreateDiagnosticSortingUsings()
+        {
+            const string usings = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+using static System.Console;
+using System.Text;
+using static System.DateTime;
+using System.Threading.Tasks;";
+
+            const string source = @"static void Main(string[] args)
+{
+}";
+
+            var diagnostic = new DiagnosticResult
+            {
+                Id = DiagnosticId.SortUsings.ToDiagnosticId(),
+                Message = "Sort Using directives by length",
+                Severity = DiagnosticSeverity.Hidden,
+                Locations = new[] { new DiagnosticResultLocation("Test0.cs", 2, 5) }
+            };
+            await VerifyCSharpDiagnosticAsync(source.WrapInCSharpClass("Program", usings), diagnostic);
+        }
+
+        [Fact]
+        public async Task FixSortingUsings()
+        {
+            const string actualUsings = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+using static System.Console;
+using System.Text;
+using static System.DateTime;
+using System.Threading.Tasks;";
+
+            const string expectedUsings = @"using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using static System.Console;
+using static System.DateTime;";
+
+            const string code = @"static void Main(string[] args)
+{
+}";
+            const string typeName = "Program";
+
+            var oldSource = code.WrapInCSharpClass(typeName, actualUsings);
+            var newSource = code.WrapInCSharpClass(typeName, expectedUsings);
+            await VerifyCSharpFixAsync(oldSource, newSource);
+        }
+
+    }
+}

From 824d6b748bb0d78d8fe5bc8f5c7e45f5a2e8255d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9ury=20Sim=C3=B5es=20Bazzo?= <teurysbazzo@hotmail.com>
Date: Fri, 17 Nov 2017 17:30:13 -0200
Subject: [PATCH 5/9] first commit

---
 .../Style/TaskNameAsyncAnalyzer.cs            | 13 +++++++-
 .../Style/TaskNameASyncTests.cs               | 33 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs b/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
index 6c0f8997c..8731f531c 100644
--- a/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
+++ b/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
@@ -7,6 +7,10 @@
 
 namespace CodeCracker.CSharp.Style
 {
+
+
+
+
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
     public class TaskNameAsyncAnalyzer : DiagnosticAnalyzer
     {
@@ -32,7 +36,14 @@ public class TaskNameAsyncAnalyzer : DiagnosticAnalyzer
         private static void AnalyzeMethod(SyntaxNodeAnalysisContext context)
         {
             if (context.IsGenerated()) return;
+
             var method = (MethodDeclarationSyntax)context.Node;
+
+            //for teste
+            var semanticModel = context.SemanticModel;
+            if (method.IsImplementingInterface(semanticModel)) return;
+
+
             if (method.Identifier.ToString().EndsWith("Async")) return;
             if (method.Modifiers.Any(SyntaxKind.NewKeyword, SyntaxKind.OverrideKeyword)) return;
 
@@ -44,7 +55,7 @@ private static void AnalyzeMethod(SyntaxNodeAnalysisContext context)
                 context.ReportDiagnostic(diag);
                 return;
             }
-            var semanticModel = context.SemanticModel;
+            semanticModel = context.SemanticModel;
             var returnType = semanticModel.GetSymbolInfo(method.ReturnType).Symbol as INamedTypeSymbol;
             if (returnType == null) return;
 
diff --git a/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs b/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
index 76107647d..b8a56c098 100644
--- a/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
@@ -7,6 +7,39 @@ namespace CodeCracker.Test.CSharp.Style
 {
     public class TaskNameAsyncTests : CodeFixVerifier<TaskNameAsyncAnalyzer, TaskNameAsyncCodeFixProvider>
     {
+
+        [Fact]
+        public async Task TaskNameAsyncMethodEqualsInterface()
+        {
+            const string source = @"
+            using System.Threading.Tasks;
+
+            namespace ConsoleApplication1
+            {
+                public interface IBar
+                {
+                    Task Foo();
+                }
+
+                public class Bar : IBar
+                {
+                    public Task Foo()
+                    { }
+                }
+            }";
+
+            var expected = new DiagnosticResult
+            {
+                Id = DiagnosticId.TaskNameAsync.ToDiagnosticId(),
+                Message = string.Format(TaskNameAsyncAnalyzer.MessageFormat, "FooAsync"),
+                Severity = DiagnosticSeverity.Info,
+                Locations = new[] { new DiagnosticResultLocation("Test0.cs", 8, 26) }
+            };
+
+            await VerifyCSharpDiagnosticAsync(source, expected);
+        }
+
+
         [Fact]
         public async Task TaskNameAsyncMethodCorrect()
         {

From 9f397161e36e207a88556281cd097a664bd3a565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9ury=20Sim=C3=B5es=20Bazzo?= <teurysbazzo@hotmail.com>
Date: Sun, 19 Nov 2017 22:40:34 -0200
Subject: [PATCH 6/9] Last Commit

---
 .../CodeCracker/Style/TaskNameAsyncAnalyzer.cs      | 13 -------------
 .../CodeCracker.Test/Style/TaskNameASyncTests.cs    |  6 ++----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs b/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
index 8731f531c..daaf8019f 100644
--- a/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
+++ b/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
@@ -7,10 +7,6 @@
 
 namespace CodeCracker.CSharp.Style
 {
-
-
-
-
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
     public class TaskNameAsyncAnalyzer : DiagnosticAnalyzer
     {
@@ -38,31 +34,22 @@ private static void AnalyzeMethod(SyntaxNodeAnalysisContext context)
             if (context.IsGenerated()) return;
 
             var method = (MethodDeclarationSyntax)context.Node;
-
-            //for teste
             var semanticModel = context.SemanticModel;
             if (method.IsImplementingInterface(semanticModel)) return;
-
-
             if (method.Identifier.ToString().EndsWith("Async")) return;
             if (method.Modifiers.Any(SyntaxKind.NewKeyword, SyntaxKind.OverrideKeyword)) return;
-
             var errorMessage = method.Identifier.ToString() + "Async";
             var diag = Diagnostic.Create(Rule, method.Identifier.GetLocation(), errorMessage);
-
             if (method.Modifiers.Any(SyntaxKind.AsyncKeyword))
             {
                 context.ReportDiagnostic(diag);
                 return;
             }
-            semanticModel = context.SemanticModel;
             var returnType = semanticModel.GetSymbolInfo(method.ReturnType).Symbol as INamedTypeSymbol;
             if (returnType == null) return;
-
             if (returnType.ToString() != "System.Threading.Tasks.Task" &&
                 (!returnType.IsGenericType || returnType.ConstructedFrom.ToString() != "System.Threading.Tasks.Task<TResult>"))
                 return;
-            if (method.IsImplementingInterface(semanticModel)) return;
             context.ReportDiagnostic(diag);
         }
     }
diff --git a/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs b/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
index b8a56c098..80d73afea 100644
--- a/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
@@ -7,9 +7,8 @@ namespace CodeCracker.Test.CSharp.Style
 {
     public class TaskNameAsyncTests : CodeFixVerifier<TaskNameAsyncAnalyzer, TaskNameAsyncCodeFixProvider>
     {
-
         [Fact]
-        public async Task TaskNameAsyncMethodEqualsInterface()
+        public async Task TaskNameAsyncMethodEqualsNameMethodInterface()
         {
             const string source = @"
             using System.Threading.Tasks;
@@ -38,8 +37,7 @@ public Task Foo()
 
             await VerifyCSharpDiagnosticAsync(source, expected);
         }
-
-
+        
         [Fact]
         public async Task TaskNameAsyncMethodCorrect()
         {

From 03fc2660fe9d46e882dcfcd01976681bd583545a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=A9ury=20Sim=C3=B5es=20Bazzo?= <teurysbazzo@hotmail.com>
Date: Mon, 20 Nov 2017 11:18:36 -0200
Subject: [PATCH 7/9] Fix Bug: CC0061: Implementing interface using async
 keyword should not raise a diagnostic #936

---
 src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs    | 1 -
 test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs b/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
index daaf8019f..160d792e2 100644
--- a/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
+++ b/src/CSharp/CodeCracker/Style/TaskNameAsyncAnalyzer.cs
@@ -32,7 +32,6 @@ public class TaskNameAsyncAnalyzer : DiagnosticAnalyzer
         private static void AnalyzeMethod(SyntaxNodeAnalysisContext context)
         {
             if (context.IsGenerated()) return;
-
             var method = (MethodDeclarationSyntax)context.Node;
             var semanticModel = context.SemanticModel;
             if (method.IsImplementingInterface(semanticModel)) return;
diff --git a/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs b/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
index 80d73afea..e897d37b1 100644
--- a/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/TaskNameASyncTests.cs
@@ -26,7 +26,6 @@ public Task Foo()
                     { }
                 }
             }";
-
             var expected = new DiagnosticResult
             {
                 Id = DiagnosticId.TaskNameAsync.ToDiagnosticId(),
@@ -37,7 +36,7 @@ public Task Foo()
 
             await VerifyCSharpDiagnosticAsync(source, expected);
         }
-        
+
         [Fact]
         public async Task TaskNameAsyncMethodCorrect()
         {

From 1c2d5b537983cd751d781129d3d8180cb2652c4d Mon Sep 17 00:00:00 2001
From: Pascal Berger <pascal.berger@gmail.com>
Date: Thu, 14 Dec 2017 20:44:45 +0100
Subject: [PATCH 8/9] Fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c12e0b877..a8cb57814 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ If you want to use CodeCracker in all your projects, install the Visual Studio e
 
 ## SonarQube Plugin
 
-CodeCracker has a SonarQube Plugin that can downloaded at [Plugins HomePage](http://docs.sonarqube.org/display/PLUG/Other+Plugins). 
+CodeCracker has a SonarQube Plugin that can be downloaded at [Plugins HomePage](http://docs.sonarqube.org/display/PLUG/Other+Plugins). 
 
 ## Contributing
 

From 74eefeb399deba603048fa0776d882c709bbf334 Mon Sep 17 00:00:00 2001
From: BugAgain <bug.errorcode5@gmail.com>
Date: Tue, 30 Jan 2018 17:47:14 -0200
Subject: [PATCH 9/9] Sort usings

We are not referring to the :cat: here

Project update

xUnit corrections

SortUsings
---
 CodeCracker.sln                               |  5 +-
 runTestsCS.ps1                                |  6 +-
 src/CSharp/CodeCracker/CodeCracker.csproj     |  2 +
 .../Refactoring/SortUsingsAnalyzer.cs         | 37 +++++++++++
 .../Refactoring/SortUsingsCodeFixProvider.cs  | 60 +++++++++++++++++
 src/Common/CodeCracker.Common/DiagnosticId.cs |  1 +
 .../CodeCracker.Test/CodeCracker.Test.csproj  | 22 ++++---
 .../AllowMembersOrderingAnalyzerTests.cs      |  6 +-
 .../Refactoring/NumericLiteralTests.cs        |  1 +
 .../Refactoring/SortUsingsTest.cs             | 65 +++++++++++++++++++
 .../ConvertToExpressionBodiedMemberTests.cs   |  2 +
 .../Style/RemoveAsyncFromMethodTests.cs       |  1 +
 .../Usage/RemoveUnusedVariablesTest.cs        |  1 +
 test/CSharp/CodeCracker.Test/packages.config  | 13 ++--
 .../CodeCracker.Test.Common.csproj            | 19 ++++--
 .../CodeCracker.Test.Common/packages.config   | 13 ++--
 .../CodeCracker.Test/CodeCracker.Test.vbproj  | 20 +++---
 .../CodeCracker.Test/packages.config          | 13 ++--
 18 files changed, 241 insertions(+), 46 deletions(-)
 create mode 100644 src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs
 create mode 100644 src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs
 create mode 100644 test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs

diff --git a/CodeCracker.sln b/CodeCracker.sln
index 64406cda0..a51161b9c 100644
--- a/CodeCracker.sln
+++ b/CodeCracker.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCracker.Common", "src\Common\CodeCracker.Common\CodeCracker.Common.csproj", "{753D4757-FCBA-43BA-B1BE-89201ACDA192}"
 EndProject
@@ -137,4 +137,7 @@ Global
 		{234973E7-794D-4BC5-8D5F-FB98D8BFA967} = {E1B8ADBF-3442-4EF3-8C6B-146B576340E9}
 		{C5584F20-6E93-4D2D-B6F0-141B977AFC9F} = {E1B8ADBF-3442-4EF3-8C6B-146B576340E9}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {15B937E4-F880-478B-B387-3438FDD895F7}
+	EndGlobalSection
 EndGlobal
diff --git a/runTestsCS.ps1 b/runTestsCS.ps1
index 930bdccb4..b3f56a286 100644
--- a/runTestsCS.ps1
+++ b/runTestsCS.ps1
@@ -1,8 +1,10 @@
 param([String]$testClass)
-$testDllDirPath = "$PSScriptRoot\test\CSharp\CodeCracker.Test\bin\Debug\"
+# $testDllDirPath = "$PSScriptRoot\test\CSharp\CodeCracker.Test\bin\Debug\"
+$testDllDirPath = "test\CSharp\CodeCracker.Test\bin\Debug\"
 $testDllFileName = "CodeCracker.Test.CSharp.dll"
 $testDllFullFileName = "$testDllDirPath$testDllFileName"
-$xunitConsole = "$PSScriptRoot\packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe"
+# $xunitConsole = "$PSScriptRoot\packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe"
+$xunitConsole = "packages\xunit.runner.console.2.2.0\tools\xunit.console.x86.exe"
 
 if (!(gcm nodemon -ErrorAction Ignore)) {
     Write-Host -ForegroundColor DarkRed 'Nodemon not found, install it with npm: `npm i -g nodemon`'
diff --git a/src/CSharp/CodeCracker/CodeCracker.csproj b/src/CSharp/CodeCracker/CodeCracker.csproj
index 22c6e50a0..729e0abda 100644
--- a/src/CSharp/CodeCracker/CodeCracker.csproj
+++ b/src/CSharp/CodeCracker/CodeCracker.csproj
@@ -71,6 +71,8 @@
     <Compile Include="Refactoring\ReplaceWithGetterOnlyAutoPropertyCodeFixProvider.cs" />
     <Compile Include="Refactoring\PropertyChangedEventArgsUnnecessaryAllocationAnalyzer.cs" />
     <Compile Include="Refactoring\PropertyChangedEventArgsUnnecessaryAllocationCodeFixProvider.cs" />
+    <Compile Include="Refactoring\SortUsingsAnalyzer.cs" />
+    <Compile Include="Refactoring\SortUsingsCodeFixProvider.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfFixAllProvider.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfCodeFixProvider.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfAnalyzer.cs" />
diff --git a/src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs b/src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs
new file mode 100644
index 000000000..2c0cdd16d
--- /dev/null
+++ b/src/CSharp/CodeCracker/Refactoring/SortUsingsAnalyzer.cs
@@ -0,0 +1,37 @@
+using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace CodeCracker.CSharp.Refactoring
+{
+    [DiagnosticAnalyzer(LanguageNames.CSharp)]
+    public class SortUsingsAnalyzer : DiagnosticAnalyzer
+    {
+        internal const string Title = "Sort by length.";
+        internal const string MessageFormat = "Sort Using directives by length";
+        internal const string Category = SupportedCategories.Refactoring;
+
+        internal static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(
+            DiagnosticId.SortUsings.ToDiagnosticId(),
+            Title,
+            MessageFormat,
+            Category,
+            DiagnosticSeverity.Hidden,
+            isEnabledByDefault: true,
+            helpLinkUri: HelpLink.ForDiagnostic(DiagnosticId.SortUsings));
+
+        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
+
+        public override void Initialize(AnalysisContext context) => context.RegisterSyntaxNodeAction(AnalyzeNode, SyntaxKind.CompilationUnit);
+
+        private static void AnalyzeNode(SyntaxNodeAnalysisContext context)
+        {
+            if (context.IsGenerated()) return;
+            var root = (CompilationUnitSyntax)context.Node;
+            if (root.Usings.Count > 0)
+                context.ReportDiagnostic(Diagnostic.Create(Rule, root.GetLocation()));
+        }
+    }
+}
diff --git a/src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs b/src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs
new file mode 100644
index 000000000..e96dbb46e
--- /dev/null
+++ b/src/CSharp/CodeCracker/Refactoring/SortUsingsCodeFixProvider.cs
@@ -0,0 +1,60 @@
+using System.Linq;
+using System.Threading;
+using System.Composition;
+using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace CodeCracker.CSharp.Refactoring
+{
+    [ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(SortUsingsCodeFixProvider)), Shared]
+    public class SortUsingsCodeFixProvider : CodeFixProvider
+    {
+        public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(DiagnosticId.SortUsings.ToDiagnosticId());
+
+        public sealed override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer;
+
+        public override Task RegisterCodeFixesAsync(CodeFixContext context)
+        {
+            var diagnostic = context.Diagnostics.First();
+            context.RegisterCodeFix(CodeAction.Create("Sort by length", ct => SortUsingsAsync(context.Document, diagnostic, ct), nameof(SortUsingsCodeFixProvider)), diagnostic);
+            return Task.FromResult(0);
+        }
+
+        private static async Task<Document> SortUsingsAsync(Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
+        {
+            var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var sourceSpan = (CompilationUnitSyntax)root.FindNode(diagnostic.Location.SourceSpan);
+
+            var collector = new UsingCollector();
+            collector.Visit(root);
+
+            var sections = new List<UsingDirectiveSyntax>();
+            sections.AddRange(collector.Usings
+                .OrderBy(u => u.ToString().Contains(" static "))
+                .ThenBy(u => u.ToString().Length));
+
+            var newUsings = sourceSpan.WithUsings(SyntaxFactory.List(sections)).WithAdditionalAnnotations(Formatter.Annotation);
+            var newRoot = root.ReplaceNode(sourceSpan, newUsings);
+            return document.WithSyntaxRoot(newRoot);
+        }
+    }
+
+    internal sealed class UsingCollector : CSharpSyntaxWalker
+    {
+        private readonly List<UsingDirectiveSyntax> usingCollection = new List<UsingDirectiveSyntax>();
+
+        public IEnumerable<UsingDirectiveSyntax> Usings => usingCollection;
+
+        public override void VisitUsingDirective(UsingDirectiveSyntax node)
+        {
+            this.usingCollection.Add(node);
+        }
+    }
+}
diff --git a/src/Common/CodeCracker.Common/DiagnosticId.cs b/src/Common/CodeCracker.Common/DiagnosticId.cs
index 4dfc7ecb6..3884c00dd 100644
--- a/src/Common/CodeCracker.Common/DiagnosticId.cs
+++ b/src/Common/CodeCracker.Common/DiagnosticId.cs
@@ -85,5 +85,6 @@ public enum DiagnosticId
         SwitchCaseWithoutDefault = 120,
         ReadOnlyComplexTypes = 121,
         ReplaceWithGetterOnlyAutoProperty = 125,
+        SortUsings = 126,
     }
 }
\ No newline at end of file
diff --git a/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj b/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
index dcf1020ca..de36aaf4b 100644
--- a/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
+++ b/test/CSharp/CodeCracker.Test/CodeCracker.Test.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -101,14 +102,14 @@
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -131,6 +132,7 @@
     <Compile Include="Refactoring\ComputeExpressionTests.cs" />
     <Compile Include="Refactoring\ReplaceWithGetterOnlyAutoPropertyTests.cs" />
     <Compile Include="Refactoring\PropertyChangedEventArgsUnnecessaryAllocationTests.cs" />
+    <Compile Include="Refactoring\SortUsingsTest.cs" />
     <Compile Include="Refactoring\SplitIntoNestedIfTests.cs" />
     <Compile Include="Refactoring\ParameterRefectoryTests.cs" />
     <Compile Include="Refactoring\AllowMembersOrderingCodeFixProviderTests.StyleCop.cs" />
@@ -231,14 +233,18 @@
     <Analyzer Include="..\..\..\packages\codecracker.CSharp.1.0.3\analyzers\dotnet\cs\CodeCracker.CSharp.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </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. Use 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\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs b/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs
index 07c58f2cc..724a2cfd6 100644
--- a/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs
+++ b/test/CSharp/CodeCracker.Test/Refactoring/AllowMembersOrderingAnalyzerTests.cs
@@ -14,7 +14,7 @@ protected override DiagnosticAnalyzer GetDiagnosticAnalyzer()
         [Theory]
         [InlineData("class")]
         [InlineData("struct")]
-        public async void AllowMembersOrderingForEmptyTypeShouldNotTiggerDiagnostic(string typeDeclaration)
+        public async void AllowMembersOrderingForEmptyTypeShouldNotTriggerDiagnostic(string typeDeclaration)
         {
             var test = @"
             " + typeDeclaration + @" Foo
@@ -27,7 +27,7 @@ public async void AllowMembersOrderingForEmptyTypeShouldNotTiggerDiagnostic(stri
         [Theory]
         [InlineData("class")]
         [InlineData("struct")]
-        public async void AllowMembersOrderingForOneMemberShouldNotTiggerDiagnostic(string typeDeclaration)
+        public async void AllowMembersOrderingForOneMemberShouldNotTriggerDiagnostic(string typeDeclaration)
         {
             var test = @"
             " + typeDeclaration + @" Foo
@@ -41,7 +41,7 @@ public async void AllowMembersOrderingForOneMemberShouldNotTiggerDiagnostic(stri
         [Theory]
         [InlineData("class")]
         [InlineData("struct")]
-        public async void AllowMembersOrderingForMoreThanOneMemberShouldTiggerDiagnostic(string typeDeclaration)
+        public async void AllowMembersOrderingForMoreThanOneMemberShouldTriggerDiagnostic(string typeDeclaration)
         {
             var test = @"
             " + typeDeclaration + @" Foo
diff --git a/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs b/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs
index 20637f936..74fce5482 100644
--- a/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs
+++ b/test/CSharp/CodeCracker.Test/Refactoring/NumericLiteralTests.cs
@@ -54,6 +54,7 @@ public async Task FixReplacesLiteral(string literal, string fixedLiteral)
             await VerifyCSharpFixAsync(source, fixtest);
         }
 
+        [Fact]
         public async Task FixOnMethodCallReplacesLiteral()
         {
             var source = @"
diff --git a/test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs b/test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs
new file mode 100644
index 000000000..0b61016dd
--- /dev/null
+++ b/test/CSharp/CodeCracker.Test/Refactoring/SortUsingsTest.cs
@@ -0,0 +1,65 @@
+using Xunit;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using CodeCracker.CSharp.Refactoring;
+
+namespace CodeCracker.Test.CSharp.Refactoring
+{
+    public class SortUsingsTest : CodeFixVerifier<SortUsingsAnalyzer, SortUsingsCodeFixProvider>
+    {
+        [Fact]
+        public async Task CreateDiagnosticSortingUsings()
+        {
+            const string usings = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+using static System.Console;
+using System.Text;
+using static System.DateTime;
+using System.Threading.Tasks;";
+
+            const string source = @"static void Main(string[] args)
+{
+}";
+
+            var diagnostic = new DiagnosticResult
+            {
+                Id = DiagnosticId.SortUsings.ToDiagnosticId(),
+                Message = "Sort Using directives by length",
+                Severity = DiagnosticSeverity.Hidden,
+                Locations = new[] { new DiagnosticResultLocation("Test0.cs", 2, 5) }
+            };
+            await VerifyCSharpDiagnosticAsync(source.WrapInCSharpClass("Program", usings), diagnostic);
+        }
+
+        [Fact]
+        public async Task FixSortingUsings()
+        {
+            const string actualUsings = @"using System;
+using System.Collections.Generic;
+using System.Linq;
+using static System.Console;
+using System.Text;
+using static System.DateTime;
+using System.Threading.Tasks;";
+
+            const string expectedUsings = @"using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using static System.Console;
+using static System.DateTime;";
+
+            const string code = @"static void Main(string[] args)
+{
+}";
+            const string typeName = "Program";
+
+            var oldSource = code.WrapInCSharpClass(typeName, actualUsings);
+            var newSource = code.WrapInCSharpClass(typeName, expectedUsings);
+            await VerifyCSharpFixAsync(oldSource, newSource);
+        }
+
+    }
+}
diff --git a/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs b/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs
index dd4f00c79..331b8282a 100644
--- a/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/ConvertToExpressionBodiedMemberTests.cs
@@ -373,6 +373,7 @@ public Foo this[int id]
             await VerifyCSharpHasNoDiagnosticsAsync(test);
         }
 
+        [Fact]
         public async Task IgnoresIndexersWithArrows()
         {
             const string test = @"
@@ -431,6 +432,7 @@ public string Foo
             await VerifyCSharpHasNoDiagnosticsAsync(test);
         }
 
+        [Fact]
         public async Task IgnoresPropertiesWithArrows()
         {
             const string test = @"
diff --git a/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs b/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs
index 553b62189..4880ea42f 100644
--- a/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs
+++ b/test/CSharp/CodeCracker.Test/Style/RemoveAsyncFromMethodTests.cs
@@ -21,6 +21,7 @@ public class Foo
             await VerifyCSharpHasNoDiagnosticsAsync(source);
         }
 
+        [Fact]
         public async Task MethodAsyncWithoutAsyncKeyword()
         {
             const string source = @"
diff --git a/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs b/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs
index 7732bb536..3f5f12a5d 100644
--- a/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs
+++ b/test/CSharp/CodeCracker.Test/Usage/RemoveUnusedVariablesTest.cs
@@ -9,6 +9,7 @@ public class RemoveUnusedVariablesTest : CodeFixVerifier
     {
         protected override CodeFixProvider GetCodeFixProvider() => new RemoveUnusedVariablesCodeFixProvider();
 
+        [Fact]
         public async Task UsingExternNoDiagnostics()
         {
             const string source = @"
diff --git a/test/CSharp/CodeCracker.Test/packages.config b/test/CSharp/CodeCracker.Test/packages.config
index 22638264b..da764ee5b 100644
--- a/test/CSharp/CodeCracker.Test/packages.config
+++ b/test/CSharp/CodeCracker.Test/packages.config
@@ -19,11 +19,12 @@
   <package id="System.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
   <package id="System.Threading" version="4.0.0" targetFramework="net452" />
-  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit" version="2.3.1" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
+  <package id="xunit.assert" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj b/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj
index 905792f36..9cbc4286d 100644
--- a/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj
+++ b/test/Common/CodeCracker.Test.Common/CodeCracker.Test.Common.csproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -102,14 +104,14 @@
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -133,13 +135,18 @@
     <Analyzer Include="..\..\..\packages\codecracker.CSharp.1.0.3\analyzers\dotnet\cs\CodeCracker.CSharp.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
   </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. Use 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\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/Common/CodeCracker.Test.Common/packages.config b/test/Common/CodeCracker.Test.Common/packages.config
index c24c4bdc2..fa7ed6cc5 100644
--- a/test/Common/CodeCracker.Test.Common/packages.config
+++ b/test/Common/CodeCracker.Test.Common/packages.config
@@ -24,11 +24,12 @@
   <package id="System.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
   <package id="System.Threading" version="4.0.0" targetFramework="net452" />
-  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit" version="2.3.1" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.runner.console" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
+  <package id="xunit.assert" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.runner.console" version="2.3.1" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj b/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj
index a0ead244c..88e25bc4b 100644
--- a/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj
+++ b/test/VisualBasic/CodeCracker.Test/CodeCracker.Test.vbproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -112,14 +113,14 @@
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -226,8 +227,11 @@
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
+  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/VisualBasic/CodeCracker.Test/packages.config b/test/VisualBasic/CodeCracker.Test/packages.config
index 4e3b70206..7d8254892 100644
--- a/test/VisualBasic/CodeCracker.Test/packages.config
+++ b/test/VisualBasic/CodeCracker.Test/packages.config
@@ -19,11 +19,12 @@
   <package id="System.Runtime" version="4.0.0" targetFramework="net452" />
   <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net452" />
   <package id="System.Threading" version="4.0.0" targetFramework="net452" />
-  <package id="xunit" version="2.2.0" targetFramework="net452" />
+  <package id="xunit" version="2.3.1" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
+  <package id="xunit.assert" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net452" />
+  <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net452" developmentDependency="true" />
 </packages>
\ No newline at end of file