diff --git a/LinqToAnything.sln b/LinqToAnything.sln
index 01e9536..07cd59c 100644
--- a/LinqToAnything.sln
+++ b/LinqToAnything.sln
@@ -1,18 +1,18 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.10
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F26FA645-A6E9-486D-B3D7-48D0E9385BBA}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqToAnything.Tests", "LinqToAnything.Tests\LinqToAnything.Tests.csproj", "{B592565D-E3BF-406D-A0DA-F508DBEC7854}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0944BE53-451C-403A-A1DE-4696EA831166} = {0944BE53-451C-403A-A1DE-4696EA831166}
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LinqToAnything", "LinqToAnything\LinqToAnything.xproj", "{0944BE53-451C-403A-A1DE-4696EA831166}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F26FA645-A6E9-486D-B3D7-48D0E9385BBA}"
-	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqToAnything", "LinqToAnything\LinqToAnything.csproj", "{0944BE53-451C-403A-A1DE-4696EA831166}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/LinqToAnything/LinqToAnything.csproj b/LinqToAnything/LinqToAnything.csproj
new file mode 100644
index 0000000..94a03bd
--- /dev/null
+++ b/LinqToAnything/LinqToAnything.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Turn any data source into an IQueryable</Description>
+    <Copyright>Harry McIntyre</Copyright>
+    <AssemblyTitle>LinqToAnything</AssemblyTitle>
+    <Authors>Harry McIntyre @mcintyre321</Authors>
+    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+    <AssemblyName>LinqToAnything</AssemblyName>
+    <PackageId>LinqToAnything</PackageId>
+    <PackageTags>LINQ, Expression, IQueryable, Provider</PackageTags>
+    <PackageProjectUrl>https://github.com/mcintyre321/LinqToAnything</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/mcintyre321/LinqToAnything/blob/master/LICENSE.md</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/mcintyre321/LinqToAnything.git</RepositoryUrl>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="QueryInterceptor.Core" Version="1.0.5" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.6.8" />
+    <PackageReference Include="System.Reflection" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-version" Version="1.1.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/LinqToAnything/LinqToAnything.xproj b/LinqToAnything/LinqToAnything.xproj
deleted file mode 100644
index 1c475d8..0000000
--- a/LinqToAnything/LinqToAnything.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>0944be53-451c-403a-a1de-4696ea831166</ProjectGuid>
-    <RootNamespace>LinqToAnything</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/LinqToAnything/project.json b/LinqToAnything/project.json
deleted file mode 100644
index 10cd629..0000000
--- a/LinqToAnything/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "description": "Turn any data source into an IQueryable",
-  "copyright": "Harry McIntyre",
-  "title": "LinqToAnything",
-  "authors": [ "Harry McIntyre @mcintyre321" ],
-  "packOptions": {
-    "projectUrl": "https://github.com/mcintyre321/LinqToAnything",
-    "owners": [ "Harry McIntyre @mcintyre321" ],
-    "tags": [ "LINQ, Expression, IQueryable, Provider" ],
-    "licenseUrl": "https://github.com/mcintyre321/LinqToAnything/blob/master/LICENSE.md",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/mcintyre321/LinqToAnything.git"
-    },
-    "summary": "A library that makes it very easy to create an IQueryable for any datasource"
-  },
-  "tools": {
-    "dotnet-version": "1.1.0"
-  },
-  "dependencies": {
-    "QueryInterceptor.Core": "1.0.5",
-    "System.Linq.Dynamic.Core": "1.0.6.8",
-    "System.Reflection": "4.3.0"
-  },
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": "dnxcore50"
-    },
-    "net451": {
-      "frameworkAssemblies": {
-      }
-    }
-
-  }
-}