From 8b8a69bc8bf98d8af22f663ba196aeb81ec5f552 Mon Sep 17 00:00:00 2001
From: Khalid Abuhakmeh <khalid@aquabirdconsulting.com>
Date: Fri, 14 Sep 2018 13:55:59 -0400
Subject: [PATCH 1/8] Target at least .NET 4.6.2 and Upgrade NEST to 6.3

---
 samples/Range.Web.Http/Range.Web.Http.csproj     |  6 ++----
 src/Filter.Nest/Filter.Nest.csproj               | 11 ++++++-----
 src/Filter.Nest/packages.config                  |  4 ++--
 src/Filter/Filter.csproj                         |  2 +-
 src/Range.Web.Http/Range.Web.Http.csproj         |  3 ++-
 src/Range/Range.csproj                           |  3 ++-
 tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj | 10 +++++-----
 tests/Filter.Nest.Tests/packages.config          |  4 ++--
 tests/Filter.Tests/Filter.Tests.csproj           |  3 ++-
 tests/Range.Tests/Range.Tests.csproj             |  2 +-
 10 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/samples/Range.Web.Http/Range.Web.Http.csproj b/samples/Range.Web.Http/Range.Web.Http.csproj
index 039c71a..0d5bf26 100755
--- a/samples/Range.Web.Http/Range.Web.Http.csproj
+++ b/samples/Range.Web.Http/Range.Web.Http.csproj
@@ -13,13 +13,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Range.Web.Http</RootNamespace>
     <AssemblyName>Range.Web.Http</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,9 +77,6 @@
       <HintPath>..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.2\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Controllers\HomeController.cs" />
diff --git a/src/Filter.Nest/Filter.Nest.csproj b/src/Filter.Nest/Filter.Nest.csproj
index 98ef8d2..94aa7a6 100755
--- a/src/Filter.Nest/Filter.Nest.csproj
+++ b/src/Filter.Nest/Filter.Nest.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RimDev.Filter.Nest</RootNamespace>
     <AssemblyName>RimDev.Filter.Nest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,12 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Elasticsearch.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Elasticsearch.Net.2.4.5\lib\net45\Elasticsearch.Net.dll</HintPath>
+    <Reference Include="Elasticsearch.Net, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d">
+      <HintPath>..\..\packages\Elasticsearch.Net.6.3.0\lib\net461\Elasticsearch.Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Nest, Version=2.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NEST.2.4.5\lib\net45\Nest.dll</HintPath>
+    <Reference Include="Nest, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d">
+      <HintPath>..\..\packages\NEST.6.3.0\lib\net461\Nest.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
diff --git a/src/Filter.Nest/packages.config b/src/Filter.Nest/packages.config
index 73ff1c5..e45c038 100755
--- a/src/Filter.Nest/packages.config
+++ b/src/Filter.Nest/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Elasticsearch.Net" version="2.4.5" targetFramework="net45" />
-  <package id="NEST" version="2.4.5" targetFramework="net45" />
+  <package id="Elasticsearch.Net" version="6.3.0" targetFramework="net462" />
+  <package id="NEST" version="6.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Filter/Filter.csproj b/src/Filter/Filter.csproj
index 070fa70..9d7e262 100755
--- a/src/Filter/Filter.csproj
+++ b/src/Filter/Filter.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RimDev.Filter</RootNamespace>
     <AssemblyName>RimDev.Filter</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/Range.Web.Http/Range.Web.Http.csproj b/src/Range.Web.Http/Range.Web.Http.csproj
index 00a8e65..0705aab 100755
--- a/src/Range.Web.Http/Range.Web.Http.csproj
+++ b/src/Range.Web.Http/Range.Web.Http.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RimDev.Filter.Range.Web.Http</RootNamespace>
     <AssemblyName>RimDev.Filter.Range.Web.Http</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Range/Range.csproj b/src/Range/Range.csproj
index dcaf785..d6b0ad6 100755
--- a/src/Range/Range.csproj
+++ b/src/Range/Range.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RimDev.Filter.Range</RootNamespace>
     <AssemblyName>RimDev.Filter.Range</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
index 484bb91..eb5e23e 100755
--- a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
+++ b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Filter.Nest.Tests</RootNamespace>
     <AssemblyName>Filter.Nest.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -34,16 +34,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Elasticsearch.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Elasticsearch.Net.2.4.5\lib\net46\Elasticsearch.Net.dll</HintPath>
+    <Reference Include="Elasticsearch.Net, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d">
+      <HintPath>..\..\packages\Elasticsearch.Net.6.3.0\lib\net461\Elasticsearch.Net.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ElasticsearchInside, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\elasticsearch-inside.2.3.5\lib\net451\ElasticsearchInside.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Nest, Version=2.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NEST.2.4.5\lib\net46\Nest.dll</HintPath>
+    <Reference Include="Nest, Version=6.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d">
+      <HintPath>..\..\packages\NEST.6.3.0\lib\net461\Nest.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
diff --git a/tests/Filter.Nest.Tests/packages.config b/tests/Filter.Nest.Tests/packages.config
index 6092354..615ba0b 100755
--- a/tests/Filter.Nest.Tests/packages.config
+++ b/tests/Filter.Nest.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Elasticsearch.Net" version="2.4.5" targetFramework="net461" />
+  <package id="Elasticsearch.Net" version="6.3.0" targetFramework="net461" />
   <package id="elasticsearch-inside" version="2.3.5" targetFramework="net461" />
-  <package id="NEST" version="2.4.5" targetFramework="net461" />
+  <package id="NEST" version="6.3.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
   <package id="xunit" version="2.0.0" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
diff --git a/tests/Filter.Tests/Filter.Tests.csproj b/tests/Filter.Tests/Filter.Tests.csproj
index 0d09a75..1576030 100755
--- a/tests/Filter.Tests/Filter.Tests.csproj
+++ b/tests/Filter.Tests/Filter.Tests.csproj
@@ -12,9 +12,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RimDev.Filter.Tests</RootNamespace>
     <AssemblyName>RimDev.Filter.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>0af85866</NuGetPackageImportStamp>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/tests/Range.Tests/Range.Tests.csproj b/tests/Range.Tests/Range.Tests.csproj
index 57954e8..91d21fe 100755
--- a/tests/Range.Tests/Range.Tests.csproj
+++ b/tests/Range.Tests/Range.Tests.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RimDev.Filter.Range.Tests</RootNamespace>
     <AssemblyName>RimDev.Filter.Range.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>2fbf3947</NuGetPackageImportStamp>
   </PropertyGroup>

From b8bac10bade3200c10f39befb1ce688243a4cbeb Mon Sep 17 00:00:00 2001
From: Khalid Abuhakmeh <khalid@aquabirdconsulting.com>
Date: Fri, 14 Sep 2018 14:33:25 -0400
Subject: [PATCH 2/8] Added Extension methods to ask for numeric or date ranges

---
 src/Filter.Nest/Filter.Nest.csproj            |  6 ++
 src/Filter.Nest/FilterLogic.cs                |  6 ++
 src/Range/Range.cs                            | 33 +++++++++++
 .../Filter.Nest.Tests.csproj                  | 29 ++++++----
 tests/Filter.Nest.Tests/packages.config       | 14 +++--
 tests/Filter.Tests/Filter.Tests.csproj        | 32 ++++++----
 .../Generic/IEnumerable`1ExtensionsTests.cs   |  4 +-
 tests/Filter.Tests/packages.config            | 14 +++--
 tests/Range.Tests/Generic/Range`1Tests.cs     | 58 +++++++++++++------
 tests/Range.Tests/Range.Tests.csproj          | 32 ++++++----
 tests/Range.Tests/RangeTests.cs               |  8 +--
 tests/Range.Tests/packages.config             | 14 +++--
 12 files changed, 178 insertions(+), 72 deletions(-)

diff --git a/src/Filter.Nest/Filter.Nest.csproj b/src/Filter.Nest/Filter.Nest.csproj
index 94aa7a6..66007e8 100755
--- a/src/Filter.Nest/Filter.Nest.csproj
+++ b/src/Filter.Nest/Filter.Nest.csproj
@@ -65,6 +65,12 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Range\Range.csproj">
+      <Project>{0e804077-79b6-4e0f-a4bb-ad5f6ec194b3}</Project>
+      <Name>Range</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
diff --git a/src/Filter.Nest/FilterLogic.cs b/src/Filter.Nest/FilterLogic.cs
index 47e0c73..610d7a0 100644
--- a/src/Filter.Nest/FilterLogic.cs
+++ b/src/Filter.Nest/FilterLogic.cs
@@ -39,6 +39,12 @@ internal static List<Func<QueryContainerDescriptor<T>, QueryContainer>> Generate
                     var queries = new List<Func<QueryContainerDescriptor<T>, QueryContainer>>();
                     var aliasAttribute = validValueProperty.GetCustomAttribute<MappingAliasAttribute>();
 
+                    if (typeof(Range.Generic.IRange<>).IsAssignableFrom(filterProperty.PropertyType))
+                    {
+                        
+                        
+                    }
+                    else
                     if (typeof(IEnumerable).IsAssignableFrom(filterProperty.PropertyType)
                         && filterProperty.PropertyType != typeof(string))
                     {
diff --git a/src/Range/Range.cs b/src/Range/Range.cs
index d535619..55f30a3 100755
--- a/src/Range/Range.cs
+++ b/src/Range/Range.cs
@@ -1,6 +1,7 @@
 using RimDev.Filter.Range.Generic;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace RimDev.Filter.Range
@@ -116,5 +117,37 @@ public static IRange<T> FromString<T>(string value)
 
             return range;
         }
+
+        public static bool IsDateRange<T>(this IRange<T> range) 
+            where T : struct
+        {
+            var x = typeof(T);
+            var t = Nullable.GetUnderlyingType(x) ?? x;
+            var result = t == typeof(DateTime) || t == typeof(DateTimeOffset);
+            return result;
+        }
+
+        public static bool IsNumericRange<T>(this IRange<T> range) 
+            where T : struct
+        {
+            var numbers = new[] {
+                typeof(sbyte),
+                typeof(short),
+                typeof(int),
+                typeof(long),
+                typeof(byte),
+                typeof(ushort),
+                typeof(uint),
+                typeof(ulong),
+                typeof(float),
+                typeof(double),
+                typeof(decimal)
+            };
+            
+            var x = typeof(T);
+            var t = Nullable.GetUnderlyingType(x) ?? x;
+            var result = numbers.Contains(t);
+            return result;
+        }
     }
 }
diff --git a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
index eb5e23e..7db6723 100755
--- a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
+++ b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
@@ -1,7 +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.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,16 +58,20 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -91,14 +95,19 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\xunit.analyzers.0.10.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.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
   </Target>
+  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\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/tests/Filter.Nest.Tests/packages.config b/tests/Filter.Nest.Tests/packages.config
index 615ba0b..5f00b4f 100755
--- a/tests/Filter.Nest.Tests/packages.config
+++ b/tests/Filter.Nest.Tests/packages.config
@@ -4,10 +4,12 @@
   <package id="elasticsearch-inside" version="2.3.5" targetFramework="net461" />
   <package id="NEST" version="6.3.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="xunit" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net461" />
+  <package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
+  <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
+  <package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/Filter.Tests/Filter.Tests.csproj b/tests/Filter.Tests/Filter.Tests.csproj
index 1576030..151b8db 100755
--- a/tests/Filter.Tests/Filter.Tests.csproj
+++ b/tests/Filter.Tests/Filter.Tests.csproj
@@ -1,8 +1,8 @@
 <?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.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
-  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,14 +54,21 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -90,15 +97,20 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\xunit.analyzers.0.10.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. 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\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
   </Target>
+  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\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/tests/Filter.Tests/Generic/IEnumerable`1ExtensionsTests.cs b/tests/Filter.Tests/Generic/IEnumerable`1ExtensionsTests.cs
index 6cd7371..4bdff4e 100755
--- a/tests/Filter.Tests/Generic/IEnumerable`1ExtensionsTests.cs
+++ b/tests/Filter.Tests/Generic/IEnumerable`1ExtensionsTests.cs
@@ -60,7 +60,7 @@ public void Should_filter_when_property_types_match_as_constant_string()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
@@ -73,7 +73,7 @@ public void Should_filter_when_property_types_match_as_constant_integer()
                 });
 
                 Assert.NotNull(@return);
-                Assert.Equal(1, @return.Count());
+                Assert.Single(@return);
                 Assert.Equal("John", @return.First().FirstName);
             }
 
diff --git a/tests/Filter.Tests/packages.config b/tests/Filter.Tests/packages.config
index 8a00904..e7cdb5c 100755
--- a/tests/Filter.Tests/packages.config
+++ b/tests/Filter.Tests/packages.config
@@ -2,11 +2,13 @@
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="System.Data.SqlLocalDb" version="1.15.0" targetFramework="net45" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
+  <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
+  <package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.runner.msbuild" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/Range.Tests/Generic/Range`1Tests.cs b/tests/Range.Tests/Generic/Range`1Tests.cs
index 5f5e2bb..8a09766 100755
--- a/tests/Range.Tests/Generic/Range`1Tests.cs
+++ b/tests/Range.Tests/Generic/Range`1Tests.cs
@@ -1,31 +1,53 @@
-using RimDev.Filter.Range.Generic;
+using System;
+using RimDev.Filter.Range.Generic;
 using Xunit;
 
 namespace RimDev.Filter.Range.Tests.Generic
 {
     public class Range_1Tests
     {
-        public class Constructor
+        [Fact]
+        public void Should_hydrate_new_instance()
         {
-            [Fact]
-            public void Should_hydrate_new_instance()
+            var range = new Range<int>()
             {
-                var range = new Range<int>()
-                {
-                    MinValue = 5,
-                    MaxValue = 10,
-                    IsMinInclusive = true,
-                    IsMaxInclusive = true
-                };
+                MinValue = 5,
+                MaxValue = 10,
+                IsMinInclusive = true,
+                IsMaxInclusive = true
+            };
 
-                var sut = new Range<int>(range);
+            var sut = new Range<int>(range);
 
-                Assert.NotNull(sut);
-                Assert.Equal(5, sut.MinValue);
-                Assert.Equal(10, sut.MaxValue);
-                Assert.Equal(true, sut.IsMinInclusive);
-                Assert.Equal(true, sut.IsMaxInclusive);
-            }
+            Assert.NotNull(sut);
+            Assert.Equal(5, sut.MinValue);
+            Assert.Equal(10, sut.MaxValue);
+            Assert.True(sut.IsMinInclusive);
+            Assert.True(sut.IsMaxInclusive);
+        }
+    
+        [Fact]
+        public void Should_determine_range_as_date_range()
+        {
+            var dateTimeRange = new Range<DateTime>();
+            var dateTimeOffsetRange = new Range<DateTimeOffset>();
+            var intRange = new Range<int>();
+
+            Assert.True(dateTimeRange.IsDateRange());
+            Assert.True(dateTimeOffsetRange.IsDateRange());
+            Assert.False(intRange.IsDateRange());
+        }
+        
+        [Fact]
+        public void Should_determine_range_as_numeric_range()
+        {
+            var floatRange = new Range<float>();
+            var intRange = new Range<int>();
+            var dateRange = new Range<DateTime>();
+
+            Assert.True(floatRange.IsNumericRange());
+            Assert.True(intRange.IsNumericRange());
+            Assert.False(dateRange.IsNumericRange());
         }
     }
 }
diff --git a/tests/Range.Tests/Range.Tests.csproj b/tests/Range.Tests/Range.Tests.csproj
index 91d21fe..90691b5 100755
--- a/tests/Range.Tests/Range.Tests.csproj
+++ b/tests/Range.Tests/Range.Tests.csproj
@@ -1,8 +1,8 @@
 <?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.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
-  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -42,14 +42,21 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -69,15 +76,20 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\xunit.analyzers.0.10.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. 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\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
   </Target>
+  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\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/tests/Range.Tests/RangeTests.cs b/tests/Range.Tests/RangeTests.cs
index a2f819f..92dac57 100755
--- a/tests/Range.Tests/RangeTests.cs
+++ b/tests/Range.Tests/RangeTests.cs
@@ -224,8 +224,8 @@ public void Implicitly_cast_from_string_to_range()
 
                 Assert.NotNull(range);
                 Assert.Equal(1, range.MinValue);
-                Assert.Equal(true, range.IsMinInclusive);
-                Assert.Equal(true, range.IsMaxInclusive);
+                Assert.True(range.IsMinInclusive);
+                Assert.True(range.IsMaxInclusive);
                 Assert.Equal(5, range.MaxValue);
             }
 
@@ -254,8 +254,8 @@ public void Directly_cast_from_a_string(string value)
 
                     Assert.NotNull(range);
                     Assert.Equal(1, range.MinValue);
-                    Assert.Equal(true, range.IsMinInclusive);
-                    Assert.Equal(true, range.IsMaxInclusive);
+                    Assert.True(range.IsMinInclusive);
+                    Assert.True(range.IsMaxInclusive);
                     Assert.Equal(5, range.MaxValue);
                 }
             }
diff --git a/tests/Range.Tests/packages.config b/tests/Range.Tests/packages.config
index 8c6bc68..8d67060 100755
--- a/tests/Range.Tests/packages.config
+++ b/tests/Range.Tests/packages.config
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
+  <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
+  <package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.runner.msbuild" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file

From 77592ce2c2b68993d59be6466d9d658d50c7273a Mon Sep 17 00:00:00 2001
From: Khalid Abuhakmeh <khalid@aquabirdconsulting.com>
Date: Fri, 14 Sep 2018 14:56:53 -0400
Subject: [PATCH 3/8] Can determine if any object is a range of numeric or date

---
 src/Range/Range.cs                        | 32 ++++++++++++-----------
 tests/Range.Tests/Generic/Range`1Tests.cs | 24 +++++------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/Range/Range.cs b/src/Range/Range.cs
index 55f30a3..b9a0353 100755
--- a/src/Range/Range.cs
+++ b/src/Range/Range.cs
@@ -118,19 +118,16 @@ public static IRange<T> FromString<T>(string value)
             return range;
         }
 
-        public static bool IsDateRange<T>(this IRange<T> range) 
-            where T : struct
+        public static bool IsDateRange(object range)
         {
-            var x = typeof(T);
-            var t = Nullable.GetUnderlyingType(x) ?? x;
-            var result = t == typeof(DateTime) || t == typeof(DateTimeOffset);
-            return result;
+            return range is Range<DateTimeOffset> || range is Range<DateTime>;
         }
-
-        public static bool IsNumericRange<T>(this IRange<T> range) 
-            where T : struct
+               
+        public static bool IsNumericRange(object range)
         {
-            var numbers = new[] {
+            var rangeDefinition = typeof(Range<>);
+            var numbers = new[] 
+            {
                 typeof(sbyte),
                 typeof(short),
                 typeof(int),
@@ -143,11 +140,16 @@ public static bool IsNumericRange<T>(this IRange<T> range)
                 typeof(double),
                 typeof(decimal)
             };
-            
-            var x = typeof(T);
-            var t = Nullable.GetUnderlyingType(x) ?? x;
-            var result = numbers.Contains(t);
-            return result;
+
+            if (range == null)
+                return false;
+
+            var target = range.GetType();
+            var result = numbers
+                .Select(type => rangeDefinition.MakeGenericType(type))
+                .FirstOrDefault(type => target == type);
+
+            return result != null;
         }
     }
 }
diff --git a/tests/Range.Tests/Generic/Range`1Tests.cs b/tests/Range.Tests/Generic/Range`1Tests.cs
index 8a09766..5cf3e0e 100755
--- a/tests/Range.Tests/Generic/Range`1Tests.cs
+++ b/tests/Range.Tests/Generic/Range`1Tests.cs
@@ -25,29 +25,19 @@ public void Should_hydrate_new_instance()
             Assert.True(sut.IsMinInclusive);
             Assert.True(sut.IsMaxInclusive);
         }
-    
+        
         [Fact]
-        public void Should_determine_range_as_date_range()
+        public void Should_determine_object_as_date_range()
         {
-            var dateTimeRange = new Range<DateTime>();
-            var dateTimeOffsetRange = new Range<DateTimeOffset>();
-            var intRange = new Range<int>();
-
-            Assert.True(dateTimeRange.IsDateRange());
-            Assert.True(dateTimeOffsetRange.IsDateRange());
-            Assert.False(intRange.IsDateRange());
+            var dateTimeRange = new Range<DateTime>() as object;
+            Assert.True(Range.IsDateRange(dateTimeRange));
         }
         
         [Fact]
-        public void Should_determine_range_as_numeric_range()
+        public void Should_determine_object_as_numeric_range()
         {
-            var floatRange = new Range<float>();
-            var intRange = new Range<int>();
-            var dateRange = new Range<DateTime>();
-
-            Assert.True(floatRange.IsNumericRange());
-            Assert.True(intRange.IsNumericRange());
-            Assert.False(dateRange.IsNumericRange());
+            var numericRange = new Range<int>() as object;
+            Assert.True(Range.IsNumericRange(numericRange));
         }
     }
 }

From c6aa3c08e56028f1c2e0b04e28f22d4e374923e5 Mon Sep 17 00:00:00 2001
From: Khalid Abuhakmeh <khalid@aquabirdconsulting.com>
Date: Fri, 14 Sep 2018 15:22:14 -0400
Subject: [PATCH 4/8] Pivoted and now can convert to numeric range or date
 range

---
 src/Range/Range.cs                        | 48 +++++++++++++++++++++
 tests/Range.Tests/Generic/Range`1Tests.cs | 52 +++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/src/Range/Range.cs b/src/Range/Range.cs
index b9a0353..3bc9684 100755
--- a/src/Range/Range.cs
+++ b/src/Range/Range.cs
@@ -151,5 +151,53 @@ public static bool IsNumericRange(object range)
 
             return result != null;
         }
+
+        public static Range<DateTimeOffset> AsDateRange(object range)
+        {
+            if (range == null)
+                return null;
+
+            switch (IsDateRange(range))
+            {
+                case true when range is Range<DateTime> dt:
+                    return new Range<DateTimeOffset> {
+                        IsMaxInclusive = dt.IsMaxInclusive,
+                        IsMinInclusive = dt.IsMinInclusive,
+                        MinValue = dt.MinValue.HasValue ? 
+                            new DateTimeOffset(dt.MinValue.Value, TimeSpan.Zero) 
+                            : (DateTimeOffset?) null,
+                        MaxValue = dt.MaxValue.HasValue ? 
+                            new DateTimeOffset(dt.MaxValue.Value, TimeSpan.Zero) 
+                            : (DateTimeOffset?) null,
+                    };
+                case true when range is Range<DateTimeOffset> dto:
+                    return dto;
+                default:
+                    return null;
+            }
+        }
+        
+        public static Range<decimal> AsNumericRange(object range)
+        {
+            if (range == null || !IsNumericRange(range))
+                return null;
+            
+            dynamic r = range;
+            
+            // Using decimal for precision 
+            var numeric = new Range<decimal>()
+            {
+                IsMaxInclusive = r.IsMaxInclusive,
+                IsMinInclusive = r.IsMinInclusive,
+                MinValue = r.MinValue == null
+                    ? (decimal?) null 
+                    : SmartConverter.Convert<decimal>(r.MinValue.ToString()),
+                MaxValue = r.MaxValue == null
+                    ? (decimal?) null 
+                    : SmartConverter.Convert<decimal>(r.MaxValue.ToString()) 
+            };
+
+            return numeric;
+        }
     }
 }
diff --git a/tests/Range.Tests/Generic/Range`1Tests.cs b/tests/Range.Tests/Generic/Range`1Tests.cs
index 5cf3e0e..94ac147 100755
--- a/tests/Range.Tests/Generic/Range`1Tests.cs
+++ b/tests/Range.Tests/Generic/Range`1Tests.cs
@@ -33,6 +33,58 @@ public void Should_determine_object_as_date_range()
             Assert.True(Range.IsDateRange(dateTimeRange));
         }
         
+        [Fact]
+        public void Should_convert_object_that_is_date_range_to_datetimeoffset_range()
+        {
+            var dateTimeRange = new Range<DateTime>
+            {
+                MinValue = new DateTime(2000, 1, 1),
+                MaxValue = new DateTime(2020, 1, 1)
+            } as object;
+            
+            var result = Range.AsDateRange(dateTimeRange);
+            
+            Assert.Equal(2000, result.MinValue.Value.Year);
+            Assert.Equal(2020, result.MaxValue.Value.Year);
+        }
+        
+        [Fact]
+        public void Should_convert_object_that_is_datetimeoffset_range_to_datetimeoffset_range()
+        {
+            var dateTimeRange = new Range<DateTimeOffset>
+            {
+                MinValue = new DateTime(2000, 1, 1),
+                MaxValue = new DateTime(2020, 1, 1)
+            } as object;
+            
+            var result = Range.AsDateRange(dateTimeRange);
+            
+            Assert.Equal(2000, result.MinValue.Value.Year);
+            Assert.Equal(2020, result.MaxValue.Value.Year);
+        }
+        
+        [Fact]
+        public void Should_convert_object_that_is_int_range_to_decimal_range()
+        {
+            var dateTimeRange = new Range<int>
+            {
+                MinValue = 1,
+                MaxValue = 10
+            } as object;
+            
+            var result = Range.AsNumericRange(dateTimeRange);
+            
+            Assert.Equal(1, result.MinValue.Value);
+            Assert.Equal(10, result.MaxValue.Value);
+        }
+        
+        [Fact]
+        public void Should_convert_null_to_null()
+        {
+            Assert.Null(Range.AsNumericRange(null));
+            Assert.Null(Range.AsDateRange(null));
+        }
+        
         [Fact]
         public void Should_determine_object_as_numeric_range()
         {

From 4798e62de9e33a45904f4391b800e7cb547d86b9 Mon Sep 17 00:00:00 2001
From: Khalid Abuhakmeh <khalid@aquabirdconsulting.com>
Date: Mon, 17 Sep 2018 08:28:21 -0400
Subject: [PATCH 5/8] Downgrade XUnit Runner to 2.4.0

---
 tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj | 4 ++--
 tests/Filter.Nest.Tests/packages.config          | 2 +-
 tests/Filter.Tests/Filter.Tests.csproj           | 4 ++--
 tests/Filter.Tests/packages.config               | 2 +-
 tests/Range.Tests/Range.Tests.csproj             | 4 ++--
 tests/Range.Tests/packages.config                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
index 7db6723..04d1d54 100755
--- a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
+++ b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
@@ -1,7 +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.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -103,9 +103,9 @@
     <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.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/tests/Filter.Nest.Tests/packages.config b/tests/Filter.Nest.Tests/packages.config
index 5f00b4f..319bf60 100755
--- a/tests/Filter.Nest.Tests/packages.config
+++ b/tests/Filter.Nest.Tests/packages.config
@@ -11,5 +11,5 @@
   <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net462" developmentDependency="true" />
+  <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/Filter.Tests/Filter.Tests.csproj b/tests/Filter.Tests/Filter.Tests.csproj
index 151b8db..045bc84 100755
--- a/tests/Filter.Tests/Filter.Tests.csproj
+++ b/tests/Filter.Tests/Filter.Tests.csproj
@@ -1,7 +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.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -106,9 +106,9 @@
       <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\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/tests/Filter.Tests/packages.config b/tests/Filter.Tests/packages.config
index e7cdb5c..d421cce 100755
--- a/tests/Filter.Tests/packages.config
+++ b/tests/Filter.Tests/packages.config
@@ -10,5 +10,5 @@
   <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.runner.msbuild" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net462" developmentDependency="true" />
+  <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/Range.Tests/Range.Tests.csproj b/tests/Range.Tests/Range.Tests.csproj
index 90691b5..677dfd1 100755
--- a/tests/Range.Tests/Range.Tests.csproj
+++ b/tests/Range.Tests/Range.Tests.csproj
@@ -1,7 +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.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -85,9 +85,9 @@
       <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\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.1-pre.build.4059\build\net20\xunit.runner.visualstudio.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/tests/Range.Tests/packages.config b/tests/Range.Tests/packages.config
index 8d67060..0e3d4df 100755
--- a/tests/Range.Tests/packages.config
+++ b/tests/Range.Tests/packages.config
@@ -8,5 +8,5 @@
   <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
   <package id="xunit.runner.msbuild" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.4.1-pre.build.4059" targetFramework="net462" developmentDependency="true" />
+  <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file

From ddab57eb1ef91f3e4abf400a6afe237cee4f47ec Mon Sep 17 00:00:00 2001
From: Khalid Abuhakmeh <khalid@aquabirdconsulting.com>
Date: Mon, 17 Sep 2018 08:33:22 -0400
Subject: [PATCH 6/8] missed a few XUnit packages

---
 .../Filter.Nest.Tests.csproj                  | 20 +++++++-------
 tests/Filter.Nest.Tests/packages.config       | 10 +++----
 tests/Filter.Tests/Filter.Tests.csproj        | 26 ++++++++++---------
 tests/Filter.Tests/packages.config            | 12 ++++-----
 tests/Range.Tests/Range.Tests.csproj          | 26 ++++++++++---------
 tests/Range.Tests/packages.config             | 12 ++++-----
 6 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
index 04d1d54..991e816 100755
--- a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
+++ b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
@@ -1,7 +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.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -62,16 +62,16 @@
       <HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -103,11 +103,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.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
   </Target>
-  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
+  <Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.0\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/tests/Filter.Nest.Tests/packages.config b/tests/Filter.Nest.Tests/packages.config
index 319bf60..07c91e7 100755
--- a/tests/Filter.Nest.Tests/packages.config
+++ b/tests/Filter.Nest.Tests/packages.config
@@ -4,12 +4,12 @@
   <package id="elasticsearch-inside" version="2.3.5" targetFramework="net461" />
   <package id="NEST" version="6.3.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit" version="2.4.0" targetFramework="net462" />
   <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
   <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
-  <package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit.assert" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net462" />
   <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/Filter.Tests/Filter.Tests.csproj b/tests/Filter.Tests/Filter.Tests.csproj
index 045bc84..be6e2d1 100755
--- a/tests/Filter.Tests/Filter.Tests.csproj
+++ b/tests/Filter.Tests/Filter.Tests.csproj
@@ -1,8 +1,8 @@
 <?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.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props')" />
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
-  <Import Project="..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -58,16 +58,16 @@
       <HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -105,12 +105,14 @@
     <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\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
   </Target>
-  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
+  <Import Project="..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets')" />
+  <Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.0\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/tests/Filter.Tests/packages.config b/tests/Filter.Tests/packages.config
index d421cce..cc377a6 100755
--- a/tests/Filter.Tests/packages.config
+++ b/tests/Filter.Tests/packages.config
@@ -2,13 +2,13 @@
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="System.Data.SqlLocalDb" version="1.15.0" targetFramework="net45" />
-  <package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit" version="2.4.0" targetFramework="net462" />
   <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
   <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
-  <package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.runner.msbuild" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.runner.msbuild" version="2.4.0" targetFramework="net462" developmentDependency="true" />
   <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/tests/Range.Tests/Range.Tests.csproj b/tests/Range.Tests/Range.Tests.csproj
index 677dfd1..71afab0 100755
--- a/tests/Range.Tests/Range.Tests.csproj
+++ b/tests/Range.Tests/Range.Tests.csproj
@@ -1,8 +1,8 @@
 <?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.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props')" />
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" />
-  <Import Project="..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,16 +46,16 @@
       <HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.assert.2.4.1-pre.build.4059\lib\netstandard2.0\xunit.assert.dll</HintPath>
+    <Reference Include="xunit.assert, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.4.1-pre.build.4059\lib\net452\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.4.1.4059, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.1-pre.build.4059\lib\net452\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.4.0.4049, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
+      <HintPath>..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -84,12 +84,14 @@
     <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\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets'))" />
     <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
   </Target>
-  <Import Project="..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.1-pre.build.4059\build\xunit.core.targets')" />
+  <Import Project="..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.4.0\build\net452\xunit.runner.msbuild.targets')" />
+  <Import Project="..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.0\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/tests/Range.Tests/packages.config b/tests/Range.Tests/packages.config
index 0e3d4df..7f3f4e9 100755
--- a/tests/Range.Tests/packages.config
+++ b/tests/Range.Tests/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="2.4.1-pre.build.4059" targetFramework="net462" />
+  <package id="xunit" version="2.4.0" targetFramework="net462" />
   <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
   <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
-  <package id="xunit.assert" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.extensibility.core" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.extensibility.execution" version="2.4.1-pre.build.4059" targetFramework="net462" />
-  <package id="xunit.runner.msbuild" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net462" />
+  <package id="xunit.runner.msbuild" version="2.4.0" targetFramework="net462" developmentDependency="true" />
   <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file

From fea37f540379e6168d52e8f2ead4f5cedf88e077 Mon Sep 17 00:00:00 2001
From: Bill Boga <bill.boga@ritterim.com>
Date: Mon, 17 Sep 2018 11:04:25 -0400
Subject: [PATCH 7/8] Add logic to filter NEST queries using Date/Numeric
 ranges

---
 src/Filter.Nest/FilterLogic.cs                | 100 +++++++++++++++++-
 .../BoolQueryDescriptorExtensionsTests.cs     |  97 ++++++++++++++++-
 tests/Filter.Nest.Tests/Car.cs                |   7 +-
 .../Filter.Nest.Tests.csproj                  |   4 +
 tests/Range.Tests/Generic/Range`1Tests.cs     |   4 +-
 5 files changed, 201 insertions(+), 11 deletions(-)

diff --git a/src/Filter.Nest/FilterLogic.cs b/src/Filter.Nest/FilterLogic.cs
index 610d7a0..abcfa2a 100644
--- a/src/Filter.Nest/FilterLogic.cs
+++ b/src/Filter.Nest/FilterLogic.cs
@@ -39,10 +39,104 @@ internal static List<Func<QueryContainerDescriptor<T>, QueryContainer>> Generate
                     var queries = new List<Func<QueryContainerDescriptor<T>, QueryContainer>>();
                     var aliasAttribute = validValueProperty.GetCustomAttribute<MappingAliasAttribute>();
 
-                    if (typeof(Range.Generic.IRange<>).IsAssignableFrom(filterProperty.PropertyType))
+                    if (filterPropertyValue.GetType().GetInterfaces().Any(
+                        x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(Range.Generic.IRange<>)))
                     {
-                        
-                        
+                        Range.Generic.Range<DateTimeOffset> dateRange;
+                        Range.Generic.Range<decimal> numericRange;
+
+                        if ((dateRange = Range.Range.AsDateRange(filterPropertyValue)) != null)
+                        {
+                            queries.Add(x =>
+                                x.DateRange(y =>
+                                {
+                                    if (dateRange.MinValue.HasValue)
+                                    {
+                                        var minValue = dateRange.MinValue.Value.Date;
+
+                                        if (aliasAttribute != null)
+                                        {
+                                            y = dateRange.IsMinInclusive
+                                                ? y.Field(aliasAttribute.Alias).GreaterThanOrEquals(minValue)
+                                                : y.Field(aliasAttribute.Alias).GreaterThan(minValue);
+                                        }
+                                        else
+                                        {
+                                            y = dateRange.IsMinInclusive
+                                                ? y.Field(validValueProperty).GreaterThanOrEquals(minValue)
+                                                : y.Field(validValueProperty).GreaterThan(minValue);
+                                        }
+                                    }
+
+                                    if (dateRange.MaxValue.HasValue)
+                                    {
+                                        var maxValue = dateRange.MaxValue.Value.Date;
+
+                                        if (aliasAttribute != null)
+                                        {
+                                            y = dateRange.IsMaxInclusive
+                                                ? y.Field(aliasAttribute.Alias).LessThanOrEquals(maxValue)
+                                                : y.Field(aliasAttribute.Alias).LessThan(maxValue);
+                                        }
+                                        else
+                                        {
+                                            y = dateRange.IsMaxInclusive
+                                                ? y.Field(validValueProperty).LessThanOrEquals(maxValue)
+                                                : y.Field(validValueProperty).LessThan(maxValue);
+                                        }
+                                    }
+
+                                    return y;
+                                }));
+                        }
+                        else if ((numericRange = Range.Range.AsNumericRange(filterPropertyValue)) != null)
+                        {
+                            queries.Add(x =>
+                                x.Range(y =>
+                                {
+                                    if (numericRange.MinValue.HasValue)
+                                    {
+                                        var minValue = Convert.ToDouble(numericRange.MinValue.Value);
+
+                                        if (aliasAttribute != null)
+                                        {
+                                            y = numericRange.IsMinInclusive
+                                                ? y.Field(aliasAttribute.Alias).GreaterThanOrEquals(minValue)
+                                                : y.Field(aliasAttribute.Alias).GreaterThan(minValue);
+                                        }
+                                        else
+                                        {
+                                            y = numericRange.IsMinInclusive
+                                                ? y.Field(validValueProperty).GreaterThanOrEquals(minValue)
+                                                : y.Field(validValueProperty).GreaterThan(minValue);
+                                        }
+                                    }
+
+                                    if (numericRange.MaxValue.HasValue)
+                                    {
+                                        var maxValue = Convert.ToDouble(numericRange.MaxValue.Value);
+
+                                        if (aliasAttribute != null)
+                                        {
+                                            y = numericRange.IsMaxInclusive
+                                                ? y.Field(aliasAttribute.Alias).LessThanOrEquals(maxValue)
+                                                : y.Field(aliasAttribute.Alias).LessThan(maxValue);
+                                        }
+                                        else
+                                        {
+                                            y = numericRange.IsMaxInclusive
+                                                ? y.Field(validValueProperty).LessThanOrEquals(maxValue)
+                                                : y.Field(validValueProperty).LessThan(maxValue);
+                                        }
+                                    }
+
+                                    return y;
+                                }));
+                        }
+                        else
+                        {
+                            throw new InvalidOperationException($"NEST filtering does not work on `Range<T>` where `T` is `{filterProperty.PropertyType.Name}`.");
+                        }
                     }
                     else
                     if (typeof(IEnumerable).IsAssignableFrom(filterProperty.PropertyType)
diff --git a/tests/Filter.Nest.Tests/BoolQueryDescriptorExtensionsTests.cs b/tests/Filter.Nest.Tests/BoolQueryDescriptorExtensionsTests.cs
index aa1a653..475d652 100755
--- a/tests/Filter.Nest.Tests/BoolQueryDescriptorExtensionsTests.cs
+++ b/tests/Filter.Nest.Tests/BoolQueryDescriptorExtensionsTests.cs
@@ -1,5 +1,8 @@
 using Nest;
 using RimDev.Filter.Nest;
+using RimDev.Filter.Range;
+using System;
+using System.Diagnostics;
 using System.Linq;
 using Xunit;
 
@@ -60,7 +63,7 @@ public void Can_query_using_single_value()
                         q => q.Bool(x => x.Filter(new { Name = new[] { "camaro" } }))));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Camaro", results.Hits.First().Source.Name);
                 }
             }
@@ -86,7 +89,7 @@ public void Multiple_filter_properties_queried_as_collection_of_and_operators()
                         q => q.Bool(x => x.Filter(new { Name = new[] { "camaro", "monte carlo" }, Year = 2016 }))));
 
                     Assert.NotNull(noResults);
-                    Assert.Equal(0, noResults.Hits.Count());
+                    Assert.Empty(noResults.Hits);
 
                     var twoResults = elasticClient
                         .Search<Car>(x => x.Index("vehicles")
@@ -168,7 +171,7 @@ public void Nullable_boolean_true_returns_expected_results()
                         q => q.Bool(x => x.Filter(new { IsElectric = true }))));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Volt", results.Hits.First().Source.Name);
                 }
             }
@@ -192,10 +195,96 @@ public void Nullable_boolean_false_returns_expected_results()
                         q => q.Bool(x => x.Filter(new { IsElectric = false }))));
 
                     Assert.NotNull(results);
-                    Assert.Equal(1, results.Hits.Count());
+                    Assert.Single(results.Hits);
                     Assert.Equal("Camaro", results.Hits.First().Source.Name);
                 }
             }
+
+            [Theory]
+            [InlineData("[2000-01-01,]", 3)]
+            [InlineData("[2010-01-01,]", 2)]
+            [InlineData("[2020-01-01,]", 1)]
+            [InlineData("[2030-01-01,]", 0)]
+            [InlineData("[,1999-01-01]", 0)]
+            [InlineData("[,2000-01-01]", 1)]
+            [InlineData("[,2010-01-01]", 2)]
+            [InlineData("[,2020-01-01]", 3)]
+            [InlineData("(2000-01-01,]", 2)]
+            [InlineData("(2010-01-01,]", 1)]
+            [InlineData("(2020-01-01,]", 0)]
+            [InlineData("[,2000-01-01)", 0)]
+            [InlineData("[,2010-01-01)", 1)]
+            [InlineData("[,2020-01-01)", 2)]
+            [InlineData("[,2030-01-01)", 3)]
+            public void Properly_filters_date_ranges(string startProductionRunRange, int expectedResults)
+            {
+                using (var elasticsearch = new ElasticsearchInside.Elasticsearch())
+                {
+                    var elasticClient = new ElasticClient(new ConnectionSettings(elasticsearch.Url).EnableDebugMode(x =>
+                    {
+                        Debug.WriteLine(x.DebugInformation);
+                    }));
+
+                    var camaro = new Car { Name = "Camaro", StartProductionRun = DateTimeOffset.Parse("2020-01-01T00:00:00Z") };
+                    var corvette = new Car { Name = "Corvette", StartProductionRun = DateTimeOffset.Parse("2010-01-01T00:00:00Z") };
+                    var monteCarlo = new Car { Name = "Monte Carlo", StartProductionRun = DateTimeOffset.Parse("2000-01-01T00:00:00Z") };
+
+                    elasticClient.Index(camaro, x => x.Index("vehicles"));
+                    elasticClient.Index(corvette, x => x.Index("vehicles"));
+                    elasticClient.Index(monteCarlo, x => x.Index("vehicles"));
+
+                    elasticClient.Refresh("vehicles");
+
+                    var noResults = elasticClient.Search<Car>(s => s.Index("vehicles").Query(
+                        q => q.Bool(x => x.Filter(new { StartProductionRun = Range.FromString<DateTime>(startProductionRunRange) }))));
+
+                    Assert.NotNull(noResults);
+                    Assert.Equal(expectedResults, noResults.Hits.Count());
+                }
+            }
+
+            [Theory]
+            [InlineData("[2000,]", 3)]
+            [InlineData("[2010,]", 2)]
+            [InlineData("[2020,]", 1)]
+            [InlineData("[2030,]", 0)]
+            [InlineData("[,1999]", 0)]
+            [InlineData("[,2000]", 1)]
+            [InlineData("[,2010]", 2)]
+            [InlineData("[,2020]", 3)]
+            [InlineData("(2000,]", 2)]
+            [InlineData("(2010,]", 1)]
+            [InlineData("(2020,]", 0)]
+            [InlineData("[,2000)", 0)]
+            [InlineData("[,2010)", 1)]
+            [InlineData("[,2020)", 2)]
+            [InlineData("[,2030)", 3)]
+            public void Properly_filters_numeric_ranges(string yearRange, int expectedResults)
+            {
+                using (var elasticsearch = new ElasticsearchInside.Elasticsearch())
+                {
+                    var elasticClient = new ElasticClient(new ConnectionSettings(elasticsearch.Url).EnableDebugMode(x =>
+                    {
+                        Debug.WriteLine(x.DebugInformation);
+                    }));
+
+                    var camaro = new Car { Name = "Camaro", Year = 2020 };
+                    var corvette = new Car { Name = "Corvette", Year = 2010 };
+                    var monteCarlo = new Car { Name = "Monte Carlo", Year = 2000 };
+
+                    elasticClient.Index(camaro, x => x.Index("vehicles"));
+                    elasticClient.Index(corvette, x => x.Index("vehicles"));
+                    elasticClient.Index(monteCarlo, x => x.Index("vehicles"));
+
+                    elasticClient.Refresh("vehicles");
+
+                    var noResults = elasticClient.Search<Car>(s => s.Index("vehicles").Query(
+                        q => q.Bool(x => x.Filter(new { Year = Range.FromString<int>(yearRange) }))));
+
+                    Assert.NotNull(noResults);
+                    Assert.Equal(expectedResults, noResults.Hits.Count());
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/tests/Filter.Nest.Tests/Car.cs b/tests/Filter.Nest.Tests/Car.cs
index a717490..85c0ca2 100644
--- a/tests/Filter.Nest.Tests/Car.cs
+++ b/tests/Filter.Nest.Tests/Car.cs
@@ -1,9 +1,12 @@
-namespace Filter.Nest.Tests
+using System;
+
+namespace Filter.Nest.Tests
 {
     public class Car
     {
+        public bool IsElectric { get; set; }
         public string Name { get; set; }
+        public DateTimeOffset StartProductionRun { get; set; }
         public int Year { get; set; }
-        public bool IsElectric { get; set; }
     }
 }
\ No newline at end of file
diff --git a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
index 991e816..554e622 100755
--- a/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
+++ b/tests/Filter.Nest.Tests/Filter.Nest.Tests.csproj
@@ -91,6 +91,10 @@
       <Project>{39ac08c4-a82d-45f7-bbf2-f239028e6d85}</Project>
       <Name>Filter.Nest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Range\Range.csproj">
+      <Project>{0e804077-79b6-4e0f-a4bb-ad5f6ec194b3}</Project>
+      <Name>Range</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/Range.Tests/Generic/Range`1Tests.cs b/tests/Range.Tests/Generic/Range`1Tests.cs
index 94ac147..29eb1f7 100755
--- a/tests/Range.Tests/Generic/Range`1Tests.cs
+++ b/tests/Range.Tests/Generic/Range`1Tests.cs
@@ -53,8 +53,8 @@ public void Should_convert_object_that_is_datetimeoffset_range_to_datetimeoffset
         {
             var dateTimeRange = new Range<DateTimeOffset>
             {
-                MinValue = new DateTime(2000, 1, 1),
-                MaxValue = new DateTime(2020, 1, 1)
+                MinValue = new DateTimeOffset(2000, 1, 1, 0, 0, 0, TimeSpan.Zero),
+                MaxValue = new DateTimeOffset(2020, 1, 1, 0, 0, 0, TimeSpan.Zero)
             } as object;
             
             var result = Range.AsDateRange(dateTimeRange);

From 0a4fd752603c07a319073034b4d132bec845b754 Mon Sep 17 00:00:00 2001
From: Bill Boga <bill.boga@ritterim.com>
Date: Tue, 18 Sep 2018 09:50:56 -0400
Subject: [PATCH 8/8] Swap MSBuild processes for Cake

This brings this project inline with other repo. build setups within the organization.

Part of this changeover is the use of GitVersion.
---
 .gitignore                   |   2 +
 GitVersion.yml               |   2 +
 appveyor.yml                 |  19 ++-
 build.cake                   |  77 +++++++++++
 build.cmd                    |  45 -------
 build.ps1                    | 243 +++++++++++++++++++++++++++++++++++
 build.sh                     | 118 +++++++++++++++++
 build/Build.Settings.targets |  11 --
 build/Build.Version.targets  |  36 ------
 build/Build.msbuild          |  71 ----------
 build/Build.targets          |   4 -
 build/Xunit.targets          |  24 ----
 12 files changed, 460 insertions(+), 192 deletions(-)
 create mode 100644 GitVersion.yml
 create mode 100644 build.cake
 delete mode 100755 build.cmd
 create mode 100644 build.ps1
 create mode 100644 build.sh
 delete mode 100644 build/Build.Settings.targets
 delete mode 100644 build/Build.Version.targets
 delete mode 100644 build/Build.msbuild
 delete mode 100644 build/Build.targets
 delete mode 100644 build/Xunit.targets

diff --git a/.gitignore b/.gitignore
index 661e18d..9db493b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,5 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+
+tools/
diff --git a/GitVersion.yml b/GitVersion.yml
new file mode 100644
index 0000000..68073a8
--- /dev/null
+++ b/GitVersion.yml
@@ -0,0 +1,2 @@
+mode: Mainline
+increment: Patch
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index ad5b79c..6b1466e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,24 @@
+environment:
+  IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
+
 image: Visual Studio 2017
 
 cache:
   - packages -> **\packages.config
 
+install:
+  - choco install gitversion.portable -pre -y
+
+before_build:
+  - ps: C:\ProgramData\chocolatey\bin\gfv.exe $env:APPVEYOR_BUILD_FOLDER /l console /output buildserver /updateAssemblyInfo /nofetch
+
 build_script:
-  - ./build.cmd /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - ps: ./build.ps1
 
 test: off
 
+skip_tags: true
+
 artifacts:
   - path: ./msbuild.log
   - path: ./artifacts/*.nupkg
@@ -17,3 +28,9 @@ deploy:
     name: NuGet
     on:
       branch: master
+
+  - provider: Environment
+    name: GitHub
+    github_tag_name: v$(GitVersion_NuGetVersionV2)
+    on:
+      branch: master
\ No newline at end of file
diff --git a/build.cake b/build.cake
new file mode 100644
index 0000000..453604d
--- /dev/null
+++ b/build.cake
@@ -0,0 +1,77 @@
+#tool "nuget:?package=xunit.runner.console"
+
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Release");
+var solution = "./Filter.sln";
+var publishDirectory = Directory("./artifacts");
+
+Task("Clean")
+    .Does(() =>
+    {
+        CleanDirectory(publishDirectory);
+    });
+
+Task("Restore")
+    .IsDependentOn("Clean")
+    .Does(() =>
+    {
+        NuGetRestore(solution);
+    });
+
+Task("Build")
+    .IsDependentOn("Restore")
+    .Does(() =>
+    {
+        MSBuild(solution, settings =>
+            settings.SetConfiguration(configuration)
+                .WithProperty("TreatWarningsAsErrors", "False")
+                .SetVerbosity(Verbosity.Minimal)
+                .AddFileLogger());
+    });
+
+Task("Test")
+    .IsDependentOn("Build")
+    .Does(() =>
+    {
+        XUnit2("./tests/**/bin/" + configuration + "/*.Tests.dll", new XUnit2Settings());
+    });
+
+Task("Publish")
+    .IsDependentOn("Test")
+    .Does(() =>
+    {
+        NuGetPack("./src/Filter/Filter.csproj", new NuGetPackSettings
+        {
+            OutputDirectory = publishDirectory,
+            Version = EnvironmentVariable("GitVersion_NuGetVersionV2"),
+            Properties = new Dictionary<string, string>
+            {
+                { "Configuration", configuration }
+            }
+        });
+
+        NuGetPack("./src/Range.Web.Http/Range.Web.Http.csproj", new NuGetPackSettings
+        {
+            OutputDirectory = publishDirectory,
+            Version = EnvironmentVariable("GitVersion_NuGetVersionV2"),
+            Properties = new Dictionary<string, string>
+            {
+                { "Configuration", configuration }
+            }
+        });
+
+        NuGetPack("./src/Filter.Nest/Filter.Nest.csproj", new NuGetPackSettings
+        {
+            OutputDirectory = publishDirectory,
+            Version = EnvironmentVariable("GitVersion_NuGetVersionV2"),
+            Properties = new Dictionary<string, string>
+            {
+                { "Configuration", configuration }
+            }
+        });
+    });
+
+Task("Default")
+    .IsDependentOn("Publish");
+
+RunTarget(target);
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
deleted file mode 100755
index 5075bea..0000000
--- a/build.cmd
+++ /dev/null
@@ -1,45 +0,0 @@
-@echo Off
-pushd %~dp0
-setlocal
-
-set CACHED_NUGET=%LOCALAPPDATA%\NuGet\NuGet.exe
-if exist %CACHED_NUGET% goto CopyNuGet
-
-echo Downloading latest version of NuGet.exe...
-if not exist %LOCALAPPDATA%\NuGet @mkdir %LOCALAPPDATA%\NuGet
-@powershell -NoProfile -ExecutionPolicy Unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'"
-
-:CopyNuGet
-if exist .nuget\nuget.exe goto Build
-if not exist .nuget @mkdir .nuget
-@copy %CACHED_NUGET% .nuget\nuget.exe > nul
-
-:Build
-
-:: Find the most recent 32bit MSBuild.exe on the system. Also handle x86 operating systems, where %PROGRAMFILES(X86)%
-:: is not defined. Always quote the %MSBUILD% value when setting the variable and never quote %MSBUILD% references.
-set MSBUILD="%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBuild.exe"
-if not exist %MSBUILD% @set MSBUILD="%PROGRAMFILES%\MSBuild\14.0\Bin\MSBuild.exe"
-if not exist %MSBUILD% @set MSBUILD="%PROGRAMFILES(X86)%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %MSBUILD% @set MSBUILD="%PROGRAMFILES%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %MSBUILD% @set MSBUILD="%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
-
-%MSBUILD% build\Build.msbuild /nologo /m /v:m /fl /flp:LogFile=msbuild.log;Verbosity=Detailed /nr:false %*
-
-if %ERRORLEVEL% neq 0 goto BuildFail
-goto BuildSuccess
-
-:BuildFail
-echo.
-echo *** BUILD FAILED ***
-goto End
-
-:BuildSuccess
-echo.
-echo *** BUILD SUCCEEDED ***
-goto End
-
-:End
-echo.
-popd
-exit /B %ERRORLEVEL%
diff --git a/build.ps1 b/build.ps1
new file mode 100644
index 0000000..96774db
--- /dev/null
+++ b/build.ps1
@@ -0,0 +1,243 @@
+# Ref. https://raw.githubusercontent.com/cake-build/resources/480522f00dc9671225c0d32713d858dc5ac1d56e/build.ps1
+##########################################################################
+# This is the Cake bootstrapper script for PowerShell.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
+
+<#
+
+.SYNOPSIS
+This is a Powershell script to bootstrap a Cake build.
+
+.DESCRIPTION
+This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
+and execute your Cake build script with the parameters you provide.
+
+.PARAMETER Script
+The build script to execute.
+.PARAMETER Target
+The build script target to run.
+.PARAMETER Configuration
+The build configuration to use.
+.PARAMETER Verbosity
+Specifies the amount of information to be displayed.
+.PARAMETER ShowDescription
+Shows description about tasks.
+.PARAMETER DryRun
+Performs a dry run.
+.PARAMETER SkipToolPackageRestore
+Skips restoring of packages.
+.PARAMETER ScriptArgs
+Remaining arguments are added here.
+
+.LINK
+https://cakebuild.net
+
+#>
+
+[CmdletBinding()]
+Param(
+    [string]$Script = "build.cake",
+    [string]$Target,
+    [string]$Configuration,
+    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
+    [string]$Verbosity,
+    [switch]$ShowDescription,
+    [Alias("WhatIf", "Noop")]
+    [switch]$DryRun,
+    [switch]$SkipToolPackageRestore,
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$ScriptArgs
+)
+
+# Attempt to set highest encryption available for SecurityProtocol.
+# PowerShell will not set this by default (until maybe .NET 4.6.x). This
+# will typically produce a message for PowerShell v2 (just an info
+# message though)
+try {
+    # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48)
+    # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't
+    # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is
+    # installed (.NET 4.5 is an in-place upgrade).
+    [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48
+  } catch {
+    Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3'
+  }
+
+[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
+function MD5HashFile([string] $filePath)
+{
+    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
+    {
+        return $null
+    }
+
+    [System.IO.Stream] $file = $null;
+    [System.Security.Cryptography.MD5] $md5 = $null;
+    try
+    {
+        $md5 = [System.Security.Cryptography.MD5]::Create()
+        $file = [System.IO.File]::OpenRead($filePath)
+        return [System.BitConverter]::ToString($md5.ComputeHash($file))
+    }
+    finally
+    {
+        if ($file -ne $null)
+        {
+            $file.Dispose()
+        }
+    }
+}
+
+function GetProxyEnabledWebClient
+{
+    $wc = New-Object System.Net.WebClient
+    $proxy = [System.Net.WebRequest]::GetSystemWebProxy()
+    $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
+    $wc.Proxy = $proxy
+    return $wc
+}
+
+Write-Host "Preparing to run build script..."
+
+if(!$PSScriptRoot){
+    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+}
+
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
+$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
+$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
+$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
+$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
+$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
+
+# Make sure tools folder exists
+if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
+    Write-Verbose -Message "Creating tools directory..."
+    New-Item -Path $TOOLS_DIR -Type directory | out-null
+}
+
+# Make sure that packages.config exist.
+if (!(Test-Path $PACKAGES_CONFIG)) {
+    Write-Verbose -Message "Downloading packages.config..."
+    try {
+        $wc = GetProxyEnabledWebClient
+        $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG)
+    } catch {
+        Throw "Could not download packages.config."
+    }
+}
+
+# Try find NuGet.exe in path if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
+    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
+    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
+    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
+        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
+        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
+    }
+}
+
+# Try download NuGet.exe if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Downloading NuGet.exe..."
+    try {
+        $wc = GetProxyEnabledWebClient
+        $wc.DownloadFile($NUGET_URL, $NUGET_EXE)
+    } catch {
+        Throw "Could not download NuGet.exe."
+    }
+}
+
+# Save nuget.exe path to environment to be available to child processed
+$ENV:NUGET_EXE = $NUGET_EXE
+
+# Restore tools from NuGet?
+if(-Not $SkipToolPackageRestore.IsPresent) {
+    Push-Location
+    Set-Location $TOOLS_DIR
+
+    # Check for changes in packages.config and remove installed tools if true.
+    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
+    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
+      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
+        Write-Verbose -Message "Missing or changed package.config hash..."
+        Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
+        Remove-Item -Recurse
+    }
+
+    Write-Verbose -Message "Restoring tools from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occurred while restoring NuGet tools."
+    }
+    else
+    {
+        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
+    }
+    Write-Verbose -Message ($NuGetOutput | out-string)
+
+    Pop-Location
+}
+
+# Restore addins from NuGet
+if (Test-Path $ADDINS_PACKAGES_CONFIG) {
+    Push-Location
+    Set-Location $ADDINS_DIR
+
+    Write-Verbose -Message "Restoring addins from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occurred while restoring NuGet addins."
+    }
+
+    Write-Verbose -Message ($NuGetOutput | out-string)
+
+    Pop-Location
+}
+
+# Restore modules from NuGet
+if (Test-Path $MODULES_PACKAGES_CONFIG) {
+    Push-Location
+    Set-Location $MODULES_DIR
+
+    Write-Verbose -Message "Restoring modules from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occurred while restoring NuGet modules."
+    }
+
+    Write-Verbose -Message ($NuGetOutput | out-string)
+
+    Pop-Location
+}
+
+# Make sure that Cake has been installed.
+if (!(Test-Path $CAKE_EXE)) {
+    Throw "Could not find Cake.exe at $CAKE_EXE"
+}
+
+
+
+# Build Cake arguments
+$cakeArguments = @("$Script");
+if ($Target) { $cakeArguments += "-target=$Target" }
+if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
+if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
+if ($ShowDescription) { $cakeArguments += "-showdescription" }
+if ($DryRun) { $cakeArguments += "-dryrun" }
+$cakeArguments += $ScriptArgs
+
+# Start Cake
+Write-Host "Running build script..."
+&$CAKE_EXE $cakeArguments
+exit $LASTEXITCODE
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..a44c3aa
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+# Ref. https://raw.githubusercontent.com/cake-build/resources/b114c0c2914623dbf7c8fea830364420c8fa77f7/build.sh
+##########################################################################
+# This is the Cake bootstrapper script for Linux and OS X.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
+
+# Define directories.
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+TOOLS_DIR=$SCRIPT_DIR/tools
+ADDINS_DIR=$TOOLS_DIR/Addins
+MODULES_DIR=$TOOLS_DIR/Modules
+NUGET_EXE=$TOOLS_DIR/nuget.exe
+CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
+PACKAGES_CONFIG=$TOOLS_DIR/packages.config
+PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum
+ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config
+MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config
+
+# Define md5sum or md5 depending on Linux/OSX
+MD5_EXE=
+if [[ "$(uname -s)" == "Darwin" ]]; then
+    MD5_EXE="md5 -r"
+else
+    MD5_EXE="md5sum"
+fi
+
+# Define default arguments.
+SCRIPT="build.cake"
+CAKE_ARGUMENTS=()
+
+# Parse arguments.
+for i in "$@"; do
+    case $1 in
+        -s|--script) SCRIPT="$2"; shift ;;
+        --) shift; CAKE_ARGUMENTS+=("$@"); break ;;
+        *) CAKE_ARGUMENTS+=("$1") ;;
+    esac
+    shift
+done
+
+# Make sure the tools folder exist.
+if [ ! -d "$TOOLS_DIR" ]; then
+  mkdir "$TOOLS_DIR"
+fi
+
+# Make sure that packages.config exist.
+if [ ! -f "$TOOLS_DIR/packages.config" ]; then
+    echo "Downloading packages.config..."
+    curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
+    if [ $? -ne 0 ]; then
+        echo "An error occurred while downloading packages.config."
+        exit 1
+    fi
+fi
+
+# Download NuGet if it does not exist.
+if [ ! -f "$NUGET_EXE" ]; then
+    echo "Downloading NuGet..."
+    curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+    if [ $? -ne 0 ]; then
+        echo "An error occurred while downloading nuget.exe."
+        exit 1
+    fi
+fi
+
+# Restore tools from NuGet.
+pushd "$TOOLS_DIR" >/dev/null
+if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then
+    find . -type d ! -name . ! -name 'Cake.Bakery' | xargs rm -rf
+fi
+
+mono "$NUGET_EXE" install -ExcludeVersion
+if [ $? -ne 0 ]; then
+    echo "Could not restore NuGet tools."
+    exit 1
+fi
+
+$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5"
+
+popd >/dev/null
+
+# Restore addins from NuGet.
+if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then
+    pushd "$ADDINS_DIR" >/dev/null
+
+    mono "$NUGET_EXE" install -ExcludeVersion
+    if [ $? -ne 0 ]; then
+        echo "Could not restore NuGet addins."
+        exit 1
+    fi
+
+    popd >/dev/null
+fi
+
+# Restore modules from NuGet.
+if [ -f "$MODULES_PACKAGES_CONFIG" ]; then
+    pushd "$MODULES_DIR" >/dev/null
+
+    mono "$NUGET_EXE" install -ExcludeVersion
+    if [ $? -ne 0 ]; then
+        echo "Could not restore NuGet modules."
+        exit 1
+    fi
+
+    popd >/dev/null
+fi
+
+# Make sure that Cake has been installed.
+if [ ! -f "$CAKE_EXE" ]; then
+    echo "Could not find Cake.exe at '$CAKE_EXE'."
+    exit 1
+fi
+
+# Start Cake
+exec mono "$CAKE_EXE" $SCRIPT "${CAKE_ARGUMENTS[@]}"
\ No newline at end of file
diff --git a/build/Build.Settings.targets b/build/Build.Settings.targets
deleted file mode 100644
index c8da139..0000000
--- a/build/Build.Settings.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!-- Use CustomAfterMicrosoftCSharpTargets property (defined in Microsoft.Common.targets) to
-         inject post-Common targets files without requiring the inclusion -->
-    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)Build.targets</CustomAfterMicrosoftCSharpTargets>
-
-    <!-- Changes to this file should invalidate the MSBuild cache, forcing the next build to be a full build. -->
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-</Project>
diff --git a/build/Build.Version.targets b/build/Build.Version.targets
deleted file mode 100644
index f8c0f30..0000000
--- a/build/Build.Version.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MajorVersion>0</MajorVersion>
-    <MinorVersion>13</MinorVersion>
-    <PatchVersion>1</PatchVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <AssemblyVersion>$(MajorVersion).$(MinorVersion)</AssemblyVersion>
-    <PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
-  </PropertyGroup>
-
-  <Target Name="GenerateAssemblyInfo">
-    <ItemGroup>
-      <AssemblyAttributes Include="System.Reflection.AssemblyVersion">
-        <_Parameter1>$(AssemblyVersion)</_Parameter1>
-      </AssemblyAttributes>
-      <AssemblyAttributes Include="System.Reflection.AssemblyInformationalVersion">
-        <_Parameter1>$(PackageVersion)</_Parameter1>
-      </AssemblyAttributes>
-    </ItemGroup>
-
-    <WriteCodeFragment Language="C#" OutputDirectory="$(IntermediateOutputPath)" AssemblyAttributes="@(AssemblyAttributes)">
-      <Output TaskParameter="OutputFile" ItemName="Compile" />
-      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
-    </WriteCodeFragment>
-  </Target>
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      GenerateAssemblyInfo;
-      $(BuildDependsOn);
-    </BuildDependsOn>
-  </PropertyGroup>
-</Project>
diff --git a/build/Build.msbuild b/build/Build.msbuild
deleted file mode 100644
index 1050215..0000000
--- a/build/Build.msbuild
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="RestorePackages; Clean; Package"
-         xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)Build.Version.targets" Condition=" '$(PackageVersion)' == '' " />
-
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-
-    <BuildInParallel Condition=" '$(BuildInParallel)' == '' ">true</BuildInParallel>
-
-    <RootPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</RootPath>
-    <NuGetPath Condition=" '$(NuGetPath)' == '' ">$(RootPath).nuget\nuget.exe</NuGetPath>
-    <ArtifactsPath>$(RootPath)artifacts</ArtifactsPath>
-
-    <PackageVersion Condition=" '$(PackageVersion)' == '' ">0.0.0</PackageVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Solutions Include="$(RootPath)*.sln">
-      <AdditionalProperties>
-        Configuration=$(Configuration);
-        MvcBuildViews=true
-      </AdditionalProperties>
-    </Solutions>
-  </ItemGroup>
-
-  <Target Name="RestorePackages">
-    <Message Text="Restoring solution dependencies..." Importance="high" />
-
-    <Exec Command="$(NuGetPath) restore -NonInteractive -ConfigFile &quot;$(RootPath)nuget.config&quot;"
-          WorkingDirectory="$(RootPath)" StandardOutputImportance="Low" />
-  </Target>
-
-  <Target Name="Clean" DependsOnTargets="RestorePackages">
-    <MSBuild Projects="@(Solutions)" Targets="Clean" BuildInParallel="$(BuildInParallel)" />
-  </Target>
-
-  <Target Name="Build" DependsOnTargets="RestorePackages">
-    <MSBuild Projects="@(Solutions)" Targets="Build" BuildInParallel="$(BuildInParallel)" />
-  </Target>
-
-  <Target Name="Test" DependsOnTargets="RestorePackages">
-    <ItemGroup>
-      <TestAssemblies Include="$(RootPath)tests\**\bin\$(Configuration)\*.Tests.dll" />
-    </ItemGroup>
-
-    <MSBuild Projects="$(RootPath)build\Xunit.targets" Properties="TestAssemblies=%(TestAssemblies.Identity)"
-             Condition=" '@(TestAssemblies)' != '' " />
-  </Target>
-
-  <Target Name="Package" DependsOnTargets="Clean; Build; Test">
-    <PropertyGroup>
-      <PackageVersion Condition=" '$(PackageVersion)' == '' And '$(GitVersion_NuGetVersion)' == '' ">$(GitVersion_NuGetVersion)</PackageVersion>
-      <PackageVersion Condition=" '$(PackageVersion)' == '' ">0.0.0</PackageVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <NuSpecFiles Include="$(RootPath)src\*\*.nuspec" />
-
-      <NuGetArgs Include="-IncludeReferencedProjects" />
-      <NuGetArgs Include="-Properties Configuration=$(Configuration)" />
-      <NuGetArgs Include="-Version $(PackageVersion)" />
-      <NuGetArgs Include="-OutputDirectory $(ArtifactsPath)" />
-      <NuGetArgs Include="-NonInteractive" />
-    </ItemGroup>
-
-    <MakeDir Directories="$(ArtifactsPath)" Condition=" !Exists('$(ArtifactsPath)') " />
-
-    <Exec Command="$(NuGetPath) pack &quot;%(NuSpecFiles.RootDir)%(NuSpecFiles.Directory)%(NuSpecFiles.FileName).csproj&quot; @(NuGetArgs, ' ')" />
-  </Target>
-</Project>
diff --git a/build/Build.targets b/build/Build.targets
deleted file mode 100644
index a8e027b..0000000
--- a/build/Build.targets
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)Build.Version.targets" />
-</Project>
diff --git a/build/Xunit.targets b/build/Xunit.targets
deleted file mode 100644
index b0c0502..0000000
--- a/build/Xunit.targets
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Xunit" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ParallelizeTests Condition=" '$(ParallelizeTests)' == '' ">false</ParallelizeTests>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <XunitMsBuildRunner Include="..\packages\xunit.runner.msbuild.2*\**\xunit.runner.msbuild.dll" />
-    <TestAssemblies Include="$(TestAssemblies)" />
-  </ItemGroup>
-
-  <UsingTask TaskName="Xunit.Runner.MSBuild.xunit" AssemblyFile="@(XunitMsBuildRunner)"
-             Condition=" '@(XunitMsBuildRunner -> Count())' == '1' " />
-
-  <Target Name="Xunit">
-    <Error Text="'xunit.runner.msbuild.dll' was not found in the packages directory." Condition=" '@(XunitMsBuildRunner)' == '' " />
-    <Error Text="Multiple copies of 'xunit.runner.msbuild.dll' were found. Please delete your packages directory from the solution folder and try again." Condition=" '@(XunitMsBuildRunner -> Count())' != '1' " />
-
-    <xunit Assemblies="%(TestAssemblies.Identity)"
-           ParallelizeAssemblies="$(ParallelizeTests)"
-           ParallelizeTestCollections="$(ParallelizeTests)"
-           WorkingFolder="%(TestAssemblies.RelativeDir)" />
-  </Target>
-</Project>