diff --git a/.gitignore b/.gitignore
index b9d6bd9..b0c5b86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -213,3 +213,7 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+/.vs/LINQtoCSV/v15/Server/sqlite3/storage.ide-wal
+/.vs/LINQtoCSV/v15/Server/sqlite3/storage.ide-shm
+/.vs/LINQtoCSV/v15/Server/sqlite3/storage.ide
+/.vs/LINQtoCSV/v15/Server/sqlite3/db.lock
diff --git a/LINQtoCSV.Tests/CsvContextReadTests.cs b/LINQtoCSV.Tests/CsvContextReadTests.cs
index b8f57d8..f8eb583 100644
--- a/LINQtoCSV.Tests/CsvContextReadTests.cs
+++ b/LINQtoCSV.Tests/CsvContextReadTests.cs
@@ -1,15 +1,11 @@
-using LINQtoCSV;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.IO;
-using System.Collections.Generic;
+using System;
+using Xunit;
 
 namespace LINQtoCSV.Tests
 {
-    [TestClass()]
     public class CsvContextReadTests : Test
     {
-        [TestMethod()]
+        [Fact]
         public void GoodFileUsingOutputFormatForParsingDatesCharUSEnglish()
         {
             // Arrange
@@ -45,7 +41,7 @@ public void GoodFileUsingOutputFormatForParsingDatesCharUSEnglish()
             AssertRead(testInput, fileDescription_namesUs, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileNoSeparatorCharUseOutputFormatForParsingUSEnglish()
         {
             // Arrange
@@ -81,7 +77,7 @@ public void GoodFileNoSeparatorCharUseOutputFormatForParsingUSEnglish()
             AssertRead(testInput, fileDescription_namesUs, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileNoSeparatorCharUSEnglish()
         {
             // Arrange
@@ -117,7 +113,7 @@ public void GoodFileNoSeparatorCharUSEnglish()
             AssertRead(testInput, fileDescription_namesUs, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileCommaDelimitedUseFieldIndexForReadingDataCharUSEnglish()
         {
             // Arrange
@@ -154,7 +150,7 @@ public void GoodFileCommaDelimitedUseFieldIndexForReadingDataCharUSEnglish()
             AssertRead(testInput, fileDescription_namesUs, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileCommaDelimitedUseFieldIndexForReadingDataCharUseOutputFormatForParsingUSEnglish()
         {
             // Arrange
@@ -194,7 +190,7 @@ public void GoodFileCommaDelimitedUseFieldIndexForReadingDataCharUseOutputFormat
         }
 
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileCommaDelimitedNamesInFirstLineUSEnglish()
         {
             // Arrange
@@ -242,7 +238,7 @@ and a quoted ""string"""
             AssertRead(testInput, fileDescription_namesUs, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileTabDelimitedNoNamesInFirstLineNLnl()
         {
             // Arrange
@@ -283,7 +279,7 @@ and a quoted ""string"""
             AssertRead(testInput, fileDescription_nonamesNl, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void GoodFileCommaDelimitedWithTrailingSeparatorChars()
         {
             // Arrange
@@ -332,7 +328,7 @@ and a quoted ""string"""
             AssertRead(testInput, fileDescription_namesUs, expected);
         }
 
-        [TestMethod()]
+        [Fact]
         public void FileWithUnknownColumns_ShouldDiscardColumns() {
             var description = new CsvFileDescription
                 {
diff --git a/LINQtoCSV.Tests/CsvContextWriteTests.cs b/LINQtoCSV.Tests/CsvContextWriteTests.cs
index aebc0a1..de2ef1f 100644
--- a/LINQtoCSV.Tests/CsvContextWriteTests.cs
+++ b/LINQtoCSV.Tests/CsvContextWriteTests.cs
@@ -1,16 +1,13 @@
-using LINQtoCSV;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.IO;
+using System;
 using System.Collections.Generic;
 using System.Text;
+using Xunit;
 
 namespace LINQtoCSV.Tests
 {
-    [TestClass()]
     public class CsvContextWriteTests : Test
     {
-        [TestMethod()]
+        [Fact]
         public void GoodFileCommaDelimitedNamesInFirstLineNLnl()
         {
             // Arrange
diff --git a/LINQtoCSV.Tests/IAssertable.cs b/LINQtoCSV.Tests/IAssertable.cs
index af0680e..907df4b 100644
--- a/LINQtoCSV.Tests/IAssertable.cs
+++ b/LINQtoCSV.Tests/IAssertable.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace LINQtoCSV.Tests
+namespace LINQtoCSV.Tests
 {
     public interface IAssertable<T>
     {
diff --git a/LINQtoCSV.Tests/LINQtoCSV.Tests.csproj b/LINQtoCSV.Tests/LINQtoCSV.Tests.csproj
index 38d8f6b..abee391 100644
--- a/LINQtoCSV.Tests/LINQtoCSV.Tests.csproj
+++ b/LINQtoCSV.Tests/LINQtoCSV.Tests.csproj
@@ -1,79 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{04EE17CD-E7B3-4D58-BF84-E553F5332A14}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LINQtoCSV.Tests</RootNamespace>
-    <AssemblyName>LINQtoCSV.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
+
   <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="CsvContextWriteTests.cs" />
-    <Compile Include="CsvContextReadTests.cs" />
-    <Compile Include="IAssertable.cs" />
-    <Compile Include="Person.cs" />
-    <Compile Include="ProductDataSpecificFieldIndex.cs" />
-    <Compile Include="ProductData.cs" />
-    <Compile Include="ProductData_DuplicateIndices.cs" />
-    <Compile Include="ProductData_MissingFieldIndex.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Test.cs" />
-    <Compile Include="TestDataRow.cs" />
-    <Compile Include="Utils.cs" />
+    <ProjectReference Include="..\LINQtoCSV\LINQtoCSV.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\LINQtoCSV\LINQtoCSV.csproj">
-      <Project>{07058BF9-6F86-40FF-AE33-2A4F89B5758A}</Project>
-      <Name>LINQtoCSV</Name>
-    </ProjectReference>
+    <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/LINQtoCSV.Tests/Person.cs b/LINQtoCSV.Tests/Person.cs
index 7ef109d..5c5e98d 100644
--- a/LINQtoCSV.Tests/Person.cs
+++ b/LINQtoCSV.Tests/Person.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Xunit;
 
 namespace LINQtoCSV.Tests
 {
@@ -15,9 +11,9 @@ public class Person : IAssertable<Person> {
         public int Age { get; set; }
 
         public void AssertEqual(Person other) {
-            Assert.AreEqual(other.Name, Name);
-            Assert.AreEqual(other.LastName, LastName);
-            Assert.AreEqual(other.Age, Age);
+            Assert.Equal(other.Name, Name);
+            Assert.Equal(other.LastName, LastName);
+            Assert.Equal(other.Age, Age);
         }
     }
 }
diff --git a/LINQtoCSV.Tests/ProductData.cs b/LINQtoCSV.Tests/ProductData.cs
index f9103a4..80317b0 100644
--- a/LINQtoCSV.Tests/ProductData.cs
+++ b/LINQtoCSV.Tests/ProductData.cs
@@ -1,15 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Globalization;
-using LINQtoCSV;
+using Xunit;
 
 namespace LINQtoCSV.Tests
 {
-// Because the fields in this type are used only indirectly, the compiler
-// will warn they are unused or unassigned. Disable those warnings.
+    // Because the fields in this type are used only indirectly, the compiler
+    // will warn they are unused or unassigned. Disable those warnings.
 #pragma warning disable 0169, 0414, 0649
 
     internal class ProductData : IAssertable<ProductData>
@@ -62,18 +58,18 @@ internal class ProductData : IAssertable<ProductData>
 
         public void AssertEqual(ProductData other)
         {
-            Assert.AreNotEqual(other, null);
+            Assert.NotNull(other);
 
-            Assert.AreEqual(other.name, name, "name");
-            Assert.AreEqual(other.startDate, startDate, "startDate");
-            Assert.AreEqual(other.launchTime, launchTime, "launchTime");
-            Assert.AreEqual(other.weight, weight, "weight");
-            Assert.AreEqual(other.nbrAvailable, nbrAvailable, "nbrAvailable");
-            Assert.AreEqual(other.shopsAvailable, shopsAvailable, "shopsAvailable");
-            Assert.AreEqual(other.hexProductCode, hexProductCode, "hexProductCode");
-            Assert.AreEqual(other.onsale, onsale, "onsale");
-            Assert.AreEqual(other.retailPrice, retailPrice, "retailPrice");
-            Assert.AreEqual(Utils.NormalizeString(other.description), Utils.NormalizeString(description), "description");
+            Assert.Equal(other.name, name);
+            Assert.Equal(other.startDate, startDate);
+            Assert.Equal(other.launchTime, launchTime);
+            Assert.Equal(other.weight, weight);
+            Assert.Equal(other.nbrAvailable, nbrAvailable);
+            Assert.Equal(other.shopsAvailable, shopsAvailable);
+            Assert.Equal(other.hexProductCode, hexProductCode);
+            Assert.Equal(other.onsale, onsale);
+            Assert.Equal(other.retailPrice, retailPrice);
+            Assert.Equal(Utils.NormalizeString(other.description), Utils.NormalizeString(description));
         }
     }
 }
diff --git a/LINQtoCSV.Tests/ProductDataSpecificFieldIndex.cs b/LINQtoCSV.Tests/ProductDataSpecificFieldIndex.cs
index f213421..229f174 100644
--- a/LINQtoCSV.Tests/ProductDataSpecificFieldIndex.cs
+++ b/LINQtoCSV.Tests/ProductDataSpecificFieldIndex.cs
@@ -1,15 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Globalization;
-using LINQtoCSV;
+using Xunit;
 
 namespace LINQtoCSV.Tests
 {
-// Because the fields in this type are used only indirectly, the compiler
-// will warn they are unused or unassigned. Disable those warnings.
+    // Because the fields in this type are used only indirectly, the compiler
+    // will warn they are unused or unassigned. Disable those warnings.
 #pragma warning disable 0169, 0414, 0649
 
     internal class ProductDataSpecificFieldIndex : IAssertable<ProductDataSpecificFieldIndex>
@@ -29,11 +24,11 @@ internal class ProductDataSpecificFieldIndex : IAssertable<ProductDataSpecificFi
 
         public void AssertEqual(ProductDataSpecificFieldIndex other)
         {
-            Assert.AreNotEqual(other, null);
+            Assert.NotNull(other);
 
-            Assert.AreEqual(other.name, name, "name");
-            Assert.AreEqual(other.startDate, startDate, "startDate");
-            Assert.AreEqual(other.weight, weight, "weight");
+            Assert.Equal(other.name, name);
+            Assert.Equal(other.startDate, startDate);
+            Assert.Equal(other.weight, weight);
         }
     }
 
@@ -54,11 +49,11 @@ internal class ProductDataCharLength : IAssertable<ProductDataCharLength>
 
         public void AssertEqual(ProductDataCharLength other)
         {
-            Assert.AreNotEqual(other, null);
+            Assert.NotNull(other);
 
-            Assert.AreEqual(other.name, name, "name");
-            Assert.AreEqual(other.startDate, startDate, "startDate");
-            Assert.AreEqual(other.weight, weight, "weight");
+            Assert.Equal(other.name, name);
+            Assert.Equal(other.startDate, startDate);
+            Assert.Equal(other.weight, weight);
         }
     }
 
@@ -75,10 +70,10 @@ internal class ProductDataParsingOutputFormat : IAssertable<ProductDataParsingOu
 
         public void AssertEqual(ProductDataParsingOutputFormat other)
         {
-            Assert.AreNotEqual(other, null);
+            Assert.NotNull(other);
 
-            Assert.AreEqual(other.name, name, "name");
-            Assert.AreEqual(other.startDate, startDate, "startDate");
+            Assert.Equal(other.name, name);
+            Assert.Equal(other.startDate, startDate);
         }
     }
 }
diff --git a/LINQtoCSV.Tests/ProductData_DuplicateIndices.cs b/LINQtoCSV.Tests/ProductData_DuplicateIndices.cs
index 6fb609a..61e02b9 100644
--- a/LINQtoCSV.Tests/ProductData_DuplicateIndices.cs
+++ b/LINQtoCSV.Tests/ProductData_DuplicateIndices.cs
@@ -1,15 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using System.Globalization;
-using LINQtoCSV;
 
 namespace LINQtoCSV.Tests
 {
-// Because the fields in this type are used only indirectly, the compiler
-// will warn they are unused or unassigned. Disable those warnings.
+    // Because the fields in this type are used only indirectly, the compiler
+    // will warn they are unused or unassigned. Disable those warnings.
 #pragma warning disable 0169, 0414, 0649
 
     class ProductData_DuplicateIndices
diff --git a/LINQtoCSV.Tests/ProductData_MissingFieldIndex.cs b/LINQtoCSV.Tests/ProductData_MissingFieldIndex.cs
index 08856b1..a618072 100644
--- a/LINQtoCSV.Tests/ProductData_MissingFieldIndex.cs
+++ b/LINQtoCSV.Tests/ProductData_MissingFieldIndex.cs
@@ -1,15 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using System.Globalization;
-using LINQtoCSV;
 
 namespace LINQtoCSV.Tests
 {
-// Because the fields in this type are used only indirectly, the compiler
-// will warn they are unused or unassigned. Disable those warnings.
+    // Because the fields in this type are used only indirectly, the compiler
+    // will warn they are unused or unassigned. Disable those warnings.
 #pragma warning disable 0169, 0414, 0649
 
     class ProductData_MissingFieldIndex
diff --git a/LINQtoCSV.Tests/Properties/AssemblyInfo.cs b/LINQtoCSV.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index e84ce13..0000000
--- a/LINQtoCSV.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("LINQtoCSV.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("LINQtoCSV.Tests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("45424f0f-359a-4e5c-b6d4-53f66dada32f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/LINQtoCSV.Tests/Test.cs b/LINQtoCSV.Tests/Test.cs
index 4ef0864..4bbd1f3 100644
--- a/LINQtoCSV.Tests/Test.cs
+++ b/LINQtoCSV.Tests/Test.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Text;
+using System.Collections.Generic;
 using System.IO;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Xunit;
 
 namespace LINQtoCSV.Tests
 {
@@ -26,7 +24,7 @@ protected StreamReader StreamReaderFromString(string s)
         protected void AssertCollectionsEqual<T>(IEnumerable<T> actual, IEnumerable<T> expected) where T : IAssertable<T>
         {
             int count = actual.Count();
-            Assert.AreEqual(count, expected.Count(), "counts");
+            Assert.Equal(count, expected.Count());
 
             for(int i = 0; i < count; i++)
             {
@@ -120,7 +118,7 @@ public string TestWrite<T>(IEnumerable<T> values, CsvFileDescription fileDescrip
         public void AssertWrite<T>(IEnumerable<T> values, CsvFileDescription fileDescription, string expected) where T : class
         {
             string actual = TestWrite<T>(values, fileDescription);
-            Assert.AreEqual(Utils.NormalizeString(actual), Utils.NormalizeString(expected));
+            Assert.Equal(Utils.NormalizeString(actual), Utils.NormalizeString(expected));
         }
     }
 }
diff --git a/LINQtoCSV.Tests/TestDataRow.cs b/LINQtoCSV.Tests/TestDataRow.cs
index b15a2fb..02c634b 100644
--- a/LINQtoCSV.Tests/TestDataRow.cs
+++ b/LINQtoCSV.Tests/TestDataRow.cs
@@ -1,8 +1,5 @@
-using System;
+using LINQtoCSV;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using LINQtoCSV;
 
 namespace TestConsoleApplication
 {
diff --git a/LINQtoCSV.Tests/Utils.cs b/LINQtoCSV.Tests/Utils.cs
index 690ef5c..ad5c31b 100644
--- a/LINQtoCSV.Tests/Utils.cs
+++ b/LINQtoCSV.Tests/Utils.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace LINQtoCSV.Tests
+namespace LINQtoCSV.Tests
 {
     public static class Utils
     {
diff --git a/LINQtoCSV.sln b/LINQtoCSV.sln
index 62bbb72..378c72b 100644
--- a/LINQtoCSV.sln
+++ b/LINQtoCSV.sln
@@ -1,25 +1,17 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestConsoleApplication", "TestConsoleApplication\TestConsoleApplication.csproj", "{C3FE8ACB-688B-47E4-9E62-0EE09B0435E1}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2006
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsoleApplication", "TestConsoleApplication\TestConsoleApplication.csproj", "{C3FE8ACB-688B-47E4-9E62-0EE09B0435E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINQtoCSV", "LINQtoCSV\LINQtoCSV.csproj", "{07058BF9-6F86-40FF-AE33-2A4F89B5758A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINQtoCSV", "LINQtoCSV\LINQtoCSV.csproj", "{07058BF9-6F86-40FF-AE33-2A4F89B5758A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleCode", "SampleCode\SampleCode.csproj", "{EEFD875B-5D48-41F4-80FD-5FAE3725ED83}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleCode", "SampleCode\SampleCode.csproj", "{EEFD875B-5D48-41F4-80FD-5FAE3725ED83}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINQtoCSV.Tests", "LINQtoCSV.Tests\LINQtoCSV.Tests.csproj", "{04EE17CD-E7B3-4D58-BF84-E553F5332A14}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{23664B5F-ED48-4718-94B7-C1A65CDA45EE}"
-	ProjectSection(SolutionItems) = preProject
-		LINQtoCSV.vsmdi = LINQtoCSV.vsmdi
-		Local.testsettings = Local.testsettings
-		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINQtoCSV.Tests", "LINQtoCSV.Tests\LINQtoCSV.Tests.csproj", "{04EE17CD-E7B3-4D58-BF84-E553F5332A14}"
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = LINQtoCSV.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -45,4 +37,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A03A0CEB-0934-45AA-8B5D-2399B9EED8BC}
+	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = LINQtoCSV.vsmdi
+	EndGlobalSection
 EndGlobal
diff --git a/LINQtoCSV/LINQtoCSV.csproj b/LINQtoCSV/LINQtoCSV.csproj
index 17323b9..60b688f 100644
--- a/LINQtoCSV/LINQtoCSV.csproj
+++ b/LINQtoCSV/LINQtoCSV.csproj
@@ -1,114 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{07058BF9-6F86-40FF-AE33-2A4F89B5758A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LINQtoCSV</RootNamespace>
-    <AssemblyName>LINQtoCSV</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <Version>1.6.0.0</Version>
+    <Company>Matt Perdeck</Company>
+    <Authors>Matt Perdeck</Authors>
+    <Description>Popular, easy to use library to read and write CSV and tab delimited files. Supports data fields containing commas and line breaks. Supports different character encodings, separator characters and date and number formats. Robust error handling lets you quickly fix problems in large input files.</Description>
+    <Copyright>2018</Copyright>
+    <PackageProjectUrl>http://www.codeproject.com/Articles/25133/LINQ-to-CSV-library</PackageProjectUrl>
+    <PackageLicenseUrl>https://opensource.org/licenses/apache2.0.php</PackageLicenseUrl>
+    <PackageTags>CSV LINQ tab delimited</PackageTags>
+    <PackageIconUrl>http://nuget.org/Media/Default/Packages/LinqToCsv/1.0.0.0/logo.jpg</PackageIconUrl>
+    <RepositoryUrl>https://github.com/mperdeck/LINQtoCSV</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CsvColumnAttribute.cs" />
-    <Compile Include="CsvContext.cs" />
-    <Compile Include="CsvFileDescription.cs" />
-    <Compile Include="CsvStream.cs" />
-    <Compile Include="DataRow.cs" />
-    <Compile Include="DataRowItem.cs" />
-    <Compile Include="Exceptions.cs" />
-    <Compile Include="FieldMapper.cs" />
-    <Compile Include="IDataRow.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <Folder Include="Properties\" />
   </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/LINQtoCSV/LINQtoCSV.nuspec b/LINQtoCSV/LINQtoCSV.nuspec
deleted file mode 100644
index 0d70c1a..0000000
--- a/LINQtoCSV/LINQtoCSV.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <projectUrl>http://www.codeproject.com/Articles/25133/LINQ-to-CSV-library</projectUrl>
-      <iconUrl>http://nuget.org/Media/Default/Packages/LinqToCsv/1.0.0.0/logo.jpg</iconUrl>
-      <requireLicenseAcceptance>false</requireLicenseAcceptance>
-      <summary>
-          Serialise/Deserialize your classes to/from CSV and tab delimited files. Very flexible. Supports international date and number formats.
-      </summary>
-    <description>$description$</description>
-    <copyright>Copyright 2014</copyright>
-    <tags>CSV LINQ tab delimited</tags>
-    <dependencies>
-    </dependencies>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/LINQtoCSV/Properties/AssemblyInfo.cs b/LINQtoCSV/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0605278..0000000
--- a/LINQtoCSV/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("LINQtoCSV")]
-[assembly: AssemblyDescription("Popular, easy to use library to read and write CSV and tab delimited files. Supports data fields containing commas and line breaks. Supports different character encodings, separator characters and date and number formats. Robust error handling lets you quickly fix problems in large input files.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Matt Perdeck")]
-[assembly: AssemblyProduct("LINQtoCSV")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("734dd618-3346-49b5-879d-25c2a4cccd63")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
diff --git a/SampleCode/Properties/AssemblyInfo.cs b/SampleCode/Properties/AssemblyInfo.cs
deleted file mode 100644
index f484095..0000000
--- a/SampleCode/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SampleCode")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SampleCode")]
-[assembly: AssemblyCopyright("Copyright ©  2008")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9a35945b-22c5-45af-8c4b-82e39aefac04")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SampleCode/SampleCode.csproj b/SampleCode/SampleCode.csproj
index 08ae132..39bae42 100644
--- a/SampleCode/SampleCode.csproj
+++ b/SampleCode/SampleCode.csproj
@@ -1,118 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EEFD875B-5D48-41F4-80FD-5FAE3725ED83}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SampleCode</RootNamespace>
-    <AssemblyName>SampleCode</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Product.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="TestFiles\products.csv" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\LINQtoCSV\LINQtoCSV.csproj">
-      <Project>{07058BF9-6F86-40FF-AE33-2A4F89B5758A}</Project>
-      <Name>LINQtoCSV</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\LINQtoCSV\LINQtoCSV.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <Folder Include="Properties\" />
   </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/TestConsoleApplication/Program.cs b/TestConsoleApplication/Program.cs
index e82ff17..a1f741f 100644
--- a/TestConsoleApplication/Program.cs
+++ b/TestConsoleApplication/Program.cs
@@ -35,7 +35,7 @@ static void Main(string[] args)
             try
             {
                 dataRows_namesUs =
-                    cc.Read<ProductData>("../../TestFiles/goodfile_us.csv", fileDescription_namesUs);
+                    cc.Read<ProductData>("TestFiles/goodfile_us.csv", fileDescription_namesUs);
 
                 Utils.OutputData<ProductData>(dataRows_namesUs, "Good file, English US culture");
 
@@ -56,7 +56,7 @@ static void Main(string[] args)
                 // Read raw data rows
 
                 dataRows_namesUsRaw =
-                    cc.Read<TestDataRow>("../../TestFiles/goodfile_us.csv", fileDescription_namesUs);
+                    cc.Read<TestDataRow>("TestFiles/goodfile_us.csv", fileDescription_namesUs);
 
                 Utils.OutputData<TestDataRow>(dataRows_namesUsRaw, "Good file, English US culture, Raw data rows");
             }
@@ -84,7 +84,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData> dataRows_nonamesNl =
-                    cc.Read<ProductData>("../../TestFiles/goodfile_nl.csv", fileDescription_nonamesNl);
+                    cc.Read<ProductData>("TestFiles/goodfile_nl.csv", fileDescription_nonamesNl);
 
                 Utils.OutputData<ProductData>(dataRows_nonamesNl, "Good file, Dutch culture");
             }
@@ -112,7 +112,7 @@ static void Main(string[] args)
             try
             {
                 using (StreamReader sr =
-                    new StreamReader("../../TestFiles/goodfile_nl.csv", Encoding.UTF8))
+                    new StreamReader("TestFiles/goodfile_nl.csv", Encoding.UTF8))
                 {
                     IEnumerable<ProductData> dataRows_nonamesNl =
                         cc.Read<ProductData>(sr, fileDescription_nonamesNl_stream);
@@ -133,7 +133,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData_DuplicateIndices> dataRows2 =
-                    cc.Read<ProductData_DuplicateIndices>("../../TestFiles/goodfile_nl.csv", fileDescription_nonamesNl);
+                    cc.Read<ProductData_DuplicateIndices>("TestFiles/goodfile_nl.csv", fileDescription_nonamesNl);
 
                 Utils.OutputData<ProductData_DuplicateIndices>(dataRows2, "Good file, Dutch culture");
             }
@@ -147,7 +147,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData_MissingFieldIndex> dataRows2 =
-                    cc.Read<ProductData_MissingFieldIndex>("../../TestFiles/goodfile_nl.csv", fileDescription_nonamesNl);
+                    cc.Read<ProductData_MissingFieldIndex>("TestFiles/goodfile_nl.csv", fileDescription_nonamesNl);
 
                 Utils.OutputData<ProductData_MissingFieldIndex>(dataRows2, "Good file, Dutch culture");
             }
@@ -170,7 +170,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData> dataRows_nonamesNl_bad =
-                    cc.Read<ProductData>("../../TestFiles/goodfile_nl.csv", fileDescription_bad);
+                    cc.Read<ProductData>("TestFiles/goodfile_nl.csv", fileDescription_bad);
 
                 Utils.OutputData<ProductData>(dataRows_nonamesNl_bad, "Good file, Dutch culture");
             }
@@ -185,7 +185,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData> dataRows_namesUs_3 =
-                    cc.Read<ProductData>("../../TestFiles/badfile_unknownname.csv", fileDescription_namesUs);
+                    cc.Read<ProductData>("TestFiles/badfile_unknownname.csv", fileDescription_namesUs);
 
                 Utils.OutputData<ProductData>(dataRows_namesUs_3, "Bad file, English US culture, unknown name");
             }
@@ -210,7 +210,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData> dataRows_namesUs_2 =
-                    cc.Read<ProductData>("../../TestFiles/goodfile_us.csv", fileDescription_namesUs_enforceCsvColumn);
+                    cc.Read<ProductData>("TestFiles/goodfile_us.csv", fileDescription_namesUs_enforceCsvColumn);
 
                 Utils.OutputData<ProductData>(dataRows_namesUs_2, "Good file, English US culture");
             }
@@ -236,7 +236,7 @@ static void Main(string[] args)
             try
             {
                 IEnumerable<ProductData> dataRows_namesUs_dataerrors =
-                    cc.Read<ProductData>("../../TestFiles/badfile_us_dataerrors.csv", fileDescription_nonamesUs);
+                    cc.Read<ProductData>("TestFiles/badfile_us_dataerrors.csv", fileDescription_nonamesUs);
 
                 Utils.OutputData<ProductData>(
                         dataRows_namesUs_dataerrors,
@@ -273,7 +273,7 @@ static void Main(string[] args)
             {
                 cc.Write<ProductData>(
                             dataRows_Test,
-                            "../../TestFiles/output_newdata_names_nl.csv",
+                            "TestFiles/output_newdata_names_nl.csv",
                             fileDescription_namesNl2);
             }
             catch (Exception e)
@@ -297,7 +297,7 @@ static void Main(string[] args)
             {
                 cc.Write<ProductData>(
                             dataRows_namesUs, 
-                            "../../TestFiles/output_nonames_us.csv",
+                            "TestFiles/output_nonames_us.csv",
                             fileDescription_nonamesUs_output);
             }
             catch (Exception e)
@@ -322,7 +322,7 @@ static void Main(string[] args)
             {
                 cc.Write<ProductData>(
                             dataRows_namesUs, 
-                            "../../TestFiles/output_names_nl.csv",
+                            "TestFiles/output_names_nl.csv",
                             fileDescription_namesNl);
             }
             catch (Exception e)
@@ -357,7 +357,7 @@ orderby row.weight
 
                 cc.Write(
                     query,
-                    "../../TestFiles/output_anon.csv",
+                    "TestFiles/output_anon.csv",
                     fileDescription_anon);
             }
             catch (Exception e)
@@ -377,7 +377,7 @@ orderby row.weight
             {
                 cc.Write<ProductData>(
                             dataRows_namesUs, 
-                            "../../TestFiles/output_bad.csv",
+                            "TestFiles/output_bad.csv",
                             fileDescription_bad);
             }
             catch (Exception e)
@@ -404,7 +404,7 @@ orderby row.weight
 
                 cc.Write<ProductData_MissingFieldIndex>(
                             emptyData,
-                            "../../TestFiles/output_bad.csv",
+                            "TestFiles/output_bad.csv",
                             fileDescription_nonamesNl_2);
             }
             catch (Exception e)
diff --git a/TestConsoleApplication/Properties/AssemblyInfo.cs b/TestConsoleApplication/Properties/AssemblyInfo.cs
deleted file mode 100644
index e211159..0000000
--- a/TestConsoleApplication/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("TestConsoleApplication")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TestConsoleApplication")]
-[assembly: AssemblyCopyright("Copyright ©  2008")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("cdd04580-d61d-41e7-a853-a770b66f818f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestConsoleApplication/TestConsoleApplication.csproj b/TestConsoleApplication/TestConsoleApplication.csproj
index a735f28..ec172c2 100644
--- a/TestConsoleApplication/TestConsoleApplication.csproj
+++ b/TestConsoleApplication/TestConsoleApplication.csproj
@@ -1,125 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C3FE8ACB-688B-47E4-9E62-0EE09B0435E1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TestConsoleApplication</RootNamespace>
-    <AssemblyName>TestConsoleApplication</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ProductData_MissingFieldIndex.cs" />
-    <Compile Include="ProductData_DuplicateIndices.cs" />
-    <Compile Include="ProductData.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestDataRow.cs" />
-    <Compile Include="Utils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="TestFiles\badfile_unknownname.csv" />
-    <None Include="TestFiles\badfile_us_dataerrors.csv" />
-    <None Include="TestFiles\goodfile_nl.csv" />
-    <None Include="TestFiles\goodfile_us.csv" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\LINQtoCSV\LINQtoCSV.csproj">
-      <Project>{07058BF9-6F86-40FF-AE33-2A4F89B5758A}</Project>
-      <Name>LINQtoCSV</Name>
-    </ProjectReference>
+    <Folder Include="Properties\" />
   </ItemGroup>
+
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <ProjectReference Include="..\LINQtoCSV\LINQtoCSV.csproj" />
   </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>