From 892f95f24209a410738b1697168162377c72d5d6 Mon Sep 17 00:00:00 2001
From: Kevin Hobson <kevin.hobson@smgov.net>
Date: Sat, 20 Jul 2019 11:07:57 -0700
Subject: [PATCH 01/11] update for nunit3

---
 SODA.Tests/HumanAddressTests.cs               |  4 +-
 SODA.Tests/PhoneColumnTest.cs                 |  4 +-
 SODA.Tests/ResourceTests.cs                   |  4 +-
 SODA.Tests/SODA.Tests.csproj                  | 16 +++-
 SODA.Tests/SodaClientTests.cs                 | 86 +++++++++----------
 SODA.Tests/SodaRequestTests.cs                | 10 +--
 SODA.Tests/SodaUriTests.cs                    | 84 +++++++++---------
 SODA.Tests/SoqlQueryTests.cs                  | 20 ++---
 SODA.Tests/packages.config                    |  3 +-
 Utilities.Tests/DataFileExporterTests.cs      | 37 ++++----
 Utilities.Tests/ExcelDataReaderHelperTests.cs |  6 ++
 Utilities.Tests/FileLoggingTests.cs           | 30 ++++---
 .../SeparatedValuesSerializerTests.cs         | 48 +++++------
 Utilities.Tests/Utilities.Tests.csproj        | 16 +++-
 Utilities.Tests/packages.config               |  3 +-
 15 files changed, 203 insertions(+), 168 deletions(-)

diff --git a/SODA.Tests/HumanAddressTests.cs b/SODA.Tests/HumanAddressTests.cs
index 1e6a862..8345de7 100644
--- a/SODA.Tests/HumanAddressTests.cs
+++ b/SODA.Tests/HumanAddressTests.cs
@@ -28,11 +28,11 @@ public void New_Deserializes_Valid_HumanAddress_Json()
 
         [TestCase("not json")]
         [TestCase(@"{""not"":""a"",""human"":""address""}")]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("HumanAddress")]
         public void New_Throws_ArgumentOutOfRangeException_For_Invalid_HumanAddress_Json(string input)
         {
-            new HumanAddress(input);
+            Assert.That(() => new HumanAddress(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
diff --git a/SODA.Tests/PhoneColumnTest.cs b/SODA.Tests/PhoneColumnTest.cs
index 5b284a8..1907a2e 100644
--- a/SODA.Tests/PhoneColumnTest.cs
+++ b/SODA.Tests/PhoneColumnTest.cs
@@ -88,11 +88,11 @@ public void New_Deserializes_PhoneColumn_For_No_Type_Json()
 
         [TestCase("not json")]
         [TestCase(@"{""not"":""a"",""valid"":""phone""}")]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("PhoneColumn")]
         public void New_Throws_ArgumentOutOfRangeException_For_Invalid_PhoneColumn_Json(string input)
         {
-            new PhoneColumn(input);
+            Assert.That(() => new PhoneColumn(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
     }
 }
diff --git a/SODA.Tests/ResourceTests.cs b/SODA.Tests/ResourceTests.cs
index 8989ad1..6b0f5b9 100644
--- a/SODA.Tests/ResourceTests.cs
+++ b/SODA.Tests/ResourceTests.cs
@@ -70,11 +70,11 @@ public void New_Gets_Metadata_Identifier()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("Resource")]
         public void GetRow_With_Invalid_RowId_Throws_ArugmentException(string input)
         {
-            new Resource<object>(mockMetadata).GetRow(input);
+            Assert.That(() => new Resource<object>(mockMetadata).GetRow(input), Throws.TypeOf<ArgumentException>());
         }
     }
 }
diff --git a/SODA.Tests/SODA.Tests.csproj b/SODA.Tests/SODA.Tests.csproj
index a82370c..2854fbf 100644
--- a/SODA.Tests/SODA.Tests.csproj
+++ b/SODA.Tests/SODA.Tests.csproj
@@ -1,5 +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\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -22,6 +24,8 @@
     <SccProvider>SAK</SccProvider>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,9 +48,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -112,6 +115,13 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <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\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- 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/SODA.Tests/SodaClientTests.cs b/SODA.Tests/SodaClientTests.cs
index ad7a289..225c065 100644
--- a/SODA.Tests/SodaClientTests.cs
+++ b/SODA.Tests/SodaClientTests.cs
@@ -22,14 +22,14 @@ public void TestSetup()
             exampleUri = new Uri(exampleUrl);
             mockClient = new SodaClient(StringMocks.Host, StringMocks.NonEmptyInput);
         }
-                
+
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaClient")]
         public void New_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            new SodaClient(input, StringMocks.Host);
+            Assert.That(() => new SodaClient(input, StringMocks.Host), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase("host.com")]
@@ -69,42 +69,42 @@ public void New_With_Username_Gets_Username()
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void GetMetadata_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            mockClient.GetMetadata(input);
+            Assert.That(() => mockClient.GetMetadata(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(-100)]
         [TestCase(-1)]
         [TestCase(0)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void GetMetadataPage_With_NonPositive_Page_Throws_ArgumentOutOfRangeException(int input)
         {
             //the call to ToList ensures the IEnumerable is evaluated
-            mockClient.GetMetadataPage(input).ToList();
+            Assert.That(() => mockClient.GetMetadataPage(input).ToList(), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void GetResource_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            mockClient.GetResource<object>(input);
+            Assert.That(() => mockClient.GetResource<object>(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Query_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            mockClient.Query<object>(new SoqlQuery(), input);
+            Assert.That(() => mockClient.Query<object>(new SoqlQuery(), input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -128,47 +128,47 @@ public void Query_With_UndefinedLimit_UsesMaximum()
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Upsert_With_String_And_SodaDataFormat_XML_Throws_ArgumentOutOfRangeException()
         {
-            mockClient.Upsert(String.Empty, SodaDataFormat.XML, StringMocks.ResourceId);
+            Assert.That(() => mockClient.Upsert(String.Empty, SodaDataFormat.XML, StringMocks.ResourceId), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Upsert_With_String_And_SodaDataFormat_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
-            mockClient.Upsert(String.Empty, SodaDataFormat.JSON, StringMocks.ResourceId);
+            Assert.That(() => mockClient.Upsert(String.Empty, SodaDataFormat.JSON, StringMocks.ResourceId), Throws.TypeOf<InvalidOperationException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Upsert_With_Entities_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
             IEnumerable<object> payload = Enumerable.Empty<object>();
 
-            mockClient.Upsert(payload, input);
+            Assert.That(() => mockClient.Upsert(payload, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Upsert_With_Entities_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
             IEnumerable<object> payload = Enumerable.Empty<object>();
 
-            mockClient.Upsert(payload, StringMocks.ResourceId);
+            Assert.That(() => mockClient.Upsert(payload, StringMocks.ResourceId), Throws.TypeOf<InvalidOperationException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -176,11 +176,11 @@ public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_And_Invali
             Func<IEnumerable<object>, object, bool> breakFunc = (l, s) => false;
 
             //call ToList to ensure the IEnumerable is executed
-            mockClient.BatchUpsert(payload, 1, breakFunc, input).ToList();
+            Assert.That(() => mockClient.BatchUpsert(payload, 1, breakFunc, input).ToList(), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -188,104 +188,104 @@ public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_Using_Anon
             Func<IEnumerable<object>, object, bool> breakFunc = (l, s) => false;
 
             //call ToList to ensure the IEnumerable is executed
-            mockClient.BatchUpsert(payload, 1, breakFunc, StringMocks.ResourceId).ToList();
+            Assert.That(() => mockClient.BatchUpsert(payload, 1, breakFunc, StringMocks.ResourceId).ToList(), Throws.TypeOf<InvalidOperationException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
             IEnumerable<object> payload = Enumerable.Empty<object>();
 
-            mockClient.BatchUpsert(payload, 1, input);
+            Assert.That(() => mockClient.BatchUpsert(payload, 1, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
             IEnumerable<object> payload = Enumerable.Empty<object>();
 
-            mockClient.BatchUpsert(payload, 1, StringMocks.ResourceId);
+            Assert.That(() => mockClient.BatchUpsert(payload, 1, StringMocks.ResourceId), Throws.TypeOf<InvalidOperationException>());
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Replace_With_String_And_DataFormat_XML_And_ResourceId_Throws_ArgumentOutOfRangeException()
         {
-            mockClient.Replace(String.Empty, SodaDataFormat.XML, StringMocks.ResourceId);
+            Assert.That(() => mockClient.Replace(String.Empty, SodaDataFormat.XML, StringMocks.ResourceId), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Replace_With_String_And_DataFormat_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            mockClient.Replace(String.Empty, SodaDataFormat.JSON, input);
+            Assert.That(() => mockClient.Replace(String.Empty, SodaDataFormat.JSON, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Replace_With_String_And_DataFormat_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
-            mockClient.Replace(String.Empty, SodaDataFormat.JSON, StringMocks.ResourceId);
+            Assert.That(() => mockClient.Replace(String.Empty, SodaDataFormat.JSON, StringMocks.ResourceId), Throws.TypeOf<InvalidOperationException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Replace_With_Entities_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
             IEnumerable<object> payload = Enumerable.Empty<object>();
 
-            mockClient.Replace(payload, input);
+            Assert.That(() => mockClient.Replace(payload, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Replace_With_Entities_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
             IEnumerable<object> payload = Enumerable.Empty<object>();
 
-            mockClient.Replace(payload, StringMocks.ResourceId);
+            Assert.That(() => mockClient.Replace(payload, StringMocks.ResourceId), Throws.TypeOf<InvalidOperationException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaClient")]
         public void DeleteRow_With_Empty_RowId_Throws_ArgumentException(string input)
         {
-            mockClient.DeleteRow(input, StringMocks.ResourceId);
+            Assert.That(() => mockClient.DeleteRow(input, StringMocks.ResourceId), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void DeleteRow_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            mockClient.DeleteRow(StringMocks.NonEmptyInput, input);
+            Assert.That(() => mockClient.DeleteRow(StringMocks.NonEmptyInput, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void DeleteRow_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
-            mockClient.DeleteRow(StringMocks.NonEmptyInput, StringMocks.ResourceId);
+            Assert.That(() => mockClient.DeleteRow(StringMocks.NonEmptyInput, StringMocks.ResourceId), Throws.TypeOf<InvalidOperationException>());
         }
     }
 }
\ No newline at end of file
diff --git a/SODA.Tests/SodaRequestTests.cs b/SODA.Tests/SodaRequestTests.cs
index ceb5538..f22852a 100644
--- a/SODA.Tests/SodaRequestTests.cs
+++ b/SODA.Tests/SodaRequestTests.cs
@@ -210,7 +210,7 @@ public void New_Sets_Timeout_To_Given_Timeout()
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException))]
+        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaRequest")]
         public void ParseResponse_ReThrows_JSON_Parse_Exception_As_InvalidOperationException()
         {
@@ -218,7 +218,7 @@ public void ParseResponse_ReThrows_JSON_Parse_Exception_As_InvalidOperationExcep
             var request = new SodaRequest(exampleUri, "GET", null, null, null, SodaDataFormat.JSON);
             //we get html5 back from example.com
             //it can't be parsed to a json string
-            request.ParseResponse<string>().ToLower();
+            Assert.That(() => request.ParseResponse<string>().ToLower(), Throws.TypeOf<InvalidOperationException>());
         }
 
         [Test]
@@ -226,9 +226,9 @@ public void ParseResponse_ReThrows_JSON_Parse_Exception_As_InvalidOperationExcep
         public void ParseResponse_Can_GET_Example()
         {
             var request = new SodaRequest(exampleUri, "GET", null, null, null, SodaDataFormat.XML);
-            
+
             string result = request.ParseResponse<string>().ToLower();
-            
+
             StringAssert.Contains("<!doctype", result);
             StringAssert.Contains("<html>", result);
             StringAssert.Contains("<head>", result);
@@ -260,4 +260,4 @@ public void ParseResponse_Non_GET_Sends_Request_To_Example_Using_Method(string i
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/SODA.Tests/SodaUriTests.cs b/SODA.Tests/SodaUriTests.cs
index e0c1372..30dc370 100644
--- a/SODA.Tests/SodaUriTests.cs
+++ b/SODA.Tests/SodaUriTests.cs
@@ -14,7 +14,7 @@ public void All_Methods_Return_Uri_With_Socrata_Domain_As_Host()
         {
             Uri uri = SodaUri.ForMetadata(StringMocks.Host, StringMocks.ResourceId);
             StringAssert.AreEqualIgnoringCase(StringMocks.Host, uri.Host);
-            
+
             uri = null;
             uri = SodaUri.ForMetadataList(StringMocks.Host, 1);
             StringAssert.AreEqualIgnoringCase(StringMocks.Host, uri.Host);
@@ -34,7 +34,7 @@ public void All_Methods_Return_Uri_With_Socrata_Domain_As_Host()
             uri = null;
             uri = SodaUri.ForQuery(StringMocks.Host, StringMocks.ResourceId, new SoqlQuery());
             StringAssert.AreEqualIgnoringCase(StringMocks.Host, uri.Host);
-            
+
             uri = null;
             uri = SodaUri.ForCategoryPage(StringMocks.Host, StringMocks.NonEmptyInput);
             StringAssert.AreEqualIgnoringCase(StringMocks.Host, uri.Host);
@@ -50,7 +50,7 @@ public void All_Methods_Return_Uri_Using_HTTPS()
             uri = null;
             uri = SodaUri.ForMetadata("http://" + StringMocks.Host, StringMocks.ResourceId);
             StringAssert.AreEqualIgnoringCase(Uri.UriSchemeHttps, uri.Scheme);
-            
+
             uri = null;
             uri = SodaUri.ForMetadataList(StringMocks.Host, 1);
             StringAssert.AreEqualIgnoringCase(Uri.UriSchemeHttps, uri.Scheme);
@@ -90,7 +90,7 @@ public void All_Methods_Return_Uri_Using_HTTPS()
             uri = null;
             uri = SodaUri.ForQuery("http://" + StringMocks.Host, StringMocks.ResourceId, new SoqlQuery());
             StringAssert.AreEqualIgnoringCase(Uri.UriSchemeHttps, uri.Scheme);
-            
+
             uri = null;
             uri = SodaUri.ForCategoryPage(StringMocks.Host, StringMocks.NonEmptyInput);
             StringAssert.AreEqualIgnoringCase(Uri.UriSchemeHttps, uri.Scheme);
@@ -102,21 +102,21 @@ public void All_Methods_Return_Uri_Using_HTTPS()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForMetadata_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForMetadata(input, StringMocks.NonEmptyInput);
+            Assert.That(() => SodaUri.ForMetadata(input, StringMocks.NonEmptyInput), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForMetadata_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            SodaUri.ForMetadata(StringMocks.Host, input);
+            Assert.That(() => SodaUri.ForMetadata(StringMocks.Host, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -130,21 +130,21 @@ public void ForMetadata_With_Valid_Arguments_Creates_Metadata_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForMetadataList_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForMetadataList(input, 1);
+            Assert.That(() => SodaUri.ForMetadataList(input, 1), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(-100)]
         [TestCase(-1)]
         [TestCase(0)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForMetadataList_With_Page_Less_Than_1_Throws_ArugmentOutOfRangeException(int page)
         {
-            SodaUri.ForMetadataList(StringMocks.Host, page);
+            Assert.That(() => SodaUri.ForMetadataList(StringMocks.Host, page), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(1)]
@@ -154,28 +154,28 @@ public void ForMetadataList_With_Page_Less_Than_1_Throws_ArugmentOutOfRangeExcep
         public void ForMetadataList_With_Valid_Arguments_Creates_MetadataList_Uri(int page)
         {
             var uri = SodaUri.ForMetadataList(StringMocks.Host, page);
-            
+
             StringAssert.AreEqualIgnoringCase("/views", uri.LocalPath);
             StringAssert.AreEqualIgnoringCase(String.Format("?page={0}", page), uri.Query);
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourceAPI_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForResourceAPI(input, StringMocks.ResourceId);
+            Assert.That(() => SodaUri.ForResourceAPI(input, StringMocks.ResourceId), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourceAPI_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            SodaUri.ForResourceAPI(StringMocks.Host, input);
+            Assert.That(() => SodaUri.ForResourceAPI(StringMocks.Host, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -186,7 +186,7 @@ public void ForResourceAPI_With_Valid_Arguments_Creates_ResourceAPI_Uri()
             StringAssert.AreEqualIgnoringCase(String.Format("/resource/{0}", StringMocks.ResourceId), uri.LocalPath);
 
             uri = null;
-            string rowId =  "rowId";
+            string rowId = "rowId";
 
             uri = SodaUri.ForResourceAPI(StringMocks.Host, StringMocks.ResourceId, rowId);
             StringAssert.AreEqualIgnoringCase(String.Format("/resource/{0}/{1}", StringMocks.ResourceId, rowId), uri.LocalPath);
@@ -194,21 +194,21 @@ public void ForResourceAPI_With_Valid_Arguments_Creates_ResourceAPI_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourcePage_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForResourcePage(input, StringMocks.ResourceId);
+            Assert.That(() => SodaUri.ForResourcePage(input, StringMocks.ResourceId), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourcePage_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            SodaUri.ForResourcePage(StringMocks.Host, input);
+            Assert.That(() => SodaUri.ForResourcePage(StringMocks.Host, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -222,21 +222,21 @@ public void ForResourcePage_With_Valid_Arguments_Creates_ResourcePermalink_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourceAboutPage_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForResourceAboutPage(input, StringMocks.ResourceId);
+            Assert.That(() => SodaUri.ForResourceAboutPage(input, StringMocks.ResourceId), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourceAboutPage_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            SodaUri.ForResourceAboutPage(StringMocks.Host, input);
+            Assert.That(() => SodaUri.ForResourceAboutPage(StringMocks.Host, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -250,21 +250,21 @@ public void ForResourceAboutPage_With_Valid_Arguments_Creates_ResourcePermalink_
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourceAPIPage_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForResourceAPIPage(input, StringMocks.ResourceId);
+            Assert.That(() => SodaUri.ForResourceAPIPage(input, StringMocks.ResourceId), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourceAPIPage_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            SodaUri.ForResourceAPIPage(StringMocks.Host, input);
+            Assert.That(() => SodaUri.ForResourceAPIPage(StringMocks.Host, input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase("http://")]
@@ -290,29 +290,29 @@ public void ForResourceAPIPage_With_Valid_Arguments_Creates_ResourceAPIPage_Uri(
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForQuery_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForQuery(input, StringMocks.ResourceId, new SoqlQuery());
+            Assert.That(() => SodaUri.ForQuery(input, StringMocks.ResourceId, new SoqlQuery()), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForQuery_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
-            SodaUri.ForQuery(StringMocks.Host, input, new SoqlQuery());
+            Assert.That(() => SodaUri.ForQuery(StringMocks.Host, input, new SoqlQuery()), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
         [Category("SodaUri")]
-        [ExpectedException(typeof(ArgumentNullException))]
+        //[ExpectedException(typeof(ArgumentNullException))]
         public void ForQuery_With_Null_SoqlQuery_Throws_ArgumentNullException()
         {
-            SodaUri.ForQuery(StringMocks.Host, StringMocks.ResourceId, null);
+            Assert.That(() => SodaUri.ForQuery(StringMocks.Host, StringMocks.ResourceId, null), Throws.TypeOf<ArgumentNullException>());
         }
 
         [Test]
@@ -329,20 +329,20 @@ public void ForQuery_With_Valid_Arguments_Creates_Query_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForCategoryPage_With_Empty_Host_Throws_ArgumentException(string input)
         {
-            SodaUri.ForCategoryPage(input, StringMocks.NonEmptyInput);
+            Assert.That(() => SodaUri.ForCategoryPage(input, StringMocks.NonEmptyInput), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForCategoryPage_With_Empty_Category_Throws_ArgumentException(string input)
         {
-            SodaUri.ForCategoryPage(StringMocks.Host, input);
+            Assert.That(() => SodaUri.ForCategoryPage(StringMocks.Host, input), Throws.TypeOf<ArgumentException>());
         }
 
         [Test]
@@ -350,9 +350,9 @@ public void ForCategoryPage_With_Empty_Category_Throws_ArgumentException(string
         public void ForCategoryPage_With_Valid_Arguments_Creates_CategoryPage_Uri()
         {
             string category = "Category";
-            
+
             var uri = SodaUri.ForCategoryPage(StringMocks.Host, category);
-            
+
             StringAssert.AreEqualIgnoringCase(String.Format("/categories/{0}", category), uri.LocalPath);
         }
 
diff --git a/SODA.Tests/SoqlQueryTests.cs b/SODA.Tests/SoqlQueryTests.cs
index f2e58ee..28f3b4b 100644
--- a/SODA.Tests/SoqlQueryTests.cs
+++ b/SODA.Tests/SoqlQueryTests.cs
@@ -33,11 +33,11 @@ public void Default_Ctor_Has_No_Limit()
 
         [TestCase(null)]
         [TestCase("")]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SoqlQuery")]
         public void Query_Ctor_Requires_Query(string query)
         {
-            var soql = new SoqlQuery(query);
+            Assert.That(() => new SoqlQuery(query), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -78,7 +78,7 @@ public void Last_Select_Overwrites_All_Previous()
         {
             string[] first = { "first", "second", "last" };
             string[] second = { "first", "second" };
-            string[] last =  { "last" };
+            string[] last = { "last" };
             string format = String.Format("{0}={{0}}", SoqlQuery.SelectKey);
 
             string soql = new SoqlQuery().Select(first)
@@ -420,11 +420,11 @@ public void Last_Having_Overwrites_All_Previous()
         [TestCase(-100)]
         [TestCase(-1)]
         [TestCase(0)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SoqlQuery")]
         public void Limit_Less_Than_One_Throws_ArgumentOutOfRangeException(int limit)
         {
-            var soql = new SoqlQuery().Limit(limit);
+            Assert.That(() => new SoqlQuery().Limit(limit), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(50001)]
@@ -447,7 +447,7 @@ public void Last_Limit_Overwrites_All_Previous()
             int second = 2;
             int last = 3;
             string format = String.Format("{0}={{0}}", SoqlQuery.LimitKey);
-            
+
             string soql = new SoqlQuery().Limit(first)
                                          .Limit(second)
                                          .Limit(last)
@@ -460,11 +460,11 @@ public void Last_Limit_Overwrites_All_Previous()
 
         [TestCase(-999)]
         [TestCase(-1)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SoqlQuery")]
         public void Offset_Less_Than_Zero_Throws_ArgumentOutOfRangeException(int offset)
         {
-            var soql = new SoqlQuery().Offset(offset);
+            Assert.That(() => new SoqlQuery().Offset(offset), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -533,7 +533,7 @@ public void Last_FullTextSearch_Overwrites_All_Previous()
             string second = "second text";
             string last = "last text";
             string format = String.Format("{0}={{0}}", SoqlQuery.SearchKey);
-            
+
             string soql = new SoqlQuery().FullTextSearch(first)
                                          .FullTextSearch(second)
                                          .FullTextSearch(last)
@@ -568,4 +568,4 @@ public void All_Query_Methods_Return_The_Original_Instance()
             Assert.AreSame(original, search);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/SODA.Tests/packages.config b/SODA.Tests/packages.config
index c714ef3..f60f449 100644
--- a/SODA.Tests/packages.config
+++ b/SODA.Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="3.12.0" targetFramework="net45" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Utilities.Tests/DataFileExporterTests.cs b/Utilities.Tests/DataFileExporterTests.cs
index 6f55c8d..8c92761 100644
--- a/Utilities.Tests/DataFileExporterTests.cs
+++ b/Utilities.Tests/DataFileExporterTests.cs
@@ -17,6 +17,7 @@ public class DataFileExporterTests
         [SetUp]
         public void TestInitialize()
         {
+            Environment.CurrentDirectory = TestContext.CurrentContext.TestDirectory;
             simpleEntities = new[] { new SimpleEntityMock(foo, bar) };
 
             if (File.Exists(FileMocks.FileThatDoesNotExist(".csv")))
@@ -55,19 +56,19 @@ public void ExportCSV_Parameterless_Uses_DefaultFilePath()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportCSV_With_Empty_File_Paths_Throws_Exception(string input)
         {
-            DataFileExporter.ExportCSV(simpleEntities, input);
+            Assert.That(() => DataFileExporter.ExportCSV(simpleEntities, input), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase("something.notcsv")]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportCSV_With_Incorrect_File_Extension_Throws_Exception(string input)
         {
-            DataFileExporter.ExportCSV(simpleEntities, input);
+            Assert.That(() => DataFileExporter.ExportCSV(simpleEntities, input), Throws.TypeOf<ArgumentException>());
         }
 
         [Test]
@@ -101,7 +102,7 @@ public void ExportCSV_Writes_Simple_Collection_To_File()
 
             Assert.That(
                 File.ReadAllText(DataFileExporter.DefaultCSVPath).Trim(),
-                Is.StringStarting("foo,bar").And.StringEnding(String.Format(@"""{0}"",""{1}""", foo, bar))
+                Does.StartWith("foo,bar").And.EndsWith(String.Format(@"""{0}"",""{1}""", foo, bar))
             );
         }
 
@@ -111,7 +112,7 @@ public void ExportCSV_Writes_Complex_Collection_To_File()
         {
             var complexEntities = new[] {
                 new ComplexEntityMock(
-                    "complexEntity", 
+                    "complexEntity",
                     new[] {
                         new SimpleEntityMock(foo, bar),
                         new SimpleEntityMock(foo, bar),
@@ -125,7 +126,7 @@ public void ExportCSV_Writes_Complex_Collection_To_File()
 
             Assert.That(
                 File.ReadAllText(DataFileExporter.DefaultCSVPath).Trim(),
-                Is.StringStarting("name,entities").And.StringEnding(String.Format(@"""complexEntity"",""{0}""", serializedSimpleEntities))
+                Does.StartWith("name,entities").And.EndsWith(String.Format(@"""complexEntity"",""{0}""", serializedSimpleEntities))
             );
         }
 
@@ -142,19 +143,19 @@ public void ExportTSV_Parameterless_Uses_DefaultFilePath()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportTSV_With_Empty_File_Paths_Throws_Exception(string input)
         {
-            DataFileExporter.ExportTSV(simpleEntities, input);
+            Assert.That(() => DataFileExporter.ExportTSV(simpleEntities, input), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase("something.nottsv")]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportTSV_With_Incorrect_File_Extension_Throws_Exception(string input)
         {
-            DataFileExporter.ExportTSV(simpleEntities, input);
+            Assert.That(() => DataFileExporter.ExportTSV(simpleEntities, input), Throws.TypeOf<ArgumentException>());
         }
 
         [Test]
@@ -165,7 +166,7 @@ public void ExportTSV_Creates_NonExistent_File()
             DataFileExporter.ExportTSV(simpleEntities, FileMocks.FileThatDoesNotExist(".tsv"));
             Assert.True(File.Exists(FileMocks.FileThatDoesNotExist(".tsv")));
         }
-        
+
         [Test]
         [Category("DataFileExporter")]
         public void ExportJSON_Parameterless_Uses_DefaultFilePath()
@@ -179,19 +180,19 @@ public void ExportJSON_Parameterless_Uses_DefaultFilePath()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportJSON_With_Empty_File_Paths_Throws_Exception(string input)
         {
-            DataFileExporter.ExportJSON(simpleEntities, input);
+            Assert.That(() => DataFileExporter.ExportJSON(simpleEntities, input), Throws.TypeOf<ArgumentException>());
         }
 
         [TestCase("something.notjson")]
-        [ExpectedException(typeof(ArgumentException))]
+        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportJSON_With_Incorrect_File_Extension_Throws_Exception(string input)
         {
-            DataFileExporter.ExportJSON(simpleEntities, input);
+            Assert.That(() => DataFileExporter.ExportJSON(simpleEntities, input), Throws.TypeOf<ArgumentException>());
         }
 
         [Test]
@@ -235,7 +236,7 @@ public void ExportJSON_Writes_Complex_Collection_To_File()
         {
             var complexEntities = new[] {
                 new ComplexEntityMock(
-                    "complexEntity", 
+                    "complexEntity",
                     new[] {
                         new SimpleEntityMock(foo, bar),
                         new SimpleEntityMock(foo, bar),
@@ -269,4 +270,4 @@ public void ExportJSON_Respects_DataContractAttribute()
             );
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Utilities.Tests/ExcelDataReaderHelperTests.cs b/Utilities.Tests/ExcelDataReaderHelperTests.cs
index f7e6e4e..7d5da60 100644
--- a/Utilities.Tests/ExcelDataReaderHelperTests.cs
+++ b/Utilities.Tests/ExcelDataReaderHelperTests.cs
@@ -9,6 +9,12 @@ namespace SODA.Utilities.Tests
     [TestFixture]
     public class ExcelDataReaderHelperTests
     {
+        [SetUp]
+        public void TestInitialize()
+        {
+            Environment.CurrentDirectory = TestContext.CurrentContext.TestDirectory;
+        }
+
         [Test]
         [Category("ExcelDataReaderHelper")]
         public void GetRowsFromDataSheets_With_Empty_Filename_Throws_ArgumentNullException()
diff --git a/Utilities.Tests/FileLoggingTests.cs b/Utilities.Tests/FileLoggingTests.cs
index 9826232..021f303 100644
--- a/Utilities.Tests/FileLoggingTests.cs
+++ b/Utilities.Tests/FileLoggingTests.cs
@@ -9,6 +9,12 @@ namespace SODA.Utilities.Tests
     [TestFixture]
     public class FileLoggingTests
     {
+        [SetUp]
+        public void TestInitialize()
+        {
+            Environment.CurrentDirectory = TestContext.CurrentContext.TestDirectory;
+        }
+
         [TearDown]
         public void TestCleanUp()
         {
@@ -32,20 +38,20 @@ public void Default_New_Uses_DefaultLogFile_And_DefaultMaxLogSize()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        [ExpectedException(typeof(ArgumentNullException))]
+        //[ExpectedException(typeof(ArgumentNullException))]
         [Category("SimpleFileLogger")]
         public void New_With_Empty_LogFilePath_Throws_ArgumentNullException(string input)
         {
-            new SimpleFileLogger(input);
+            Assert.That(() => new SimpleFileLogger(input), Throws.TypeOf<ArgumentNullException>());
         }
 
         [TestCase(-1)]
         [TestCase(0)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SimpleFileLogger")]
         public void New_With_NonPositive_MaxLogBytes_Throws_ArgumentOutOfRangeException(int input)
         {
-            new SimpleFileLogger(input);
+            Assert.That(() => new SimpleFileLogger(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]
@@ -66,7 +72,7 @@ public void New_ReThrows_Target_File_Exceptions()
         {
             //make sure the target file exists
             File.WriteAllText(FileMocks.FileThatDoesNotExist(), String.Empty);
-            
+
             //open the target file in exclusive mode
             using (var exclusive = File.Open(FileMocks.FileThatDoesNotExist(), FileMode.Open, FileAccess.Read, FileShare.None))
             {
@@ -93,7 +99,7 @@ public void New_Writes_Log_Header()
 
             Assert.That(
                 File.ReadAllText(FileMocks.FileThatDoesNotExist()),
-                Is.StringContaining("Log Start").IgnoreCase
+                Does.Contain("Log Start").IgnoreCase
             );
         }
 
@@ -115,7 +121,7 @@ public void New_Rolls_Log_After_MaximumLogSize()
 
             Assert.That(
                 File.ReadAllText(FileMocks.FileThatDoesNotExist()),
-                Is.StringContaining("Log Rollover").IgnoreCase
+                Does.Contain("Log Rollover").IgnoreCase
             );
 
             Assert.That(
@@ -152,7 +158,7 @@ public void Writes_Simple_Message_To_File()
 
             Assert.That(
                 File.ReadAllText(FileMocks.FileThatDoesNotExist()),
-                Is.StringContaining(message)
+                Does.Contain(message)
             );
         }
 
@@ -171,7 +177,7 @@ public void Writes_Format_Message_To_File()
 
             Assert.That(
                 File.ReadAllText(FileMocks.FileThatDoesNotExist()),
-                Is.StringContaining(param1).And.StringContaining(param2)
+                Does.Contain(param1).And.Contains(param2)
             );
         }
 
@@ -197,7 +203,7 @@ public void Writes_Exception_To_File()
 
             Assert.That(
                 File.ReadAllText(FileMocks.FileThatDoesNotExist()),
-                Is.StringContaining(ex.Message).And.StringContaining(ex.StackTrace)
+                Does.Contain(ex.Message).And.Contains(ex.StackTrace)
             );
         }
 
@@ -233,8 +239,8 @@ public void Writes_InnerException_To_File()
 
             Assert.That(
                 File.ReadAllText(FileMocks.FileThatDoesNotExist()),
-                Is.StringContaining(inner.Message).And.StringContaining(inner.StackTrace)
+                Does.Contain(inner.Message).And.Contains(inner.StackTrace)
             );
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Utilities.Tests/SeparatedValuesSerializerTests.cs b/Utilities.Tests/SeparatedValuesSerializerTests.cs
index 00710d9..f754b82 100644
--- a/Utilities.Tests/SeparatedValuesSerializerTests.cs
+++ b/Utilities.Tests/SeparatedValuesSerializerTests.cs
@@ -18,13 +18,13 @@ public class SeparatedValuesSerializerTests
         [SetUp]
         public void TestInitialize()
         {
-            simpleEntities = new[] { 
+            simpleEntities = new[] {
                 new SimpleEntityMock(foo, bar)
             };
 
             complexEntities = new[] {
                 new ComplexEntityMock(
-                    "complexEntity", 
+                    "complexEntity",
                     new[] {
                         new SimpleEntityMock(foo, bar),
                         new SimpleEntityMock(foo, bar),
@@ -49,11 +49,11 @@ public void DelimiterString_For_Tab_Is_Tab()
 
         [TestCase(SeparatedValuesDelimiter.Comma - 1)]
         [TestCase(SeparatedValuesDelimiter.Tab + 1)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SeparatedValuesSerializer")]
         public void SerializeToString_Throws_ArgumentOutOfRangeException_For_Invalid_Delimiter(SeparatedValuesDelimiter delimiter)
         {
-            string result = SeparatedValuesSerializer.SerializeToString(simpleEntities, delimiter);
+            Assert.That(() => SeparatedValuesSerializer.SerializeToString(simpleEntities, delimiter), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [TestCase(SeparatedValuesDelimiter.Comma)]
@@ -66,7 +66,7 @@ public void SerializeToString_Writes_Header_Row_By_Default(SeparatedValuesDelimi
 
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(entities, delimiter),
-                Is.StringStarting(String.Join(delimiterString, "id", "name", "number"))
+                Does.StartWith(String.Join(delimiterString, "id", "name", "number"))
             );
         }
 
@@ -80,7 +80,7 @@ public void SerializeToString_Can_Skip_Writing_Header_Row(SeparatedValuesDelimit
 
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(entities, delimiter, false),
-                Is.Not.StringContaining(String.Join(delimiterString, "id", "name", "number"))
+                Does.Not.Contain(String.Join(delimiterString, "id", "name", "number"))
             );
         }
 
@@ -90,7 +90,7 @@ public void SerializeToString_Can_Skip_Writing_Header_Row(SeparatedValuesDelimit
         public void SerializeToString_Writes_Empty_Collection_To_String(SeparatedValuesDelimiter delimiter)
         {
             var emptyEntities = Enumerable.Empty<SimpleEntityMock>();
-            
+
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(emptyEntities, delimiter),
                 Is.EqualTo(String.Format("foo{0}bar", SeparatedValuesSerializer.DelimiterString(delimiter)))
@@ -106,7 +106,7 @@ public void SerializeToString_Writes_Simple_Collection_To_String(SeparatedValues
 
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(simpleEntities, delimiter),
-                Is.StringEnding(String.Format(@"""{0}""{1}""{2}""", foo, delimiterString, bar))
+                Does.EndWith(String.Format(@"""{0}""{1}""{2}""", foo, delimiterString, bar))
             );
         }
 
@@ -120,7 +120,7 @@ public void SerializeToString_Writes_Complex_Collection_To_String(SeparatedValue
 
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(complexEntities, delimiter),
-                Is.StringEnding(String.Format(@"""complexEntity""{0}""{1}""", delimiterString, serializedSimpleEntities))
+                Does.EndWith(String.Format(@"""complexEntity""{0}""{1}""", delimiterString, serializedSimpleEntities))
             );
         }
 
@@ -135,15 +135,15 @@ public void SerializeToString_Respects_DataContractAttribute(SeparatedValuesDeli
             string csvData = SeparatedValuesSerializer.SerializeToString(dataContractEntities, delimiter);
 
             Assert.That(
-                csvData, 
-                Is.StringEnding(String.Format("\"{0}\"{1}\"{2}\"", foo, delimiterString, bar))
+                csvData,
+                Does.EndWith(String.Format("\"{0}\"{1}\"{2}\"", foo, delimiterString, bar))
             );
 
             Assert.That(
-                csvData, 
-                Is.Not.StringContaining("bup")
+                csvData,
+                Does.Not.Contain("bup")
                   .And
-                  .Not.StringContaining(bup)
+                  .Not.Contains(bup)
             );
         }
 
@@ -155,15 +155,15 @@ public void SerializeToString_Serializes_LocationColumn_In_Socrata_Publish_Forma
             string latitude = "lat";
             string longitude = "lng";
 
-            var entities = new[] { 
-                new { 
+            var entities = new[] {
+                new {
                     location =  new LocationColumn() { Latitude = latitude, Longitude = longitude }
-                } 
+                }
             };
 
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(entities, delimiter),
-                Is.StringEnding(String.Format("\"({0},{1})\"", latitude, longitude))
+                Does.EndWith(String.Format("\"({0},{1})\"", latitude, longitude))
             );
         }
 
@@ -175,20 +175,20 @@ public void SerializeToString_Writes_Empty_String_For_LocationColumn_With_Missin
             string latitude = "lat";
             string longitude = "lng";
 
-            var entities = new[] { 
-                new { 
+            var entities = new[] {
+                new {
                     location =  new LocationColumn() { Latitude = null, Longitude = longitude }
                 },
-                new { 
+                new {
                     location =  new LocationColumn() { Latitude = latitude, Longitude = null }
                 }
             };
 
             Assert.That(
                 SeparatedValuesSerializer.SerializeToString(entities, delimiter),
-                Is.Not.StringContaining(latitude)
-                .And.Not.StringContaining(longitude)
+                Does.Not.Contain(latitude)
+                .And.Not.Contain(longitude)
             );
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Utilities.Tests/Utilities.Tests.csproj b/Utilities.Tests/Utilities.Tests.csproj
index 1db3721..4402351 100644
--- a/Utilities.Tests/Utilities.Tests.csproj
+++ b/Utilities.Tests/Utilities.Tests.csproj
@@ -1,5 +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\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -22,6 +24,8 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,9 +61,8 @@
     <Reference Include="Microsoft.Exchange.WebServices.Auth, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.Auth.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -132,6 +135,13 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <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\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- 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/Utilities.Tests/packages.config b/Utilities.Tests/packages.config
index 1995e28..3e037fe 100644
--- a/Utilities.Tests/packages.config
+++ b/Utilities.Tests/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="ExcelDataReader" version="2.1.2.3" targetFramework="net45" />
   <package id="Microsoft.Exchange.WebServices" version="2.2" targetFramework="net45" />
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit" version="3.12.0" targetFramework="net45" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From e02b3854d57c7aa03786501d8b08bbff2c085b23 Mon Sep 17 00:00:00 2001
From: Kevin Hobson <kevin.hobson@smgov.net>
Date: Sat, 20 Jul 2019 11:18:55 -0700
Subject: [PATCH 02/11] update other nuget packages

---
 SODA/SODA.csproj                       |  5 ++---
 SODA/SODA.nuspec                       |  2 +-
 SODA/packages.config                   |  2 +-
 Utilities.Tests/Utilities.Tests.csproj | 14 ++++++++------
 Utilities.Tests/packages.config        |  5 +++--
 Utilities/ExcelDataReaderHelper.cs     | 12 ++++++++----
 Utilities/SODA.Utilities.nuspec        |  3 ++-
 Utilities/Utilities.csproj             | 14 ++++++++------
 Utilities/packages.config              |  5 +++--
 9 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/SODA/SODA.csproj b/SODA/SODA.csproj
index 86685b6..fd0dfcb 100644
--- a/SODA/SODA.csproj
+++ b/SODA/SODA.csproj
@@ -38,9 +38,8 @@
     <DocumentationFile>bin\Release\SODA.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/SODA/SODA.nuspec b/SODA/SODA.nuspec
index 6f22904..d76ea8e 100644
--- a/SODA/SODA.nuspec
+++ b/SODA/SODA.nuspec
@@ -15,7 +15,7 @@
     <copyright>Copyright 2017 City of Santa Monica, CA</copyright>
     <tags>API OpenData Socrata SODA</tags>
     <dependencies>
-      <dependency id="Newtonsoft.Json" version="7.0.1" />
+      <dependency id="Newtonsoft.Json" version="12.0.2" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/SODA/packages.config b/SODA/packages.config
index 505e588..93b0be8 100644
--- a/SODA/packages.config
+++ b/SODA/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Utilities.Tests/Utilities.Tests.csproj b/Utilities.Tests/Utilities.Tests.csproj
index 4402351..fd7ea90 100644
--- a/Utilities.Tests/Utilities.Tests.csproj
+++ b/Utilities.Tests/Utilities.Tests.csproj
@@ -47,13 +47,14 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Excel, Version=2.1.2.3, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDataReader.2.1.2.3\lib\net45\Excel.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Exchange.WebServices, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.dll</HintPath>
@@ -69,6 +70,7 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
   </ItemGroup>
diff --git a/Utilities.Tests/packages.config b/Utilities.Tests/packages.config
index 3e037fe..cccbd79 100644
--- a/Utilities.Tests/packages.config
+++ b/Utilities.Tests/packages.config
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ExcelDataReader" version="2.1.2.3" targetFramework="net45" />
+  <package id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
+  <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
   <package id="Microsoft.Exchange.WebServices" version="2.2" targetFramework="net45" />
   <package id="NUnit" version="3.12.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Utilities/ExcelDataReaderHelper.cs b/Utilities/ExcelDataReaderHelper.cs
index 5bb42a1..e53e6e2 100644
--- a/Utilities/ExcelDataReaderHelper.cs
+++ b/Utilities/ExcelDataReaderHelper.cs
@@ -1,4 +1,4 @@
-using Excel;
+using ExcelDataReader;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -39,9 +39,13 @@ public static IEnumerable<DataRow> GetRowsFromDataSheets(string excelFileName, b
 
             using (IExcelDataReader reader = MakeExcelReader(excelFileName))
             {
-                reader.IsFirstRowAsColumnNames = isFirstRowColumnNames;
-
-                foreach (DataTable table in reader.AsDataSet().Tables)
+                foreach (DataTable table in reader.AsDataSet(new ExcelDataSetConfiguration
+                {
+                    ConfigureDataTable = (tableReader) => new ExcelDataTableConfiguration
+                    {
+                        UseHeaderRow = isFirstRowColumnNames,
+                    }
+                }).Tables)
                 {
                     allDataRows.AddRange(table.Rows.OfType<DataRow>());
                 }
diff --git a/Utilities/SODA.Utilities.nuspec b/Utilities/SODA.Utilities.nuspec
index 79edca3..792b84c 100644
--- a/Utilities/SODA.Utilities.nuspec
+++ b/Utilities/SODA.Utilities.nuspec
@@ -16,8 +16,9 @@
     <tags>EWS Excel SODA</tags>
     <dependencies>
       <dependency id="CSM.SodaDotNet" version="$version$" />
-      <dependency id="ExcelDataReader" version="2.1.2.3" />
       <dependency id="Microsoft.Exchange.WebServices" version="2.2.0" />
+      <dependency id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
+      <dependency id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj
index 16ab195..2397e9c 100644
--- a/Utilities/Utilities.csproj
+++ b/Utilities/Utilities.csproj
@@ -40,13 +40,14 @@
     <DocumentationFile>bin\Release\SODA.Utilities.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Excel, Version=2.1.2.3, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDataReader.2.1.2.3\lib\net45\Excel.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
+      <HintPath>..\packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Exchange.WebServices, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.dll</HintPath>
@@ -56,6 +57,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/Utilities/packages.config b/Utilities/packages.config
index 888fbf8..0faf71e 100644
--- a/Utilities/packages.config
+++ b/Utilities/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ExcelDataReader" version="2.1.2.3" targetFramework="net45" />
+  <package id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
+  <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
   <package id="Microsoft.Exchange.WebServices" version="2.2" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="SharpZipLib" version="1.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 7c3854a61d4d1c66bbe0894b60c786e536f714d3 Mon Sep 17 00:00:00 2001
From: Kevin Hobson <kevin.hobson@smgov.net>
Date: Sat, 20 Jul 2019 11:52:53 -0700
Subject: [PATCH 03/11] convert from webrequest to httpclient

---
 SODA.Tests/SODA.Tests.csproj           |   1 +
 SODA.Tests/SodaRequestTests.cs         | 105 +++++++++++++------------
 SODA.Tests/packages.config             |   1 +
 SODA/SODA.csproj                       |   1 +
 SODA/SodaRequest.cs                    |  72 ++++++++---------
 SODA/packages.config                   |   1 +
 Utilities.Tests/Utilities.Tests.csproj |   1 +
 Utilities.Tests/packages.config        |   1 +
 Utilities/Utilities.csproj             |   1 +
 Utilities/packages.config              |   1 +
 10 files changed, 100 insertions(+), 85 deletions(-)

diff --git a/SODA.Tests/SODA.Tests.csproj b/SODA.Tests/SODA.Tests.csproj
index 2854fbf..7bf2835 100644
--- a/SODA.Tests/SODA.Tests.csproj
+++ b/SODA.Tests/SODA.Tests.csproj
@@ -55,6 +55,7 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
diff --git a/SODA.Tests/SodaRequestTests.cs b/SODA.Tests/SodaRequestTests.cs
index f22852a..47e30e7 100644
--- a/SODA.Tests/SodaRequestTests.cs
+++ b/SODA.Tests/SodaRequestTests.cs
@@ -2,6 +2,8 @@
 using SODA.Tests.Mocks;
 using System;
 using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 
 namespace SODA.Tests
@@ -33,8 +35,11 @@ public void New_Disables_Unsupported_Protocols()
         [Category("SodaRequest")]
         public void New_Enables_Minimum_Protocol()
         {
+#if NETCOREAPP
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls;
+#else
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls;
-
+#endif
             var request = new SodaRequest(exampleUri, "GET", null, null, null);
 
             Assert.True((ServicePointManager.SecurityProtocol & SecurityProtocolType.Tls11) == SecurityProtocolType.Tls11);
@@ -58,7 +63,7 @@ public void New_Returns_Request_With_Specified_Uri()
         {
             var request = new SodaRequest(exampleUri, "GET", null, null, null);
 
-            Assert.AreEqual(exampleUri, request.webRequest.RequestUri);
+            Assert.AreEqual(exampleUri, request.RequestMessage.RequestUri);
         }
 
         [TestCase("GET")]
@@ -70,17 +75,17 @@ public void New_Returns_Request_With_Specified_Method(string input)
         {
             var request = new SodaRequest(exampleUri, input, null, null, null);
 
-            StringAssert.AreEqualIgnoringCase(input, request.webRequest.Method);
+            StringAssert.AreEqualIgnoringCase(input, request.RequestMessage.Method.Method);
         }
 
-        [Test]
-        [Category("SodaRequest")]
-        public void New_Returns_Request_Using_HTTP_1_1()
-        {
-            var request = new SodaRequest(exampleUri, "GET", null, null, null);
+        //[Test]
+        //[Category("SodaRequest")]
+        //public void New_Returns_Request_Using_HTTP_1_1()
+        //{
+        //    var request = new SodaRequest(exampleUri, "GET", null, null, null);
 
-            Assert.AreEqual(new Version("1.1"), request.webRequest.ProtocolVersion);
-        }
+        //    Assert.AreEqual(new Version("1.1"), request.webRequest.ProtocolVersion);
+        //}
 
         [TestCase("appToken1234")]
         [Category("SodaRequest")]
@@ -88,7 +93,7 @@ public void New_Returns_Request_With_Specified_X_App_Token_Header(string input)
         {
             var request = new SodaRequest(exampleUri, "GET", input, null, null);
 
-            Assert.AreEqual(input, request.webRequest.Headers["X-App-Token"]);
+            Assert.IsTrue(System.Linq.Enumerable.Contains(request.Client.DefaultRequestHeaders.GetValues("X-App-Token"), input));
         }
 
         [Test]
@@ -97,7 +102,7 @@ public void New_Returns_Request_With_No_Authorization_Header_When_No_Credentials
         {
             var request = new SodaRequest(exampleUri, "GET", null, null, null);
 
-            Assert.IsNull(request.webRequest.Headers["Authorization"]);
+            Assert.IsFalse(request.Client.DefaultRequestHeaders.Contains("Authorization"));
         }
 
         [Test]
@@ -106,11 +111,11 @@ public void New_Returns_Request_With_Basic_Authorization_Header_From_Specified_C
         {
             string username = "username";
             string password = "password";
-            string expected = String.Format("Basic {0}", Convert.ToBase64String(Encoding.UTF8.GetBytes(String.Format("{0}:{1}", username, password))));
+            var expected = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes(String.Format("{0}:{1}", username, password))));
 
             var request = new SodaRequest(exampleUri, "GET", null, username, password);
 
-            Assert.AreEqual(expected, request.webRequest.Headers["Authorization"]);
+            Assert.AreEqual(expected, request.Client.DefaultRequestHeaders.Authorization);
         }
 
         [TestCase("GET")]
@@ -122,18 +127,18 @@ public void New_With_JSON_DataFormat_Sets_Accept_Header(string input)
         {
             var request = new SodaRequest(exampleUri, input, null, null, null, SodaDataFormat.JSON);
 
-            Assert.AreEqual("application/json", request.webRequest.Accept);
+            Assert.IsTrue(request.Client.DefaultRequestHeaders.Accept.Contains(new MediaTypeWithQualityHeaderValue("application/json")));
         }
 
         [TestCase("POST")]
         [TestCase("PUT")]
-        [TestCase("DELETE")]
         [Category("SodaRequest")]
+        [TestCase("DELETE")]
         public void New_Non_GET_With_JSON_DataFormat_Sets_ContentType_Header(string input)
         {
-            var request = new SodaRequest(exampleUri, input, null, null, null, SodaDataFormat.JSON);
+            var request = new SodaRequest(exampleUri, input, null, null, null, SodaDataFormat.JSON, "{}");
 
-            Assert.AreEqual("application/json", request.webRequest.ContentType);
+            Assert.AreEqual("application/json", request.RequestMessage.Content.Headers.ContentType.MediaType);
         }
 
         [Test]
@@ -142,7 +147,7 @@ public void New_GET_With_CSV_DataFormat_Sets_Accept_Header()
         {
             var request = new SodaRequest(exampleUri, "GET", null, null, null, SodaDataFormat.CSV);
 
-            Assert.AreEqual("text/csv", request.webRequest.Accept);
+            Assert.IsTrue(request.Client.DefaultRequestHeaders.Accept.Contains(new MediaTypeWithQualityHeaderValue("text/csv")));
         }
 
         [TestCase("POST")]
@@ -150,9 +155,9 @@ public void New_GET_With_CSV_DataFormat_Sets_Accept_Header()
         [Category("SodaRequest")]
         public void New_POST_PUT_With_CSV_DataFormat_Sets_ContentType_Header(string input)
         {
-            var request = new SodaRequest(exampleUri, input, null, null, null, SodaDataFormat.CSV);
+            var request = new SodaRequest(exampleUri, input, null, null, null, SodaDataFormat.CSV, "1,1");
 
-            Assert.AreEqual("text/csv", request.webRequest.ContentType);
+            Assert.AreEqual("text/csv", request.RequestMessage.Content.Headers.ContentType.MediaType);
         }
 
         [Test]
@@ -161,18 +166,18 @@ public void New_GET_With_XML_DataFormat_Sets_Accept_Header()
         {
             var request = new SodaRequest(exampleUri, "GET", null, null, null, SodaDataFormat.XML);
 
-            Assert.AreEqual("application/rdf+xml", request.webRequest.Accept);
+            Assert.IsTrue(request.Client.DefaultRequestHeaders.Accept.Contains(new MediaTypeWithQualityHeaderValue("application/rdf+xml")));
         }
 
         [Test]
         [Category("SodaRequest")]
-        public void New_Returns_Request_With_Unset_ContentLength_For_Empty_Payload()
+        public void New_Returns_Request_With_Unset_Content_For_Empty_Payload()
         {
             var request = new SodaRequest(exampleUri, "POST", null, null, null);
 
             //The default is -1, which indicates the property has not been set and that there is no request data to send.
             //http://msdn.microsoft.com/en-us/library/system.net.httpwebrequest.contentlength(v=vs.110).aspx
-            Assert.AreEqual(-1, request.webRequest.ContentLength);
+            Assert.IsNull(request.RequestMessage.Content);
         }
 
         [Test]
@@ -184,18 +189,18 @@ public void New_Sets_ContentLength_Header_To_Payload_Bytes_Length()
 
             var request = new SodaRequest(exampleUri, "POST", null, null, null, SodaDataFormat.JSON, payload);
 
-            Assert.AreEqual(payloadBytes.Length, request.webRequest.ContentLength);
+            Assert.AreEqual(payloadBytes.Length, request.RequestMessage.Content.Headers.ContentLength);
         }
 
         [Test]
         [Category("SodaRequest")]
         public void New_Sets_Timeout_To_HttpWebRequest_Timeout_If_Not_Given()
         {
-            var newHttpRequest = WebRequest.Create(exampleUri) as HttpWebRequest;
+            var client = new HttpClient();
 
             var request = new SodaRequest(exampleUri, "GET", null, null, null, SodaDataFormat.JSON, null, null);
 
-            Assert.AreEqual(newHttpRequest.Timeout, request.webRequest.Timeout);
+            Assert.AreEqual(client.Timeout, request.Client.Timeout);
         }
 
         [Test]
@@ -205,8 +210,9 @@ public void New_Sets_Timeout_To_Given_Timeout()
             int timeout = 100;
 
             var request = new SodaRequest(exampleUri, "GET", null, null, null, SodaDataFormat.JSON, null, timeout);
+            var timeoutspan = new TimeSpan(0, 0, 0, 0, timeout);
 
-            Assert.AreEqual(timeout, request.webRequest.Timeout);
+            Assert.AreEqual(timeoutspan, request.Client.Timeout);
         }
 
         [Test]
@@ -238,26 +244,27 @@ public void ParseResponse_Can_GET_Example()
             StringAssert.Contains("</html>", result);
         }
 
-        [TestCase("POST")]
-        [TestCase("PUT")]
-        [TestCase("DELETE")]
-        [Category("SodaRequest")]
-        public void ParseResponse_Non_GET_Sends_Request_To_Example_Using_Method(string input)
-        {
-            var request = new SodaRequest(exampleUri, input, null, null, null);
-            string result;
-
-            try
-            {
-                result = request.ParseResponse<string>();
-            }
-            catch (WebException webException)
-            {
-                var webResponse = webException.Response as HttpWebResponse;
-
-                Assert.AreEqual(exampleUri, webResponse.ResponseUri);
-                StringAssert.AreEqualIgnoringCase(input, webResponse.Method);
-            }
-        }
+        //[TestCase("POST")]
+        //[TestCase("PUT")]
+        //[TestCase("DELETE")]
+        //[Category("SodaRequest")]
+        //public void ParseResponse_Non_GET_Sends_Request_To_Example_Using_Method(string method)
+        //{
+        //    var request = new SodaRequest(exampleUri, method, null, null, null);
+        //    string result;
+
+        //    try
+        //    {
+        //        result = request.ParseResponse<string>();
+        //    }
+        //    catch (WebException webException)
+        //    {
+        //        var webResponse = webException.Response as HttpWebResponse;
+
+        //        Assert.AreEqual(exampleUri, webResponse.ResponseUri);
+        //        StringAssert.AreEqualIgnoringCase(method, webResponse.Method);
+        //    }
+        //}
+
     }
 }
\ No newline at end of file
diff --git a/SODA.Tests/packages.config b/SODA.Tests/packages.config
index f60f449..1ae39eb 100644
--- a/SODA.Tests/packages.config
+++ b/SODA.Tests/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="NUnit" version="3.12.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/SODA/SODA.csproj b/SODA/SODA.csproj
index fd0dfcb..16c517c 100644
--- a/SODA/SODA.csproj
+++ b/SODA/SODA.csproj
@@ -43,6 +43,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
diff --git a/SODA/SodaRequest.cs b/SODA/SodaRequest.cs
index 5e962e5..3f3e6f0 100644
--- a/SODA/SodaRequest.cs
+++ b/SODA/SodaRequest.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
@@ -12,10 +14,15 @@ namespace SODA
     /// </summary>
     internal class SodaRequest
     {
+        /// <summary>
+        /// The underlying HttpClient handled by this SodaRequest
+        /// </summary>
+        internal HttpClient Client { get; private set; }
+
         /// <summary>
         /// The underlying HttpWebRequest handled by this SodaRequest
         /// </summary>
-        internal HttpWebRequest webRequest { get; private set; }
+        internal HttpRequestMessage RequestMessage { get; private set; }
 
         /// <summary>
         /// The Socrata supported data-interchange formats that this SodaRequest uses
@@ -38,63 +45,52 @@ internal SodaRequest(Uri uri, string method, string appToken, string username, s
         {
             this.dataFormat = dataFormat;
 
-            var request = WebRequest.Create(uri) as HttpWebRequest;
-            request.Method = method.ToUpper();
-            request.ProtocolVersion = new System.Version("1.1");
-            request.PreAuthenticate = true;
-            request.Timeout = timeout.HasValue ? timeout.Value : request.Timeout;
+            this.Client = new HttpClient();
+            this.Client.Timeout = timeout.HasValue ? new TimeSpan(0, 0, 0, 0, timeout.Value) : Client.Timeout;
+            this.RequestMessage = new HttpRequestMessage { RequestUri = uri, Method = new HttpMethod(method) };
 
             if (!String.IsNullOrEmpty(appToken))
             {
                 //http://dev.socrata.com/docs/app-tokens.html
-                request.Headers.Add("X-App-Token", appToken);
+                this.Client.DefaultRequestHeaders.Add("X-App-Token", appToken);
             }
-
             if (!String.IsNullOrEmpty(username) && !String.IsNullOrEmpty(password))
             {
                 //Authentication using HTTP Basic Authentication
                 //http://dev.socrata.com/docs/authentication.html
                 string authKVP = String.Format("{0}:{1}", username, password);
                 byte[] authBytes = Encoding.UTF8.GetBytes(authKVP);
-                request.Headers.Add("Authorization", String.Format("Basic {0}", Convert.ToBase64String(authBytes)));
+                this.Client.DefaultRequestHeaders.Add("Authorization", String.Format("Basic {0}", Convert.ToBase64String(authBytes)));
             }
-
             //http://dev.socrata.com/docs/formats/index.html
             switch (dataFormat)
             {
                 case SodaDataFormat.JSON:
-                    request.Accept = "application/json";
-                    if (!request.Method.Equals("GET"))
-                        request.ContentType = "application/json";
+                    Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
                     break;
                 case SodaDataFormat.CSV:
-                    switch (request.Method)
-                    {
-                        case "GET":
-                            request.Accept = "text/csv";
-                            break;
-                        case "POST":
-                        case "PUT":
-                            request.ContentType = "text/csv";
-                            break;
-                    }
+                    this.Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/csv"));
                     break;
                 case SodaDataFormat.XML:
-                    request.Accept = "application/rdf+xml";
+                    this.Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/rdf+xml"));
                     break;
             }
 
             if (!String.IsNullOrEmpty(payload))
             {
-                byte[] bodyBytes = Encoding.UTF8.GetBytes(payload);
-
-                using (var stream = request.GetRequestStream())
+                switch (dataFormat)
                 {
-                    stream.Write(bodyBytes, 0, bodyBytes.Length);
+                    case SodaDataFormat.JSON:
+                        this.RequestMessage.Content = new StringContent(payload, Encoding.UTF8, "application/json");
+                        break;
+                    case SodaDataFormat.CSV:
+                        this.RequestMessage.Content = new StringContent(payload, Encoding.UTF8, "text/csv");
+                        break;
+                    case SodaDataFormat.XML:
+                        this.RequestMessage.Content = new StringContent(payload, Encoding.UTF8, "application/rdf+xml");
+                        break;
                 }
             }
-
-            this.webRequest = request;
         }
 
         /// <summary>
@@ -108,9 +104,9 @@ internal TResult ParseResponse<TResult>() where TResult : class
             Exception inner = null;
             bool exception = false;
 
-            using (var responseStream = webRequest.GetResponse().GetResponseStream())
+            var response = Client.SendAsync(RequestMessage).Result;
+            if (response.IsSuccessStatusCode)
             {
-                string response = new StreamReader(responseStream).ReadToEnd();
 
                 //attempt to deserialize based on the requested format
                 switch (dataFormat)
@@ -118,7 +114,7 @@ internal TResult ParseResponse<TResult>() where TResult : class
                     case SodaDataFormat.JSON:
                         try
                         {
-                            result = Newtonsoft.Json.JsonConvert.DeserializeObject<TResult>(response);
+                            result = Newtonsoft.Json.JsonConvert.DeserializeObject<TResult>(response.Content.ReadAsStringAsync().Result);
                         }
                         catch (Newtonsoft.Json.JsonException jex)
                         {
@@ -128,21 +124,21 @@ internal TResult ParseResponse<TResult>() where TResult : class
                         break;
                     case SodaDataFormat.CSV:
                         //TODO: should we consider this an error (i.e. InvalidOperationException) if this cast returns null?
-                        result = response as TResult;
+                        result = response.Content.ReadAsStringAsync().Result as TResult;
                         break;
                     case SodaDataFormat.XML:
                         //see if the caller just wanted the XML string
                         var ttype = typeof(TResult);
                         if (ttype == typeof(string))
                         {
-                            result = response as TResult;
+                            result = response.Content.ReadAsStringAsync().Result as TResult;
                         }
                         else
                         {
                             //try to deserialize the XML response
                             try
                             {
-                                var reader = XmlReader.Create(new StringReader(response));
+                                var reader = XmlReader.Create(new StringReader(response.Content.ReadAsStringAsync().Result));
                                 var serializer = new XmlSerializer(ttype);
                                 result = serializer.Deserialize(reader) as TResult;
                             }
@@ -155,6 +151,10 @@ internal TResult ParseResponse<TResult>() where TResult : class
                         break;
                 }
             }
+            else
+            {
+                throw new WebException(response.ReasonPhrase);
+            }
 
             if (exception)
             {
diff --git a/SODA/packages.config b/SODA/packages.config
index 93b0be8..9e775b7 100644
--- a/SODA/packages.config
+++ b/SODA/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Utilities.Tests/Utilities.Tests.csproj b/Utilities.Tests/Utilities.Tests.csproj
index fd7ea90..9ea07fd 100644
--- a/Utilities.Tests/Utilities.Tests.csproj
+++ b/Utilities.Tests/Utilities.Tests.csproj
@@ -71,6 +71,7 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
   </ItemGroup>
diff --git a/Utilities.Tests/packages.config b/Utilities.Tests/packages.config
index cccbd79..3bb3021 100644
--- a/Utilities.Tests/packages.config
+++ b/Utilities.Tests/packages.config
@@ -6,4 +6,5 @@
   <package id="NUnit" version="3.12.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
   <package id="SharpZipLib" version="1.1.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj
index 2397e9c..b441ff5 100644
--- a/Utilities/Utilities.csproj
+++ b/Utilities/Utilities.csproj
@@ -58,6 +58,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/Utilities/packages.config b/Utilities/packages.config
index 0faf71e..d919235 100644
--- a/Utilities/packages.config
+++ b/Utilities/packages.config
@@ -4,4 +4,5 @@
   <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
   <package id="Microsoft.Exchange.WebServices" version="2.2" targetFramework="net45" />
   <package id="SharpZipLib" version="1.1.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 675df78aa327be13de348be81cdadc83a7cb33ba Mon Sep 17 00:00:00 2001
From: kevinsmgov <kevin.hobson@smgov.net>
Date: Mon, 22 Jul 2019 06:34:01 -0700
Subject: [PATCH 04/11] convert

---
 .../Net45.Tests.csproj                        |  79 ++---------
 Net45.Tests/Properties/AssemblyInfo.cs        |  20 +++
 {SODA.Tests => Net45.Tests}/packages.config   |   0
 NetCore22.Tests/NetCore22.Tests.csproj        |  23 +++
 SODA.Tests/Properties/AssemblyInfo.cs         |  36 -----
 SODA.Tests/SODA.Tests.projitems               |  28 ++++
 SODA.Tests/SODA.Tests.shproj                  |  13 ++
 SODA.sln                                      |  78 +++++++----
 SODA/Properties/AssemblyInfo.cs               |   6 -
 SODA/Resource.cs                              |   4 +-
 SODA/SODA.csproj                              | 114 ++++-----------
 SODA/SODA.nuspec                              |  21 ---
 .../Properties/AssemblyInfo.cs                |  20 +++
 .../Utilities.Net45.Tests.csproj              |  97 ++-----------
 .../packages.config                           |   3 -
 .../Utilities.NetCore22.Tests.csproj          |  23 +++
 Utilities.Tests/ExcelDataReaderHelperTests.cs |   3 +
 Utilities.Tests/Properties/AssemblyInfo.cs    |  36 -----
 Utilities.Tests/Utilities.Tests.projitems     |  32 +++++
 Utilities.Tests/Utilities.Tests.shproj        |  13 ++
 Utilities/DataFileExporter.cs                 |   4 +
 Utilities/EwsClient.cs                        |  19 ++-
 Utilities/Properties/AssemblyInfo.cs          |   5 -
 Utilities/README.md                           |  98 -------------
 Utilities/SODA.Utilities.nuspec               |  24 ----
 Utilities/Utilities.csproj                    | 131 +++++-------------
 Utilities/packages.config                     |   8 --
 27 files changed, 329 insertions(+), 609 deletions(-)
 rename SODA.Tests/SODA.Tests.csproj => Net45.Tests/Net45.Tests.csproj (52%)
 create mode 100644 Net45.Tests/Properties/AssemblyInfo.cs
 rename {SODA.Tests => Net45.Tests}/packages.config (100%)
 create mode 100644 NetCore22.Tests/NetCore22.Tests.csproj
 delete mode 100644 SODA.Tests/Properties/AssemblyInfo.cs
 create mode 100644 SODA.Tests/SODA.Tests.projitems
 create mode 100644 SODA.Tests/SODA.Tests.shproj
 delete mode 100644 SODA/Properties/AssemblyInfo.cs
 delete mode 100644 SODA/SODA.nuspec
 create mode 100644 Utilities.Net45.Tests/Properties/AssemblyInfo.cs
 rename Utilities.Tests/Utilities.Tests.csproj => Utilities.Net45.Tests/Utilities.Net45.Tests.csproj (50%)
 rename {Utilities.Tests => Utilities.Net45.Tests}/packages.config (61%)
 create mode 100644 Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj
 delete mode 100644 Utilities.Tests/Properties/AssemblyInfo.cs
 create mode 100644 Utilities.Tests/Utilities.Tests.projitems
 create mode 100644 Utilities.Tests/Utilities.Tests.shproj
 delete mode 100644 Utilities/Properties/AssemblyInfo.cs
 delete mode 100644 Utilities/README.md
 delete mode 100644 Utilities/SODA.Utilities.nuspec
 delete mode 100644 Utilities/packages.config

diff --git a/SODA.Tests/SODA.Tests.csproj b/Net45.Tests/Net45.Tests.csproj
similarity index 52%
rename from SODA.Tests/SODA.Tests.csproj
rename to Net45.Tests/Net45.Tests.csproj
index 7bf2835..6dc3f48 100644
--- a/SODA.Tests/SODA.Tests.csproj
+++ b/Net45.Tests/Net45.Tests.csproj
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6872AC23-29E5-4EDB-A826-A3FC35AAFDA0}</ProjectGuid>
+    <ProjectGuid>{309FA03E-E032-4547-A83C-389EC450FD1A}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SODA.Tests</RootNamespace>
-    <AssemblyName>SODA.Tests</AssemblyName>
+    <RootNamespace>Net45.Tests</RootNamespace>
+    <AssemblyName>Net45.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -35,7 +30,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -44,76 +38,28 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
   </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
   <ItemGroup>
-    <Compile Include="HumanAddressTests.cs" />
-    <Compile Include="JsonSerializationExtensionTests.cs" />
-    <Compile Include="LocationColumnTests.cs" />
-    <Compile Include="Mocks\StringMocks.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="PhoneColumnTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DateTimeConverterTests.cs" />
-    <Compile Include="FourByFourTests.cs" />
-    <Compile Include="ResourceMetadataTests.cs" />
-    <Compile Include="ResourceTests.cs" />
-    <Compile Include="SodaClientTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SodaRequestTests.cs" />
-    <Compile Include="SodaUriTests.cs" />
-    <Compile Include="SoqlQueryTests.cs" />
-    <Compile Include="WebExceptionExtensionTests.cs" />
-    <Compile Include="WebsiteUrlColumnTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SODA\SODA.csproj">
-      <Project>{837ebdd7-eb58-44f8-834b-f2903a05a16e}</Project>
+      <Project>{8c71d7e2-8ef0-4d7e-9eeb-06b1458d235e}</Project>
       <Name>SODA</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
+  <Import Project="..\SODA.Tests\SODA.Tests.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -123,11 +69,4 @@
     <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
     <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
-  <!-- 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/Net45.Tests/Properties/AssemblyInfo.cs b/Net45.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..730a27f
--- /dev/null
+++ b/Net45.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Net45.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Net45.Tests")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("309fa03e-e032-4547-a83c-389ec450fd1a")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SODA.Tests/packages.config b/Net45.Tests/packages.config
similarity index 100%
rename from SODA.Tests/packages.config
rename to Net45.Tests/packages.config
diff --git a/NetCore22.Tests/NetCore22.Tests.csproj b/NetCore22.Tests/NetCore22.Tests.csproj
new file mode 100644
index 0000000..68e00f8
--- /dev/null
+++ b/NetCore22.Tests/NetCore22.Tests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>NetCore22.Tests</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\SODA.Tests\SODA.Tests.projitems" Label="Shared" />
+
+</Project>
\ No newline at end of file
diff --git a/SODA.Tests/Properties/AssemblyInfo.cs b/SODA.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7bd4013..0000000
--- a/SODA.Tests/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("SODA.Tests")]
-[assembly: AssemblyDescription("Test project for the SODA library.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("City of Santa Monica")]
-[assembly: AssemblyProduct("SODA.Tests")]
-[assembly: AssemblyCopyright("Copyright © City of Santa Monica 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("7f9cf47c-8168-48eb-82b3-a82249c0346e")]
-
-// 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/SODA.Tests/SODA.Tests.projitems b/SODA.Tests/SODA.Tests.projitems
new file mode 100644
index 0000000..b90e2eb
--- /dev/null
+++ b/SODA.Tests/SODA.Tests.projitems
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>1112171d-6a3f-49f6-818a-fb44195ac837</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>SODA.Tests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)DateTimeConverterTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FourByFourTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HumanAddressTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JsonSerializationExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)LocationColumnTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mocks\StringMocks.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PhoneColumnTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ResourceMetadataTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ResourceTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SodaClientTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SodaRequestTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SodaUriTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SoqlQueryTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WebExceptionExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WebsiteUrlColumnTests.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SODA.Tests/SODA.Tests.shproj b/SODA.Tests/SODA.Tests.shproj
new file mode 100644
index 0000000..61ec44e
--- /dev/null
+++ b/SODA.Tests/SODA.Tests.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>1112171d-6a3f-49f6-818a-fb44195ac837</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="SODA.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/SODA.sln b/SODA.sln
index da01369..616b4e5 100644
--- a/SODA.sln
+++ b/SODA.sln
@@ -1,12 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SODA", "SODA\SODA.csproj", "{837EBDD7-EB58-44F8-834B-F2903A05A16E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SODA.Tests", "SODA.Tests\SODA.Tests.csproj", "{6872AC23-29E5-4EDB-A826-A3FC35AAFDA0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{970C9034-3C0D-47ED-82F5-CCEDD67B7EB0}"
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
@@ -21,41 +17,69 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		SolutionInfo.cs = SolutionInfo.cs
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities", "Utilities\Utilities.csproj", "{63B7FAD7-5927-417C-AD2A-608D777AD1A7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{C2E27366-ABDF-4FE3-A399-A6792C33D437}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SODA", "SODA\SODA.csproj", "{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities.Tests", "Utilities.Tests\Utilities.Tests.csproj", "{6AAB405A-D32F-4D8B-B491-BDD5088561A7}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SODA.Tests", "SODA.Tests\SODA.Tests.shproj", "{1112171D-6A3F-49F6-818A-FB44195AC837}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{C2E27366-ABDF-4FE3-A399-A6792C33D437}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net45.Tests", "Net45.Tests\Net45.Tests.csproj", "{309FA03E-E032-4547-A83C-389EC450FD1A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Utilities.Tests", "Utilities.Tests\Utilities.Tests.shproj", "{651FB983-B00B-445A-960B-850D21D17DB0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities.Net45.Tests", "Utilities.Net45.Tests\Utilities.Net45.Tests.csproj", "{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities", "Utilities\Utilities.csproj", "{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities.NetCore22.Tests", "Utilities.NetCore22.Tests\Utilities.NetCore22.Tests.csproj", "{D7644A62-B301-46EF-A998-8E2658936943}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore22.Tests", "NetCore22.Tests\NetCore22.Tests.csproj", "{37857C2C-3398-4896-8011-ECF5061B7528}"
 EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		SODA.Tests\SODA.Tests.projitems*{1112171d-6a3f-49f6-818a-fb44195ac837}*SharedItemsImports = 13
+		SODA.Tests\SODA.Tests.projitems*{309fa03e-e032-4547-a83c-389ec450fd1a}*SharedItemsImports = 4
+		Utilities.Tests\Utilities.Tests.projitems*{651fb983-b00b-445a-960b-850d21d17db0}*SharedItemsImports = 13
+		Utilities.Tests\Utilities.Tests.projitems*{763fffcb-49dd-4a86-b5a1-b51ea15ce764}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{837EBDD7-EB58-44F8-834B-F2903A05A16E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{837EBDD7-EB58-44F8-834B-F2903A05A16E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{837EBDD7-EB58-44F8-834B-F2903A05A16E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{837EBDD7-EB58-44F8-834B-F2903A05A16E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6872AC23-29E5-4EDB-A826-A3FC35AAFDA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6872AC23-29E5-4EDB-A826-A3FC35AAFDA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6872AC23-29E5-4EDB-A826-A3FC35AAFDA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6872AC23-29E5-4EDB-A826-A3FC35AAFDA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63B7FAD7-5927-417C-AD2A-608D777AD1A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63B7FAD7-5927-417C-AD2A-608D777AD1A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63B7FAD7-5927-417C-AD2A-608D777AD1A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63B7FAD7-5927-417C-AD2A-608D777AD1A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AAB405A-D32F-4D8B-B491-BDD5088561A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AAB405A-D32F-4D8B-B491-BDD5088561A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AAB405A-D32F-4D8B-B491-BDD5088561A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AAB405A-D32F-4D8B-B491-BDD5088561A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{309FA03E-E032-4547-A83C-389EC450FD1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{309FA03E-E032-4547-A83C-389EC450FD1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{309FA03E-E032-4547-A83C-389EC450FD1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{309FA03E-E032-4547-A83C-389EC450FD1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7644A62-B301-46EF-A998-8E2658936943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7644A62-B301-46EF-A998-8E2658936943}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7644A62-B301-46EF-A998-8E2658936943}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7644A62-B301-46EF-A998-8E2658936943}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37857C2C-3398-4896-8011-ECF5061B7528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37857C2C-3398-4896-8011-ECF5061B7528}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37857C2C-3398-4896-8011-ECF5061B7528}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37857C2C-3398-4896-8011-ECF5061B7528}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{63B7FAD7-5927-417C-AD2A-608D777AD1A7} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
-		{6AAB405A-D32F-4D8B-B491-BDD5088561A7} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
+		{651FB983-B00B-445A-960B-850D21D17DB0} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
+		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
+		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
+		{D7644A62-B301-46EF-A998-8E2658936943} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {17A9746D-4584-4AD5-B2FA-2A9EDFC6ED09}
diff --git a/SODA/Properties/AssemblyInfo.cs b/SODA/Properties/AssemblyInfo.cs
deleted file mode 100644
index fb4dca9..0000000
--- a/SODA/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("SODA")]
-[assembly: AssemblyDescription("Socrata Open Data API client library targeting .NET 4.5 and above.")]
-[assembly: InternalsVisibleTo("SODA.Tests")]
\ No newline at end of file
diff --git a/SODA/Resource.cs b/SODA/Resource.cs
index 3bcec33..d02252a 100644
--- a/SODA/Resource.cs
+++ b/SODA/Resource.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using SODA.Utilities;
-
+[assembly: InternalsVisibleTo("Net45.Tests")]
+[assembly: InternalsVisibleTo("NetCore22.Tests")]
 namespace SODA
 {
     /// <summary>
diff --git a/SODA/SODA.csproj b/SODA/SODA.csproj
index 16c517c..b82833a 100644
--- a/SODA/SODA.csproj
+++ b/SODA/SODA.csproj
@@ -1,94 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{837EBDD7-EB58-44F8-834B-F2903A05A16E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SODA</RootNamespace>
-    <AssemblyName>SODA</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <Description>Socrata Open Data API client library targeting .NET 4.5 and above.</Description>
+    <PackageId>CSM.SodaDotNet</PackageId>
+    <Version>0.9.0</Version>
+    <Authors>City of Santa Monica, CA</Authors>
+    <Company>City of Santa Monica, CA</Company>
+    <Copyright>Copyright 2019 City of Santa Monica, CA</Copyright>
+    <PackageTags>API OpenData Socrata SODA</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <RepositoryUrl>https://github.com/CityofSantaMonica/SODA.NET</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageLicenseFile></PackageLicenseFile>
+    <PackageReleaseNotes>Package dependancies updated to latest releases
+
+Converted project to target multiple frameworks - Net Standard 2.0 and Net Framework 4.5</PackageReleaseNotes>
   </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>
-    <DocumentationFile>bin\Debug\SODA.XML</DocumentationFile>
-  </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>
-    <DocumentationFile>bin\Release\SODA.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Models\HumanAddress.cs" />
-    <Compile Include="Models\LocationColumn.cs" />
-    <Compile Include="Models\PhoneColumn.cs" />
-    <Compile Include="Models\PhoneColumnType.cs" />
-    <Compile Include="Models\WebsiteUrlColumn.cs" />
-    <Compile Include="SodaRequest.cs" />
-    <Compile Include="SoqlOrderDirection.cs" />
-    <Compile Include="Resource.cs" />
-    <Compile Include="ResourceColumn.cs" />
-    <Compile Include="ResourceMetadata.cs" />
-    <Compile Include="SodaDataFormat.cs" />
-    <Compile Include="SodaResult.cs" />
-    <Compile Include="SoqlQuery.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SodaClient.cs" />
-    <Compile Include="Utilities\JsonSerializationExtensions.cs" />
-    <Compile Include="Utilities\SodaUri.cs" />
-    <Compile Include="Utilities\DateTimeConverter.cs" />
-    <Compile Include="Utilities\FourByFour.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Utilities\WebExceptionExtensions.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="SODA.nuspec" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </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/SODA/SODA.nuspec b/SODA/SODA.nuspec
deleted file mode 100644
index d76ea8e..0000000
--- a/SODA/SODA.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>CSM.SodaDotNet</id>
-    <version>$version$</version>
-    <title>CSM.SodaDotNet</title>
-    <authors>City of Santa Monica, CA</authors>
-    <owners>City of Santa Monica, CA</owners>
-    <licenseUrl>https://github.com/CityOfSantaMonica/SODA.NET/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/CityOfSantaMonica/SODA.NET</projectUrl>
-    <iconUrl>http://www.smgov.net/uploadedImages/Main/colorstd-R.gif</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <releaseNotes></releaseNotes>
-    <copyright>Copyright 2017 City of Santa Monica, CA</copyright>
-    <tags>API OpenData Socrata SODA</tags>
-    <dependencies>
-      <dependency id="Newtonsoft.Json" version="12.0.2" />
-    </dependencies>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/Utilities.Net45.Tests/Properties/AssemblyInfo.cs b/Utilities.Net45.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..1992a67
--- /dev/null
+++ b/Utilities.Net45.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Utilities.Net45.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Utilities.Net45.Tests")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("763fffcb-49dd-4a86-b5a1-b51ea15ce764")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Utilities.Tests/Utilities.Tests.csproj b/Utilities.Net45.Tests/Utilities.Net45.Tests.csproj
similarity index 50%
rename from Utilities.Tests/Utilities.Tests.csproj
rename to Utilities.Net45.Tests/Utilities.Net45.Tests.csproj
index 9ea07fd..9878b21 100644
--- a/Utilities.Tests/Utilities.Tests.csproj
+++ b/Utilities.Net45.Tests/Utilities.Net45.Tests.csproj
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6AAB405A-D32F-4D8B-B491-BDD5088561A7}</ProjectGuid>
+    <ProjectGuid>{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SODA.Utilities.Tests</RootNamespace>
-    <AssemblyName>SODA.Utilities.Tests</AssemblyName>
+    <RootNamespace>Utilities.Net45.Tests</RootNamespace>
+    <AssemblyName>Utilities.Net45.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -35,7 +30,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -44,7 +38,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
@@ -53,89 +46,32 @@
     <Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
       <HintPath>..\packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Exchange.WebServices, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Exchange.WebServices.Auth, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.Auth.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.XML" />
   </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise />
-  </Choose>
   <ItemGroup>
-    <Compile Include="DataFileExporterTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DataRowExtensionsTests.cs" />
-    <Compile Include="ExcelDataReaderHelperTests.cs" />
-    <Compile Include="FileLoggingTests.cs" />
-    <Compile Include="Mocks\DataRowMocks.cs" />
-    <Compile Include="Mocks\EntityMock.cs" />
-    <Compile Include="Mocks\FileMocks.cs" />
-    <Compile Include="Mocks\StringMocks.cs" />
-    <Compile Include="ObjectExtensionTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SeparatedValuesSerializerTests.cs" />
-    <Compile Include="StringExtensionTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Mocks\mock.xls">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Mocks\mock.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SODA\SODA.csproj">
-      <Project>{837ebdd7-eb58-44f8-834b-f2903a05a16e}</Project>
+      <Project>{8c71d7e2-8ef0-4d7e-9eeb-06b1458d235e}</Project>
       <Name>SODA</Name>
     </ProjectReference>
     <ProjectReference Include="..\Utilities\Utilities.csproj">
-      <Project>{63b7fad7-5927-417c-ad2a-608d777ad1a7}</Project>
+      <Project>{3ba86351-2e4b-45bb-8e92-b9e803cdcd6e}</Project>
       <Name>Utilities</Name>
     </ProjectReference>
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\Utilities.Tests\Utilities.Tests.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -145,11 +81,4 @@
     <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
     <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
-  <!-- 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/Utilities.Tests/packages.config b/Utilities.Net45.Tests/packages.config
similarity index 61%
rename from Utilities.Tests/packages.config
rename to Utilities.Net45.Tests/packages.config
index 3bb3021..f952d75 100644
--- a/Utilities.Tests/packages.config
+++ b/Utilities.Net45.Tests/packages.config
@@ -2,9 +2,6 @@
 <packages>
   <package id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
   <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
-  <package id="Microsoft.Exchange.WebServices" version="2.2" targetFramework="net45" />
   <package id="NUnit" version="3.12.0" targetFramework="net45" />
   <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
-  <package id="SharpZipLib" version="1.1.0" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj b/Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj
new file mode 100644
index 0000000..cf77e83
--- /dev/null
+++ b/Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+    <ProjectReference Include="..\Utilities\Utilities.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\Utilities.Tests\Utilities.Tests.projitems" Label="Shared" />
+
+</Project>
\ No newline at end of file
diff --git a/Utilities.Tests/ExcelDataReaderHelperTests.cs b/Utilities.Tests/ExcelDataReaderHelperTests.cs
index 7d5da60..43151ce 100644
--- a/Utilities.Tests/ExcelDataReaderHelperTests.cs
+++ b/Utilities.Tests/ExcelDataReaderHelperTests.cs
@@ -13,6 +13,9 @@ public class ExcelDataReaderHelperTests
         public void TestInitialize()
         {
             Environment.CurrentDirectory = TestContext.CurrentContext.TestDirectory;
+#if NETCOREAPP
+            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+#endif
         }
 
         [Test]
diff --git a/Utilities.Tests/Properties/AssemblyInfo.cs b/Utilities.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 67f2772..0000000
--- a/Utilities.Tests/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("SODA.Utilities.Tests")]
-[assembly: AssemblyDescription("Test project for the SODA.Utilities library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("City of Santa Monica")]
-[assembly: AssemblyProduct("SODA.Utilities.Tests")]
-[assembly: AssemblyCopyright("Copyright © City of Santa Monica 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("bccf9284-9ee5-434a-a64d-b396481aac6a")]
-
-// 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/Utilities.Tests/Utilities.Tests.projitems b/Utilities.Tests/Utilities.Tests.projitems
new file mode 100644
index 0000000..c813eaf
--- /dev/null
+++ b/Utilities.Tests/Utilities.Tests.projitems
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>651fb983-b00b-445a-960b-850d21d17db0</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Utilities.Tests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)DataFileExporterTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DataRowExtensionsTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ExcelDataReaderHelperTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FileLoggingTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mocks\DataRowMocks.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mocks\EntityMock.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mocks\FileMocks.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mocks\StringMocks.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ObjectExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SeparatedValuesSerializerTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)StringExtensionTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)Mocks\mock.xls">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)Mocks\mock.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Utilities.Tests/Utilities.Tests.shproj b/Utilities.Tests/Utilities.Tests.shproj
new file mode 100644
index 0000000..180980c
--- /dev/null
+++ b/Utilities.Tests/Utilities.Tests.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>651fb983-b00b-445a-960b-850d21d17db0</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Utilities.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/Utilities/DataFileExporter.cs b/Utilities/DataFileExporter.cs
index e2d07a5..091cb69 100644
--- a/Utilities/DataFileExporter.cs
+++ b/Utilities/DataFileExporter.cs
@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Utilities.Net45.Tests")]
+[assembly: InternalsVisibleTo("Utilities.NetCore22.Tests")]
 
 namespace SODA.Utilities
 {
diff --git a/Utilities/EwsClient.cs b/Utilities/EwsClient.cs
index 4a5be14..9804347 100644
--- a/Utilities/EwsClient.cs
+++ b/Utilities/EwsClient.cs
@@ -26,8 +26,14 @@ protected Folder Inbox
         {
             get
             {
-                if(inbox == null)
+                if (inbox == null)
+                {
+#if NET45
                     inbox = Folder.Bind(exchangeService, WellKnownFolderName.Inbox);
+#elif NETSTANDARD
+                    inbox = Folder.Bind(exchangeService, WellKnownFolderName.Inbox).Result;
+#endif
+                }
 
                 return inbox;
             }
@@ -147,13 +153,22 @@ public virtual bool DownloadAttachment(Regex attachmentNamePattern, string targe
             );
 
             //perform the search and return the results as EmailMessage objects
+#if NET45
             var results = Inbox.FindItems(filter, view).Cast<EmailMessage>();
+#elif NETSTANDARD
+            var results = Inbox.FindItems(filter, view).Result.Cast<EmailMessage>();
+#endif
             bool foundAttachment = false;
 
             foreach (var result in results)
             {
                 //another call to EWS to actually load in this email's attachment collection
+#if NET45
                 var email = EmailMessage.Bind(exchangeService, result.Id, new PropertySet(EmailMessageSchema.Attachments));
+#elif NETSTANDARD
+                var email = EmailMessage.Bind(exchangeService, result.Id, new PropertySet(EmailMessageSchema.Attachments)).Result;
+#endif
+
 
                 foreach (var attachment in email.Attachments)
                 {
@@ -171,7 +186,7 @@ public virtual bool DownloadAttachment(Regex attachmentNamePattern, string targe
                             //mark the email as read
                             email.IsRead = true;
                             email.Update(ConflictResolutionMode.AlwaysOverwrite);
-                            
+
                             //get outta here!
                             foundAttachment = true;
                             break;
diff --git a/Utilities/Properties/AssemblyInfo.cs b/Utilities/Properties/AssemblyInfo.cs
deleted file mode 100644
index aae2250..0000000
--- a/Utilities/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("SODA.Utilities")]
-[assembly: AssemblyDescription("Library of helper classes and extension methods for working with Socrata Open Data portals.")]
\ No newline at end of file
diff --git a/Utilities/README.md b/Utilities/README.md
deleted file mode 100644
index 62bdaee..0000000
--- a/Utilities/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# SODA.Utilities
-
-A set of helper classes and extension methods that we use alongside SODA.NET for our publishing workflow. 
-Note, this library is entirely optional and is not required to interact with a Socrata Open Data portal.
-
-## Usage examples
-
-**SimpleFileLogger**, a simple file logging utility (imagine that!)
-
-```c#
-using (var logger = new SimpleFileLogger("log.txt"))
-{
-    //write a line of text to the log file (and the Console window), e.g.
-    //[2014-08-05 14:16:03] Message here
-    
-    logger.WriteLine("Message here");
-}
-```
-
-**DataFileExporter**, a utility for exporting data to a text-based file format
-
-```c#
-IEnumerable<MyClass> payload = GetPayloadData();
-
-//export as JSON
-DataFileExporter.ExportJSON(payload, "data.json");
-
-//export as CSV
-DataFileExporter.ExportCSV(payload, "data.csv");
-```
-
-**ExcelOleDbHelper**, a utility for reading 
-[DataRows](http://msdn.microsoft.com/en-us/library/system.data.datarow) 
-out of Excel documents
-
-```c#
-//make a connection to an .xls(x) workbook
-OleDbConnection connection = ExcelOleDbHelper.MakeConnection("data.xlsx");
-
-//read out a collection of DataRows from all sheets in the workbook
-IEnumerable<DataRow> rows = ExcelOleDbHelper.GetRowsFromDataSheets(connection);
-```
-
-**IEwsClient**, an interface that wraps some Exchange WebServices functionality
-
-```c#
-//initialize a new client targeting Exchange Server 2007 SP1
-IEwsClient ewsClient = new Ews2007Sp1Client("username", "password", "domain.org");
-
-//regex to match against attachment filenames
-var regx = new Regex("file\\d{6}\\.xlsx");
-
-//download an attachment
-//from the first unread email containing a matching attachment
-bool foundAttachment = ewsClient.DownloadAttachment(regx, "C:\\temp");
-
-//send an email message to a list of recipients
-ewsClient.SendMessage("Subject Line",
-                      "Body text here",
-                      "recipient@example.com",
-                      "another.recipient@example.com");
-```
-
-**SeparatedValuesSerializer**, a utility for serializing a collection to a "separated values" (e.g. CSV) representation
-```c#
-IEnumerable<MyClass> payload = GetPayloadData();
-
-//serialize using a comma to separate fields
-string payloadCSV = 
-    SeparatedValuesSerializer.SerializeToString(
-        payload,
-        SeparatedValuesDelimiter.Comma
-    );
-
-//serialize using a tab to separate fields
-string payloadTSV = 
-    SeparatedValuesSerializer.SerializeToString(
-        payload, 
-        SeparatedValuesDelimiter.Tab
-    );
-```
-
-## Dependencies
-
-SODA.Utilities has a few dependencies:
-
-  - SODA.NET
-  - [Excel Data Reader](https://www.nuget.org/packages/ExcelDataReader/2.1.2.3)
-(for reading data from Excel documents)
-  - [Microsoft Exchange WebServices 2.2](https://www.nuget.org/packages/Microsoft.Exchange.WebServices/2.2.0) 
-(for talking to an Exchange server)
-
-## Getting Started
-
-SODA.Utilities is available as a [NuGet package](https://www.nuget.org/packages/CSM.SodaDotNet.Utilities/).
-
-    Install-Package CSM.SodaDotNet.Utilities
-
diff --git a/Utilities/SODA.Utilities.nuspec b/Utilities/SODA.Utilities.nuspec
deleted file mode 100644
index 792b84c..0000000
--- a/Utilities/SODA.Utilities.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>CSM.SodaDotNet.Utilities</id>
-    <version>$version$</version>
-    <title>CSM.SodaDotNet.Utilities</title>
-    <authors>City of Santa Monica, CA</authors>
-    <owners>City of Santa Monica, CA</owners>
-    <licenseUrl>https://github.com/CityOfSantaMonica/SODA.NET/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/CityOfSantaMonica/SODA.NET</projectUrl>
-    <iconUrl>http://www.smgov.net/uploadedImages/Main/colorstd-R.gif</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <releaseNotes></releaseNotes>
-    <copyright>Copyright 2017 City of Santa Monica, CA</copyright>
-    <tags>EWS Excel SODA</tags>
-    <dependencies>
-      <dependency id="CSM.SodaDotNet" version="$version$" />
-      <dependency id="Microsoft.Exchange.WebServices" version="2.2.0" />
-      <dependency id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
-      <dependency id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
-    </dependencies>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj
index b441ff5..6bc1fc5 100644
--- a/Utilities/Utilities.csproj
+++ b/Utilities/Utilities.csproj
@@ -1,106 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{63B7FAD7-5927-417C-AD2A-608D777AD1A7}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SODA.Utilities</RootNamespace>
-    <AssemblyName>SODA.Utilities</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Debug\SODA.Utilities.XML</DocumentationFile>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Release\SODA.Utilities.XML</DocumentationFile>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <PackageId>CSM.SodaDotNet.Utilities</PackageId>
+    <Version>0.9.0</Version>
+    <Authors>City of Santa Monica, CA</Authors>
+    <Description>Library of helper classes and extension methods for working with Socrata Open Data portals.</Description>
+    <Copyright>Copyright 2019 City of Santa Monica, CA</Copyright>
+    <Product>SODA.Utilities</Product>
+    <PackageTags>EWS Excel SODA</PackageTags>
+    <RepositoryUrl>https://github.com/CityofSantaMonica/SODA.NET</RepositoryUrl>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
-    </Reference>
-    <Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Exchange.WebServices, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Exchange.WebServices.Auth, Version=15.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Exchange.WebServices.2.2\lib\40\Microsoft.Exchange.WebServices.Auth.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="ExcelDataReader" Version="3.6.0" />
+    <PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="DataFileExporter.cs" />
-    <Compile Include="Ews2010Sp2Client.cs" />
-    <Compile Include="Ews2007Sp1Client.cs" />
-    <Compile Include="ExcelDataReaderHelper.cs" />
-    <Compile Include="EwsClient.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Extensions.cs" />
-    <Compile Include="IEwsClient.cs" />
-    <Compile Include="Office365EwsClient.cs" />
-    <Compile Include="SeparatedValuesDelimiter.cs" />
-    <Compile Include="SeparatedValuesSerializer.cs" />
-    <Compile Include="SimpleFileLogger.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\SODA\SODA.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SODA\SODA.csproj">
-      <Project>{837ebdd7-eb58-44f8-834b-f2903a05a16e}</Project>
-      <Name>SODA</Name>
-    </ProjectReference>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Exchange.WebServices.NETStandard">
+      <Version>1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Encoding.CodePages">
+      <Version>4.5.1</Version>
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="SODA.Utilities.nuspec" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+    <PackageReference Include="Microsoft.Exchange.WebServices">
+      <Version>2.2.0</Version>
+    </PackageReference>
   </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/Utilities/packages.config b/Utilities/packages.config
deleted file mode 100644
index d919235..0000000
--- a/Utilities/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
-  <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
-  <package id="Microsoft.Exchange.WebServices" version="2.2" targetFramework="net45" />
-  <package id="SharpZipLib" version="1.1.0" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
-</packages>
\ No newline at end of file

From efa5b002b53c46ad9e0232d5773384461a059f34 Mon Sep 17 00:00:00 2001
From: kevinsmgov <kevin.hobson@smgov.net>
Date: Tue, 23 Jul 2019 14:22:54 -0700
Subject: [PATCH 05/11] correct httpclient actions to complete tests

---
 SODA.Tests/SodaClientTests.cs  |  2 +-
 SODA.Tests/SodaRequestTests.cs | 60 ++++++++++++------------
 SODA/SodaRequest.cs            | 86 +++++++++++++++++-----------------
 3 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/SODA.Tests/SodaClientTests.cs b/SODA.Tests/SodaClientTests.cs
index 225c065..8e6215d 100644
--- a/SODA.Tests/SodaClientTests.cs
+++ b/SODA.Tests/SodaClientTests.cs
@@ -118,7 +118,7 @@ public void Query_With_UndefinedLimit_UsesMaximum()
             {
                 mockClient.Query<object>(query, StringMocks.ResourceId);
             }
-            catch (WebException)
+            catch (InvalidOperationException)
             {
                 //pass
             }
diff --git a/SODA.Tests/SodaRequestTests.cs b/SODA.Tests/SodaRequestTests.cs
index 47e30e7..758951b 100644
--- a/SODA.Tests/SodaRequestTests.cs
+++ b/SODA.Tests/SodaRequestTests.cs
@@ -78,14 +78,14 @@ public void New_Returns_Request_With_Specified_Method(string input)
             StringAssert.AreEqualIgnoringCase(input, request.RequestMessage.Method.Method);
         }
 
-        //[Test]
-        //[Category("SodaRequest")]
-        //public void New_Returns_Request_Using_HTTP_1_1()
-        //{
-        //    var request = new SodaRequest(exampleUri, "GET", null, null, null);
+        [Test]
+        [Category("SodaRequest")]
+        public void New_Returns_Request_Using_HTTP_1_1()
+        {
+            var request = new SodaRequest(exampleUri, "GET", null, null, null);
 
-        //    Assert.AreEqual(new Version("1.1"), request.webRequest.ProtocolVersion);
-        //}
+            Assert.AreEqual(new Version("1.1"), request.RequestMessage.Version);
+        }
 
         [TestCase("appToken1234")]
         [Category("SodaRequest")]
@@ -244,27 +244,27 @@ public void ParseResponse_Can_GET_Example()
             StringAssert.Contains("</html>", result);
         }
 
-        //[TestCase("POST")]
-        //[TestCase("PUT")]
-        //[TestCase("DELETE")]
-        //[Category("SodaRequest")]
-        //public void ParseResponse_Non_GET_Sends_Request_To_Example_Using_Method(string method)
-        //{
-        //    var request = new SodaRequest(exampleUri, method, null, null, null);
-        //    string result;
-
-        //    try
-        //    {
-        //        result = request.ParseResponse<string>();
-        //    }
-        //    catch (WebException webException)
-        //    {
-        //        var webResponse = webException.Response as HttpWebResponse;
-
-        //        Assert.AreEqual(exampleUri, webResponse.ResponseUri);
-        //        StringAssert.AreEqualIgnoringCase(method, webResponse.Method);
-        //    }
-        //}
-
+        [TestCase("POST")]
+        [TestCase("PUT")]
+        [TestCase("DELETE")]
+        [Category("SodaRequest")]
+        public void ParseResponse_Non_GET_Sends_Request_To_Example_Using_Method(string method)
+        {
+            var request = new SodaRequest(exampleUri, method, null, null, null);
+            string result;
+
+            try
+            {
+                result = request.ParseResponse<string>();
+            }
+            catch(InvalidOperationException)
+            {
+            }
+            finally
+            {
+                Assert.AreEqual(exampleUri, request.ResponseMessage.RequestMessage.RequestUri);
+                StringAssert.AreEqualIgnoringCase(method, request.ResponseMessage.RequestMessage.Method.Method);
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/SODA/SodaRequest.cs b/SODA/SodaRequest.cs
index 3f3e6f0..db482cb 100644
--- a/SODA/SodaRequest.cs
+++ b/SODA/SodaRequest.cs
@@ -20,10 +20,15 @@ internal class SodaRequest
         internal HttpClient Client { get; private set; }
 
         /// <summary>
-        /// The underlying HttpWebRequest handled by this SodaRequest
+        /// The underlying HttpRequestMessage handled by this SodaRequest
         /// </summary>
         internal HttpRequestMessage RequestMessage { get; private set; }
 
+        /// <summary>
+        /// The underlying HttpResponseMessage handled by this SodaRequest
+        /// </summary>
+        internal HttpResponseMessage ResponseMessage { get; private set; }
+
         /// <summary>
         /// The Socrata supported data-interchange formats that this SodaRequest uses
         /// </summary>
@@ -104,56 +109,49 @@ internal TResult ParseResponse<TResult>() where TResult : class
             Exception inner = null;
             bool exception = false;
 
-            var response = Client.SendAsync(RequestMessage).Result;
-            if (response.IsSuccessStatusCode)
-            {
+            this.ResponseMessage = Client.SendAsync(RequestMessage).Result;
 
-                //attempt to deserialize based on the requested format
-                switch (dataFormat)
-                {
-                    case SodaDataFormat.JSON:
+            //attempt to deserialize based on the requested format
+            switch (dataFormat)
+            {
+                case SodaDataFormat.JSON:
+                    try
+                    {
+                        result = Newtonsoft.Json.JsonConvert.DeserializeObject<TResult>(this.ResponseMessage.Content.ReadAsStringAsync().Result);
+                    }
+                    catch (Newtonsoft.Json.JsonException jex)
+                    {
+                        inner = jex;
+                        exception = true;
+                    }
+                    break;
+                case SodaDataFormat.CSV:
+                    //TODO: should we consider this an error (i.e. InvalidOperationException) if this cast returns null?
+                    result = this.ResponseMessage.Content.ReadAsStringAsync().Result as TResult;
+                    break;
+                case SodaDataFormat.XML:
+                    //see if the caller just wanted the XML string
+                    var ttype = typeof(TResult);
+                    if (ttype == typeof(string))
+                    {
+                        result = this.ResponseMessage.Content.ReadAsStringAsync().Result as TResult;
+                    }
+                    else
+                    {
+                        //try to deserialize the XML response
                         try
                         {
-                            result = Newtonsoft.Json.JsonConvert.DeserializeObject<TResult>(response.Content.ReadAsStringAsync().Result);
+                            var reader = XmlReader.Create(new StringReader(this.ResponseMessage.Content.ReadAsStringAsync().Result));
+                            var serializer = new XmlSerializer(ttype);
+                            result = serializer.Deserialize(reader) as TResult;
                         }
-                        catch (Newtonsoft.Json.JsonException jex)
+                        catch (Exception ex)
                         {
-                            inner = jex;
+                            inner = ex;
                             exception = true;
                         }
-                        break;
-                    case SodaDataFormat.CSV:
-                        //TODO: should we consider this an error (i.e. InvalidOperationException) if this cast returns null?
-                        result = response.Content.ReadAsStringAsync().Result as TResult;
-                        break;
-                    case SodaDataFormat.XML:
-                        //see if the caller just wanted the XML string
-                        var ttype = typeof(TResult);
-                        if (ttype == typeof(string))
-                        {
-                            result = response.Content.ReadAsStringAsync().Result as TResult;
-                        }
-                        else
-                        {
-                            //try to deserialize the XML response
-                            try
-                            {
-                                var reader = XmlReader.Create(new StringReader(response.Content.ReadAsStringAsync().Result));
-                                var serializer = new XmlSerializer(ttype);
-                                result = serializer.Deserialize(reader) as TResult;
-                            }
-                            catch (Exception ex)
-                            {
-                                inner = ex;
-                                exception = true;
-                            }
-                        }
-                        break;
-                }
-            }
-            else
-            {
-                throw new WebException(response.ReasonPhrase);
+                    }
+                    break;
             }
 
             if (exception)

From 6c6216a450b8e86ceb13df4d0f6876a9d3574205 Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan.maher@smgov.net>
Date: Tue, 23 Jul 2019 10:39:17 -0700
Subject: [PATCH 06/11] removing comments

---
 SODA.Tests/HumanAddressTests.cs               |  1 -
 SODA.Tests/PhoneColumnTest.cs                 |  1 -
 SODA.Tests/ResourceTests.cs                   |  1 -
 SODA.Tests/SodaClientTests.cs                 | 21 -------------------
 SODA.Tests/SodaRequestTests.cs                |  5 +----
 SODA.Tests/SodaUriTests.cs                    | 17 ---------------
 SODA.Tests/SoqlQueryTests.cs                  |  3 ---
 Utilities.Tests/DataFileExporterTests.cs      |  6 ------
 Utilities.Tests/FileLoggingTests.cs           |  2 --
 .../SeparatedValuesSerializerTests.cs         |  1 -
 10 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/SODA.Tests/HumanAddressTests.cs b/SODA.Tests/HumanAddressTests.cs
index 8345de7..0acecab 100644
--- a/SODA.Tests/HumanAddressTests.cs
+++ b/SODA.Tests/HumanAddressTests.cs
@@ -28,7 +28,6 @@ public void New_Deserializes_Valid_HumanAddress_Json()
 
         [TestCase("not json")]
         [TestCase(@"{""not"":""a"",""human"":""address""}")]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("HumanAddress")]
         public void New_Throws_ArgumentOutOfRangeException_For_Invalid_HumanAddress_Json(string input)
         {
diff --git a/SODA.Tests/PhoneColumnTest.cs b/SODA.Tests/PhoneColumnTest.cs
index 1907a2e..7344380 100644
--- a/SODA.Tests/PhoneColumnTest.cs
+++ b/SODA.Tests/PhoneColumnTest.cs
@@ -88,7 +88,6 @@ public void New_Deserializes_PhoneColumn_For_No_Type_Json()
 
         [TestCase("not json")]
         [TestCase(@"{""not"":""a"",""valid"":""phone""}")]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("PhoneColumn")]
         public void New_Throws_ArgumentOutOfRangeException_For_Invalid_PhoneColumn_Json(string input)
         {
diff --git a/SODA.Tests/ResourceTests.cs b/SODA.Tests/ResourceTests.cs
index 6b0f5b9..c7496d1 100644
--- a/SODA.Tests/ResourceTests.cs
+++ b/SODA.Tests/ResourceTests.cs
@@ -70,7 +70,6 @@ public void New_Gets_Metadata_Identifier()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("Resource")]
         public void GetRow_With_Invalid_RowId_Throws_ArugmentException(string input)
         {
diff --git a/SODA.Tests/SodaClientTests.cs b/SODA.Tests/SodaClientTests.cs
index 8e6215d..1f569f9 100644
--- a/SODA.Tests/SodaClientTests.cs
+++ b/SODA.Tests/SodaClientTests.cs
@@ -25,7 +25,6 @@ public void TestSetup()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaClient")]
         public void New_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -69,7 +68,6 @@ public void New_With_Username_Gets_Username()
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void GetMetadata_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -79,7 +77,6 @@ public void GetMetadata_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeExcepti
         [TestCase(-100)]
         [TestCase(-1)]
         [TestCase(0)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void GetMetadataPage_With_NonPositive_Page_Throws_ArgumentOutOfRangeException(int input)
         {
@@ -90,7 +87,6 @@ public void GetMetadataPage_With_NonPositive_Page_Throws_ArgumentOutOfRangeExcep
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void GetResource_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -100,7 +96,6 @@ public void GetResource_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeExcepti
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Query_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -128,7 +123,6 @@ public void Query_With_UndefinedLimit_UsesMaximum()
         }
 
         [Test]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Upsert_With_String_And_SodaDataFormat_XML_Throws_ArgumentOutOfRangeException()
         {
@@ -136,7 +130,6 @@ public void Upsert_With_String_And_SodaDataFormat_XML_Throws_ArgumentOutOfRangeE
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Upsert_With_String_And_SodaDataFormat_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -146,7 +139,6 @@ public void Upsert_With_String_And_SodaDataFormat_Using_Anonymous_Client_Throws_
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Upsert_With_Entities_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -156,7 +148,6 @@ public void Upsert_With_Entities_And_Invalid_ResourceId_Throws_ArgumentOutOfRang
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Upsert_With_Entities_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -168,7 +159,6 @@ public void Upsert_With_Entities_Using_Anonymous_Client_Throws_InvalidOperationE
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -180,7 +170,6 @@ public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_And_Invali
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -194,7 +183,6 @@ public void BatchUpsert_With_Entities_And_BatchSize_And_BreakFunction_Using_Anon
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -204,7 +192,6 @@ public void BatchUpsert_With_Entities_And_BatchSize_And_Invalid_ResourceId_Throw
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void BatchUpsert_With_Entities_And_BatchSize_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -214,7 +201,6 @@ public void BatchUpsert_With_Entities_And_BatchSize_Using_Anonymous_Client_Throw
         }
 
         [Test]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Replace_With_String_And_DataFormat_XML_And_ResourceId_Throws_ArgumentOutOfRangeException()
         {
@@ -224,7 +210,6 @@ public void Replace_With_String_And_DataFormat_XML_And_ResourceId_Throws_Argumen
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Replace_With_String_And_DataFormat_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -232,7 +217,6 @@ public void Replace_With_String_And_DataFormat_And_Invalid_ResourceId_Throws_Arg
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Replace_With_String_And_DataFormat_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -242,7 +226,6 @@ public void Replace_With_String_And_DataFormat_Using_Anonymous_Client_Throws_Inv
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void Replace_With_Entities_And_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -252,7 +235,6 @@ public void Replace_With_Entities_And_Invalid_ResourceId_Throws_ArgumentOutOfRan
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void Replace_With_Entities_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
@@ -263,7 +245,6 @@ public void Replace_With_Entities_Using_Anonymous_Client_Throws_InvalidOperation
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaClient")]
         public void DeleteRow_With_Empty_RowId_Throws_ArgumentException(string input)
         {
@@ -273,7 +254,6 @@ public void DeleteRow_With_Empty_RowId_Throws_ArgumentException(string input)
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaClient")]
         public void DeleteRow_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -281,7 +261,6 @@ public void DeleteRow_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaClient")]
         public void DeleteRow_Using_Anonymous_Client_Throws_InvalidOperationException()
         {
diff --git a/SODA.Tests/SodaRequestTests.cs b/SODA.Tests/SodaRequestTests.cs
index 758951b..746b77e 100644
--- a/SODA.Tests/SodaRequestTests.cs
+++ b/SODA.Tests/SodaRequestTests.cs
@@ -132,8 +132,8 @@ public void New_With_JSON_DataFormat_Sets_Accept_Header(string input)
 
         [TestCase("POST")]
         [TestCase("PUT")]
-        [Category("SodaRequest")]
         [TestCase("DELETE")]
+        [Category("SodaRequest")]
         public void New_Non_GET_With_JSON_DataFormat_Sets_ContentType_Header(string input)
         {
             var request = new SodaRequest(exampleUri, input, null, null, null, SodaDataFormat.JSON, "{}");
@@ -175,8 +175,6 @@ public void New_Returns_Request_With_Unset_Content_For_Empty_Payload()
         {
             var request = new SodaRequest(exampleUri, "POST", null, null, null);
 
-            //The default is -1, which indicates the property has not been set and that there is no request data to send.
-            //http://msdn.microsoft.com/en-us/library/system.net.httpwebrequest.contentlength(v=vs.110).aspx
             Assert.IsNull(request.RequestMessage.Content);
         }
 
@@ -216,7 +214,6 @@ public void New_Sets_Timeout_To_Given_Timeout()
         }
 
         [Test]
-        //[ExpectedException(typeof(InvalidOperationException))]
         [Category("SodaRequest")]
         public void ParseResponse_ReThrows_JSON_Parse_Exception_As_InvalidOperationException()
         {
diff --git a/SODA.Tests/SodaUriTests.cs b/SODA.Tests/SodaUriTests.cs
index 30dc370..3b32cc9 100644
--- a/SODA.Tests/SodaUriTests.cs
+++ b/SODA.Tests/SodaUriTests.cs
@@ -102,7 +102,6 @@ public void All_Methods_Return_Uri_Using_HTTPS()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForMetadata_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -112,7 +111,6 @@ public void ForMetadata_With_Empty_Host_Throws_ArgumentException(string input)
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForMetadata_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -130,7 +128,6 @@ public void ForMetadata_With_Valid_Arguments_Creates_Metadata_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForMetadataList_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -140,7 +137,6 @@ public void ForMetadataList_With_Empty_Host_Throws_ArgumentException(string inpu
         [TestCase(-100)]
         [TestCase(-1)]
         [TestCase(0)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForMetadataList_With_Page_Less_Than_1_Throws_ArugmentOutOfRangeException(int page)
         {
@@ -161,7 +157,6 @@ public void ForMetadataList_With_Valid_Arguments_Creates_MetadataList_Uri(int pa
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourceAPI_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -171,7 +166,6 @@ public void ForResourceAPI_With_Empty_Host_Throws_ArgumentException(string input
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourceAPI_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -194,7 +188,6 @@ public void ForResourceAPI_With_Valid_Arguments_Creates_ResourceAPI_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourcePage_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -204,7 +197,6 @@ public void ForResourcePage_With_Empty_Host_Throws_ArgumentException(string inpu
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourcePage_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -222,7 +214,6 @@ public void ForResourcePage_With_Valid_Arguments_Creates_ResourcePermalink_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourceAboutPage_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -232,7 +223,6 @@ public void ForResourceAboutPage_With_Empty_Host_Throws_ArgumentException(string
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourceAboutPage_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -250,7 +240,6 @@ public void ForResourceAboutPage_With_Valid_Arguments_Creates_ResourcePermalink_
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForResourceAPIPage_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -260,7 +249,6 @@ public void ForResourceAPIPage_With_Empty_Host_Throws_ArgumentException(string i
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForResourceAPIPage_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -290,7 +278,6 @@ public void ForResourceAPIPage_With_Valid_Arguments_Creates_ResourceAPIPage_Uri(
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForQuery_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -300,7 +287,6 @@ public void ForQuery_With_Empty_Host_Throws_ArgumentException(string input)
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NonEmptyInput)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SodaUri")]
         public void ForQuery_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(string input)
         {
@@ -309,7 +295,6 @@ public void ForQuery_With_Invalid_ResourceId_Throws_ArgumentOutOfRangeException(
 
         [Test]
         [Category("SodaUri")]
-        //[ExpectedException(typeof(ArgumentNullException))]
         public void ForQuery_With_Null_SoqlQuery_Throws_ArgumentNullException()
         {
             Assert.That(() => SodaUri.ForQuery(StringMocks.Host, StringMocks.ResourceId, null), Throws.TypeOf<ArgumentNullException>());
@@ -329,7 +314,6 @@ public void ForQuery_With_Valid_Arguments_Creates_Query_Uri()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForCategoryPage_With_Empty_Host_Throws_ArgumentException(string input)
         {
@@ -338,7 +322,6 @@ public void ForCategoryPage_With_Empty_Host_Throws_ArgumentException(string inpu
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("SodaUri")]
         public void ForCategoryPage_With_Empty_Category_Throws_ArgumentException(string input)
         {
diff --git a/SODA.Tests/SoqlQueryTests.cs b/SODA.Tests/SoqlQueryTests.cs
index 28f3b4b..f7e93e5 100644
--- a/SODA.Tests/SoqlQueryTests.cs
+++ b/SODA.Tests/SoqlQueryTests.cs
@@ -33,7 +33,6 @@ public void Default_Ctor_Has_No_Limit()
 
         [TestCase(null)]
         [TestCase("")]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SoqlQuery")]
         public void Query_Ctor_Requires_Query(string query)
         {
@@ -420,7 +419,6 @@ public void Last_Having_Overwrites_All_Previous()
         [TestCase(-100)]
         [TestCase(-1)]
         [TestCase(0)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SoqlQuery")]
         public void Limit_Less_Than_One_Throws_ArgumentOutOfRangeException(int limit)
         {
@@ -460,7 +458,6 @@ public void Last_Limit_Overwrites_All_Previous()
 
         [TestCase(-999)]
         [TestCase(-1)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SoqlQuery")]
         public void Offset_Less_Than_Zero_Throws_ArgumentOutOfRangeException(int offset)
         {
diff --git a/Utilities.Tests/DataFileExporterTests.cs b/Utilities.Tests/DataFileExporterTests.cs
index 8c92761..330d818 100644
--- a/Utilities.Tests/DataFileExporterTests.cs
+++ b/Utilities.Tests/DataFileExporterTests.cs
@@ -56,7 +56,6 @@ public void ExportCSV_Parameterless_Uses_DefaultFilePath()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportCSV_With_Empty_File_Paths_Throws_Exception(string input)
         {
@@ -64,7 +63,6 @@ public void ExportCSV_With_Empty_File_Paths_Throws_Exception(string input)
         }
 
         [TestCase("something.notcsv")]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportCSV_With_Incorrect_File_Extension_Throws_Exception(string input)
         {
@@ -143,7 +141,6 @@ public void ExportTSV_Parameterless_Uses_DefaultFilePath()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportTSV_With_Empty_File_Paths_Throws_Exception(string input)
         {
@@ -151,7 +148,6 @@ public void ExportTSV_With_Empty_File_Paths_Throws_Exception(string input)
         }
 
         [TestCase("something.nottsv")]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportTSV_With_Incorrect_File_Extension_Throws_Exception(string input)
         {
@@ -180,7 +176,6 @@ public void ExportJSON_Parameterless_Uses_DefaultFilePath()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportJSON_With_Empty_File_Paths_Throws_Exception(string input)
         {
@@ -188,7 +183,6 @@ public void ExportJSON_With_Empty_File_Paths_Throws_Exception(string input)
         }
 
         [TestCase("something.notjson")]
-        //[ExpectedException(typeof(ArgumentException))]
         [Category("DataFileExporter")]
         public void ExportJSON_With_Incorrect_File_Extension_Throws_Exception(string input)
         {
diff --git a/Utilities.Tests/FileLoggingTests.cs b/Utilities.Tests/FileLoggingTests.cs
index 021f303..11192c3 100644
--- a/Utilities.Tests/FileLoggingTests.cs
+++ b/Utilities.Tests/FileLoggingTests.cs
@@ -38,7 +38,6 @@ public void Default_New_Uses_DefaultLogFile_And_DefaultMaxLogSize()
 
         [TestCase(StringMocks.NullInput)]
         [TestCase(StringMocks.EmptyInput)]
-        //[ExpectedException(typeof(ArgumentNullException))]
         [Category("SimpleFileLogger")]
         public void New_With_Empty_LogFilePath_Throws_ArgumentNullException(string input)
         {
@@ -47,7 +46,6 @@ public void New_With_Empty_LogFilePath_Throws_ArgumentNullException(string input
 
         [TestCase(-1)]
         [TestCase(0)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SimpleFileLogger")]
         public void New_With_NonPositive_MaxLogBytes_Throws_ArgumentOutOfRangeException(int input)
         {
diff --git a/Utilities.Tests/SeparatedValuesSerializerTests.cs b/Utilities.Tests/SeparatedValuesSerializerTests.cs
index f754b82..1cddc7f 100644
--- a/Utilities.Tests/SeparatedValuesSerializerTests.cs
+++ b/Utilities.Tests/SeparatedValuesSerializerTests.cs
@@ -49,7 +49,6 @@ public void DelimiterString_For_Tab_Is_Tab()
 
         [TestCase(SeparatedValuesDelimiter.Comma - 1)]
         [TestCase(SeparatedValuesDelimiter.Tab + 1)]
-        //[ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("SeparatedValuesSerializer")]
         public void SerializeToString_Throws_ArgumentOutOfRangeException_For_Invalid_Delimiter(SeparatedValuesDelimiter delimiter)
         {

From ab4992ef73dee903a9289f30f889936a71b2e012 Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan.maher@smgov.net>
Date: Tue, 23 Jul 2019 11:39:56 -0700
Subject: [PATCH 07/11] solution reorg

---
 .../Net45.SODA.Tests.csproj                   |  0
 Net45.SODA.Tests/Properties/AssemblyInfo.cs   | 12 +++++
 .../packages.config                           |  0
 Net45.Tests/Properties/AssemblyInfo.cs        | 20 --------
 .../Net45.Utilities.Tests.csproj              |  0
 .../Properties/AssemblyInfo.cs                | 12 +++++
 .../packages.config                           |  0
 .../NetCore22.SODA.Tests.csproj               |  4 +-
 .../NetCore22.Utilities.Tests.csproj          |  4 +-
 SODA.sln                                      | 50 ++++++++++---------
 .../Properties/AssemblyInfo.cs                | 20 --------
 11 files changed, 55 insertions(+), 67 deletions(-)
 rename Net45.Tests/Net45.Tests.csproj => Net45.SODA.Tests/Net45.SODA.Tests.csproj (100%)
 create mode 100644 Net45.SODA.Tests/Properties/AssemblyInfo.cs
 rename {Net45.Tests => Net45.SODA.Tests}/packages.config (100%)
 delete mode 100644 Net45.Tests/Properties/AssemblyInfo.cs
 rename Utilities.Net45.Tests/Utilities.Net45.Tests.csproj => Net45.Utilities.Tests/Net45.Utilities.Tests.csproj (100%)
 create mode 100644 Net45.Utilities.Tests/Properties/AssemblyInfo.cs
 rename {Utilities.Net45.Tests => Net45.Utilities.Tests}/packages.config (100%)
 rename NetCore22.Tests/NetCore22.Tests.csproj => NetCore22.SODA.Tests/NetCore22.SODA.Tests.csproj (85%)
 rename Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj => NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj (87%)
 delete mode 100644 Utilities.Net45.Tests/Properties/AssemblyInfo.cs

diff --git a/Net45.Tests/Net45.Tests.csproj b/Net45.SODA.Tests/Net45.SODA.Tests.csproj
similarity index 100%
rename from Net45.Tests/Net45.Tests.csproj
rename to Net45.SODA.Tests/Net45.SODA.Tests.csproj
diff --git a/Net45.SODA.Tests/Properties/AssemblyInfo.cs b/Net45.SODA.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..42f4858
--- /dev/null
+++ b/Net45.SODA.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Net45.SODA.Tests")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("309fa03e-e032-4547-a83c-389ec450fd1a")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Net45.Tests/packages.config b/Net45.SODA.Tests/packages.config
similarity index 100%
rename from Net45.Tests/packages.config
rename to Net45.SODA.Tests/packages.config
diff --git a/Net45.Tests/Properties/AssemblyInfo.cs b/Net45.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 730a27f..0000000
--- a/Net45.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Net45.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Net45.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("309fa03e-e032-4547-a83c-389ec450fd1a")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Utilities.Net45.Tests/Utilities.Net45.Tests.csproj b/Net45.Utilities.Tests/Net45.Utilities.Tests.csproj
similarity index 100%
rename from Utilities.Net45.Tests/Utilities.Net45.Tests.csproj
rename to Net45.Utilities.Tests/Net45.Utilities.Tests.csproj
diff --git a/Net45.Utilities.Tests/Properties/AssemblyInfo.cs b/Net45.Utilities.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0d3341b
--- /dev/null
+++ b/Net45.Utilities.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Net45.Utilities.Tests")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("763fffcb-49dd-4a86-b5a1-b51ea15ce764")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Utilities.Net45.Tests/packages.config b/Net45.Utilities.Tests/packages.config
similarity index 100%
rename from Utilities.Net45.Tests/packages.config
rename to Net45.Utilities.Tests/packages.config
diff --git a/NetCore22.Tests/NetCore22.Tests.csproj b/NetCore22.SODA.Tests/NetCore22.SODA.Tests.csproj
similarity index 85%
rename from NetCore22.Tests/NetCore22.Tests.csproj
rename to NetCore22.SODA.Tests/NetCore22.SODA.Tests.csproj
index 68e00f8..a2a2e0d 100644
--- a/NetCore22.Tests/NetCore22.Tests.csproj
+++ b/NetCore22.SODA.Tests/NetCore22.SODA.Tests.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
-    <AssemblyName>NetCore22.Tests</AssemblyName>
+    <AssemblyName>NetCore22.SODA.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj b/NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj
similarity index 87%
rename from Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj
rename to NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj
index cf77e83..47eddc7 100644
--- a/Utilities.NetCore22.Tests/Utilities.NetCore22.Tests.csproj
+++ b/NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj
@@ -1,9 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <AssemblyName>NetCore22.Utilities.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SODA.sln b/SODA.sln
index 616b4e5..70d099c 100644
--- a/SODA.sln
+++ b/SODA.sln
@@ -17,23 +17,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		SolutionInfo.cs = SolutionInfo.cs
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{C2E27366-ABDF-4FE3-A399-A6792C33D437}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SODA", "SODA\SODA.csproj", "{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SODA.Tests", "SODA.Tests\SODA.Tests.shproj", "{1112171D-6A3F-49F6-818A-FB44195AC837}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{76D1DD9D-B476-4900-A561-18BB7CBAF54F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net45.Tests", "Net45.Tests\Net45.Tests.csproj", "{309FA03E-E032-4547-A83C-389EC450FD1A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities", "Utilities\Utilities.csproj", "{8DA784F1-63B3-40A8-AEF4-833D813E5E54}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SODA.Tests", "SODA.Tests\SODA.Tests.shproj", "{1112171D-6A3F-49F6-818A-FB44195AC837}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Utilities.Tests", "Utilities.Tests\Utilities.Tests.shproj", "{651FB983-B00B-445A-960B-850D21D17DB0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities.Net45.Tests", "Utilities.Net45.Tests\Utilities.Net45.Tests.csproj", "{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net45.SODA.Tests", "Net45.SODA.Tests\Net45.SODA.Tests.csproj", "{309FA03E-E032-4547-A83C-389EC450FD1A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities", "Utilities\Utilities.csproj", "{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net45.Utilities.Tests", "Net45.Utilities.Tests\Net45.Utilities.Tests.csproj", "{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utilities.NetCore22.Tests", "Utilities.NetCore22.Tests\Utilities.NetCore22.Tests.csproj", "{D7644A62-B301-46EF-A998-8E2658936943}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore22.SODA.Tests", "NetCore22.SODA.Tests\NetCore22.SODA.Tests.csproj", "{CFAEADE7-EBEA-40F8-9630-C699AA5F8274}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore22.Tests", "NetCore22.Tests\NetCore22.Tests.csproj", "{37857C2C-3398-4896-8011-ECF5061B7528}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore22.Utilities.Tests", "NetCore22.Utilities.Tests\NetCore22.Utilities.Tests.csproj", "{02CEA30A-5D25-4F9D-B74E-7CED1EBA84BF}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -51,6 +51,10 @@ Global
 		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DA784F1-63B3-40A8-AEF4-833D813E5E54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DA784F1-63B3-40A8-AEF4-833D813E5E54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DA784F1-63B3-40A8-AEF4-833D813E5E54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DA784F1-63B3-40A8-AEF4-833D813E5E54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{309FA03E-E032-4547-A83C-389EC450FD1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{309FA03E-E032-4547-A83C-389EC450FD1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{309FA03E-E032-4547-A83C-389EC450FD1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,27 +63,25 @@ Global
 		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7644A62-B301-46EF-A998-8E2658936943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7644A62-B301-46EF-A998-8E2658936943}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7644A62-B301-46EF-A998-8E2658936943}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7644A62-B301-46EF-A998-8E2658936943}.Release|Any CPU.Build.0 = Release|Any CPU
-		{37857C2C-3398-4896-8011-ECF5061B7528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37857C2C-3398-4896-8011-ECF5061B7528}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37857C2C-3398-4896-8011-ECF5061B7528}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{37857C2C-3398-4896-8011-ECF5061B7528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFAEADE7-EBEA-40F8-9630-C699AA5F8274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFAEADE7-EBEA-40F8-9630-C699AA5F8274}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFAEADE7-EBEA-40F8-9630-C699AA5F8274}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFAEADE7-EBEA-40F8-9630-C699AA5F8274}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02CEA30A-5D25-4F9D-B74E-7CED1EBA84BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02CEA30A-5D25-4F9D-B74E-7CED1EBA84BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02CEA30A-5D25-4F9D-B74E-7CED1EBA84BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02CEA30A-5D25-4F9D-B74E-7CED1EBA84BF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{651FB983-B00B-445A-960B-850D21D17DB0} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
-		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
-		{3BA86351-2E4B-45BB-8E92-B9E803CDCD6E} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
-		{D7644A62-B301-46EF-A998-8E2658936943} = {C2E27366-ABDF-4FE3-A399-A6792C33D437}
+		{1112171D-6A3F-49F6-818A-FB44195AC837} = {76D1DD9D-B476-4900-A561-18BB7CBAF54F}
+		{651FB983-B00B-445A-960B-850D21D17DB0} = {76D1DD9D-B476-4900-A561-18BB7CBAF54F}
+		{309FA03E-E032-4547-A83C-389EC450FD1A} = {76D1DD9D-B476-4900-A561-18BB7CBAF54F}
+		{763FFFCB-49DD-4A86-B5A1-B51EA15CE764} = {76D1DD9D-B476-4900-A561-18BB7CBAF54F}
+		{CFAEADE7-EBEA-40F8-9630-C699AA5F8274} = {76D1DD9D-B476-4900-A561-18BB7CBAF54F}
+		{02CEA30A-5D25-4F9D-B74E-7CED1EBA84BF} = {76D1DD9D-B476-4900-A561-18BB7CBAF54F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {17A9746D-4584-4AD5-B2FA-2A9EDFC6ED09}
diff --git a/Utilities.Net45.Tests/Properties/AssemblyInfo.cs b/Utilities.Net45.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1992a67..0000000
--- a/Utilities.Net45.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Utilities.Net45.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Utilities.Net45.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("763fffcb-49dd-4a86-b5a1-b51ea15ce764")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

From c577c91ddf4515a99542b1fc8c6f5e8ed0dd9a17 Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan.maher@smgov.net>
Date: Tue, 23 Jul 2019 11:41:09 -0700
Subject: [PATCH 08/11] core-style projects across the sln

* dotnet cli commands can be used for all projects
* shared settings in Directory.build.props imported automatically
---
 Directory.build.props                         | 11 +++
 Net45.SODA.Tests/Net45.SODA.Tests.csproj      | 79 +++-------------
 Net45.SODA.Tests/Properties/AssemblyInfo.cs   | 12 ---
 Net45.SODA.Tests/packages.config              |  6 --
 .../Net45.Utilities.Tests.csproj              | 92 ++++---------------
 .../Properties/AssemblyInfo.cs                | 12 ---
 Net45.Utilities.Tests/packages.config         |  7 --
 .../NetCore22.Utilities.Tests.csproj          |  2 +-
 SODA.sln                                      |  6 +-
 SODA/Properties/AssemblyInfo.cs               |  4 +
 SODA/SODA.csproj                              | 14 +--
 SolutionInfo.cs                               | 10 --
 Utilities/Properties/AssemblyInfo.cs          |  4 +
 Utilities/Utilities.csproj                    | 12 +--
 build.cmd                                     | 23 ++---
 15 files changed, 70 insertions(+), 224 deletions(-)
 create mode 100644 Directory.build.props
 delete mode 100644 Net45.SODA.Tests/Properties/AssemblyInfo.cs
 delete mode 100644 Net45.SODA.Tests/packages.config
 delete mode 100644 Net45.Utilities.Tests/Properties/AssemblyInfo.cs
 delete mode 100644 Net45.Utilities.Tests/packages.config
 create mode 100644 SODA/Properties/AssemblyInfo.cs
 delete mode 100644 SolutionInfo.cs
 create mode 100644 Utilities/Properties/AssemblyInfo.cs

diff --git a/Directory.build.props b/Directory.build.props
new file mode 100644
index 0000000..bb9a026
--- /dev/null
+++ b/Directory.build.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <Company>City of Santa Monica, CA</Company>
+    <Authors>City of Santa Monica, CA</Authors>
+    <Copyright>Copyright 2019 City of Santa Monica, CA</Copyright>
+    <Product>SODA</Product>
+    <RepositoryUrl>https://github.com/CityofSantaMonica/SODA.NET</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Version>0.9.0</Version>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Net45.SODA.Tests/Net45.SODA.Tests.csproj b/Net45.SODA.Tests/Net45.SODA.Tests.csproj
index 6dc3f48..c08b6f0 100644
--- a/Net45.SODA.Tests/Net45.SODA.Tests.csproj
+++ b/Net45.SODA.Tests/Net45.SODA.Tests.csproj
@@ -1,72 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{309FA03E-E032-4547-A83C-389EC450FD1A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Net45.Tests</RootNamespace>
-    <AssemblyName>Net45.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>Net45.SODA.Tests</AssemblyName>
   </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="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\SODA\SODA.csproj">
-      <Project>{8c71d7e2-8ef0-4d7e-9eeb-06b1458d235e}</Project>
-      <Name>SODA</Name>
-    </ProjectReference>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\SODA\SODA.csproj" />
   </ItemGroup>
+
   <Import Project="..\SODA.Tests\SODA.Tests.projitems" Label="Shared" />
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <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\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
-  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/Net45.SODA.Tests/Properties/AssemblyInfo.cs b/Net45.SODA.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 42f4858..0000000
--- a/Net45.SODA.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Net45.SODA.Tests")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("309fa03e-e032-4547-a83c-389ec450fd1a")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Net45.SODA.Tests/packages.config b/Net45.SODA.Tests/packages.config
deleted file mode 100644
index 1ae39eb..0000000
--- a/Net45.SODA.Tests/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="3.12.0" targetFramework="net45" />
-  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/Net45.Utilities.Tests/Net45.Utilities.Tests.csproj b/Net45.Utilities.Tests/Net45.Utilities.Tests.csproj
index 9878b21..667409d 100644
--- a/Net45.Utilities.Tests/Net45.Utilities.Tests.csproj
+++ b/Net45.Utilities.Tests/Net45.Utilities.Tests.csproj
@@ -1,84 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Utilities.Net45.Tests</RootNamespace>
-    <AssemblyName>Utilities.Net45.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>Net45.SODA.Utilities.Tests</AssemblyName>
   </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="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
-    </Reference>
-    <Reference Include="ExcelDataReader.DataSet, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDataReader.DataSet.3.6.0\lib\net35\ExcelDataReader.DataSet.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\SODA\SODA.csproj">
-      <Project>{8c71d7e2-8ef0-4d7e-9eeb-06b1458d235e}</Project>
-      <Name>SODA</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Utilities\Utilities.csproj">
-      <Project>{3ba86351-2e4b-45bb-8e92-b9e803cdcd6e}</Project>
-      <Name>Utilities</Name>
-    </ProjectReference>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+    <ProjectReference Include="..\Utilities\Utilities.csproj" />
   </ItemGroup>
+
   <Import Project="..\Utilities.Tests\Utilities.Tests.projitems" Label="Shared" />
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <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\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
-  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/Net45.Utilities.Tests/Properties/AssemblyInfo.cs b/Net45.Utilities.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0d3341b..0000000
--- a/Net45.Utilities.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Net45.Utilities.Tests")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("763fffcb-49dd-4a86-b5a1-b51ea15ce764")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Net45.Utilities.Tests/packages.config b/Net45.Utilities.Tests/packages.config
deleted file mode 100644
index f952d75..0000000
--- a/Net45.Utilities.Tests/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ExcelDataReader" version="3.6.0" targetFramework="net45" />
-  <package id="ExcelDataReader.DataSet" version="3.6.0" targetFramework="net45" />
-  <package id="NUnit" version="3.12.0" targetFramework="net45" />
-  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj b/NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj
index 47eddc7..748c959 100644
--- a/NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj
+++ b/NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj
@@ -5,7 +5,7 @@
 
     <IsPackable>false</IsPackable>
 
-    <AssemblyName>NetCore22.Utilities.Tests</AssemblyName>
+    <AssemblyName>NetCore22.SODA.Utilities.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SODA.sln b/SODA.sln
index 70d099c..6562811 100644
--- a/SODA.sln
+++ b/SODA.sln
@@ -11,10 +11,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build.cmd = build.cmd
 		CONTRIBUTING.md = CONTRIBUTING.md
 		DEPLOYMENT.md = DEPLOYMENT.md
+		Directory.build.props = Directory.build.props
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		ReleaseNotes.md = ReleaseNotes.md
-		SolutionInfo.cs = SolutionInfo.cs
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SODA", "SODA\SODA.csproj", "{8C71D7E2-8EF0-4D7E-9EEB-06B1458D235E}"
@@ -27,9 +27,9 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SODA.Tests", "SODA.Tests\SO
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Utilities.Tests", "Utilities.Tests\Utilities.Tests.shproj", "{651FB983-B00B-445A-960B-850D21D17DB0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net45.SODA.Tests", "Net45.SODA.Tests\Net45.SODA.Tests.csproj", "{309FA03E-E032-4547-A83C-389EC450FD1A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net45.SODA.Tests", "Net45.SODA.Tests\Net45.SODA.Tests.csproj", "{309FA03E-E032-4547-A83C-389EC450FD1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net45.Utilities.Tests", "Net45.Utilities.Tests\Net45.Utilities.Tests.csproj", "{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net45.Utilities.Tests", "Net45.Utilities.Tests\Net45.Utilities.Tests.csproj", "{763FFFCB-49DD-4A86-B5A1-B51EA15CE764}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore22.SODA.Tests", "NetCore22.SODA.Tests\NetCore22.SODA.Tests.csproj", "{CFAEADE7-EBEA-40F8-9630-C699AA5F8274}"
 EndProject
diff --git a/SODA/Properties/AssemblyInfo.cs b/SODA/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..179e20d
--- /dev/null
+++ b/SODA/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Net45.SODA.Tests")]
+[assembly: InternalsVisibleTo("NetCore22.SODA.Tests")]
diff --git a/SODA/SODA.csproj b/SODA/SODA.csproj
index b82833a..78d1060 100644
--- a/SODA/SODA.csproj
+++ b/SODA/SODA.csproj
@@ -2,20 +2,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <AssemblyName>SODA</AssemblyName>
+    <RootNamespace>SODA</RootNamespace>
     <Description>Socrata Open Data API client library targeting .NET 4.5 and above.</Description>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>CSM.SodaDotNet</PackageId>
-    <Version>0.9.0</Version>
-    <Authors>City of Santa Monica, CA</Authors>
-    <Company>City of Santa Monica, CA</Company>
-    <Copyright>Copyright 2019 City of Santa Monica, CA</Copyright>
     <PackageTags>API OpenData Socrata SODA</PackageTags>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RepositoryUrl>https://github.com/CityofSantaMonica/SODA.NET</RepositoryUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageLicenseFile></PackageLicenseFile>
-    <PackageReleaseNotes>Package dependancies updated to latest releases
-
-Converted project to target multiple frameworks - Net Standard 2.0 and Net Framework 4.5</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/SolutionInfo.cs b/SolutionInfo.cs
deleted file mode 100644
index 06084bc..0000000
--- a/SolutionInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyCompany("City of Santa Monica, CA")]
-[assembly: AssemblyProduct("SODA")]
-[assembly: AssemblyCopyright("Copyright © 2018 City of Santa Monica, CA")]
-[assembly: AssemblyVersion("0.8.0")]
-[assembly: AssemblyFileVersion("0.8.0")]
-[assembly: AssemblyInformationalVersion("0.8.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Utilities/Properties/AssemblyInfo.cs b/Utilities/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f81c691
--- /dev/null
+++ b/Utilities/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Net45.SODA.Utilities.Tests")]
+[assembly: InternalsVisibleTo("NetCore22.SODA.Utilities.Tests")]
\ No newline at end of file
diff --git a/Utilities/Utilities.csproj b/Utilities/Utilities.csproj
index 6bc1fc5..576a54c 100644
--- a/Utilities/Utilities.csproj
+++ b/Utilities/Utilities.csproj
@@ -2,16 +2,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-    <PackageId>CSM.SodaDotNet.Utilities</PackageId>
-    <Version>0.9.0</Version>
-    <Authors>City of Santa Monica, CA</Authors>
+    <AssemblyName>SODA.Utilities</AssemblyName>
+    <RootNamespace>SODA.Utilities</RootNamespace>
     <Description>Library of helper classes and extension methods for working with Socrata Open Data portals.</Description>
-    <Copyright>Copyright 2019 City of Santa Monica, CA</Copyright>
-    <Product>SODA.Utilities</Product>
-    <PackageTags>EWS Excel SODA</PackageTags>
-    <RepositoryUrl>https://github.com/CityofSantaMonica/SODA.NET</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageId>CSM.SodaDotNet.Utilities</PackageId>
+    <PackageTags>EWS Excel SODA</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/build.cmd b/build.cmd
index cbc4ecc..238cdd8 100644
--- a/build.cmd
+++ b/build.cmd
@@ -8,32 +8,27 @@ if not "%1" == "" (set TARGET="%1")
 set BUILDMODE="Release"
 if not "%2" == "" (set BUILDMODE="%2")
 
-set MSBUILDDIR="%WINDIR%\Microsoft.NET\Framework\v4.0.30319"
 set SODADIR=".\SODA"
-set UTILSDIR=".\SODA.Utilities"
+set UTILSDIR=".\Utilities"
+set SODA="%SODADIR%\SODA.csproj"
+set UTILS="%UTILSDIR%\Utilities.csproj"
 
-echo Restoring NuGet package dependencies
+echo Restoring NuGet dependencies
 
-call nuget restore
+call dotnet restore --verbosity m
 
 echo Rebuilding solution with Configuration: %BUILDMODE%
 
-call %MSBUILDDIR%\msbuild.exe SODA.sln /m "/p:Configuration=%BUILDMODE%" "/p:Platform=Any CPU" /t:Clean,Build	
+call dotnet build SODA.sln "/p:Configuration=%BUILDMODE%" "/p:Platform=Any CPU" /t:Clean,Build
 
 echo Finished solution rebuild
 
 if %TARGET% == "CreatePackages" (
-	echo Creating NuGet packages with Configuration: %BUILDMODE%
+	echo Creating NuGet packages
 
-	call xcopy %SODADIR%\bin\%BUILDMODE%\*.* %SODADIR%\lib\ /y
-	call xcopy %UTILSDIR%\bin\%BUILDMODE%\*.* %UTILSDIR%\lib\ /y
-
-	call nuget pack %SODADIR%\SODA.csproj -Properties "Configuration=%BUILDMODE%;Platform=AnyCPU"
-	call nuget pack %UTILSDIR%\SODA.Utilities.csproj -IncludeReferencedProjects -Properties "Configuration=%BUILDMODE%;Platform=AnyCPU"
+	call dotnet pack %SODA% --no-build --output ..\
+	call dotnet pack %UTILS% --no-build --output ..\
 	
-	rd /S /Q %SODADIR%\lib
-	rd /S /Q %UTILSDIR%\lib
-
 	echo Finished NuGet package creation
 )
 

From d06a4fb545195b16678478d2546891e021e06a91 Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan.maher@smgov.net>
Date: Tue, 23 Jul 2019 14:39:09 -0700
Subject: [PATCH 09/11] updating appveyor pipeline for core

---
 DEPLOYMENT.md |  8 ++++----
 SODA.sln      |  1 -
 appveyor.yml  | 15 +++++++++++++--
 build.cmd     | 35 -----------------------------------
 4 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 build.cmd

diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 76864c0..72f0619 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -8,12 +8,12 @@ are passing, and you're happy with the state of things...
 
 1. Create a branch named `release`
 1. Update [`ReleaseNotes.md`](ReleaseNotes.md), following the existing format
-1. Bump the version number in [`SolutionInfo.cs`](SolutionInfo.cs) and the `.nuspec` and `appveyor.yml` files (if required)
+1. Bump the version number in [`Directory.build.props`](Directory.build.props)
 1. Push the branch to GitHub and create a pull request
-1. Run `.\build CreatePackages` to create the NuGet packages (locally) for the new version
+1. Create the NuGet packages (in the local solution root) for the new version: `dotnet pack --output ..\`
 1. Test the NuGet packages! [How to install NuGet package locally](http://stackoverflow.com/questions/10240029/how-to-install-a-nuget-package-nupkg-file-locally)
-1. If satisfied with the release, push the new packages up to NuGet
-1. Accept the pull request
+1. If satisfied with the release, accept the pull request
 1. Create a tag `git tag v#.#.#`. For example, to create a tag for 1.0.0 `git tag v1.0.0`
 1. [Create a new release](https://help.github.com/articles/creating-releases) using the tag
 you just created and pasting in the release notes you just wrote up. Attach a copy of the latest `.nupkg` files generated above.
+1. Push the new packages up to NuGet `dotnet nuget push`
diff --git a/SODA.sln b/SODA.sln
index 6562811..d075090 100644
--- a/SODA.sln
+++ b/SODA.sln
@@ -8,7 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
-		build.cmd = build.cmd
 		CONTRIBUTING.md = CONTRIBUTING.md
 		DEPLOYMENT.md = DEPLOYMENT.md
 		Directory.build.props = Directory.build.props
diff --git a/appveyor.yml b/appveyor.yml
index 44d56de..b60eab9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,17 @@
-version: 0.8.{build}
+version: 1.0.{build}
+
+image: Visual Studio 2017
+
 pull_requests:
   do_not_increment_build_number: true
+
 skip_tags: true
+
+before_build:
+  - dotnet restore --verbosity m
+
 build_script:
-- cmd: .\build.cmd
\ No newline at end of file
+  - dotnet build SODA.sln
+
+test_script:
+  - dotnet test
diff --git a/build.cmd b/build.cmd
deleted file mode 100644
index 238cdd8..0000000
--- a/build.cmd
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off
-
-cls
-
-set TARGET="Default"
-if not "%1" == "" (set TARGET="%1")
-
-set BUILDMODE="Release"
-if not "%2" == "" (set BUILDMODE="%2")
-
-set SODADIR=".\SODA"
-set UTILSDIR=".\Utilities"
-set SODA="%SODADIR%\SODA.csproj"
-set UTILS="%UTILSDIR%\Utilities.csproj"
-
-echo Restoring NuGet dependencies
-
-call dotnet restore --verbosity m
-
-echo Rebuilding solution with Configuration: %BUILDMODE%
-
-call dotnet build SODA.sln "/p:Configuration=%BUILDMODE%" "/p:Platform=Any CPU" /t:Clean,Build
-
-echo Finished solution rebuild
-
-if %TARGET% == "CreatePackages" (
-	echo Creating NuGet packages
-
-	call dotnet pack %SODA% --no-build --output ..\
-	call dotnet pack %UTILS% --no-build --output ..\
-	
-	echo Finished NuGet package creation
-)
-
-exit /B %errorlevel%
\ No newline at end of file

From 9fd4ffd4bbd9378d20ba33c051998a23853206b7 Mon Sep 17 00:00:00 2001
From: kevinsmgov <kevin.hobson@smgov.net>
Date: Tue, 23 Jul 2019 15:02:25 -0700
Subject: [PATCH 10/11] Core supports higher http version

---
 SODA.Tests/SodaRequestTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SODA.Tests/SodaRequestTests.cs b/SODA.Tests/SodaRequestTests.cs
index 746b77e..3aa8085 100644
--- a/SODA.Tests/SodaRequestTests.cs
+++ b/SODA.Tests/SodaRequestTests.cs
@@ -80,11 +80,11 @@ public void New_Returns_Request_With_Specified_Method(string input)
 
         [Test]
         [Category("SodaRequest")]
-        public void New_Returns_Request_Using_HTTP_1_1()
+        public void New_Returns_Request_Using_HTTP_1_1_Or_Greater()
         {
             var request = new SodaRequest(exampleUri, "GET", null, null, null);
 
-            Assert.AreEqual(new Version("1.1"), request.RequestMessage.Version);
+            Assert.GreaterOrEqual(request.RequestMessage.Version, new Version("1.1"));
         }
 
         [TestCase("appToken1234")]

From fff60ed577df88c606c6541dcfbfee76a8f3ebf0 Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan.maher@smgov.net>
Date: Wed, 24 Jul 2019 10:10:40 -0700
Subject: [PATCH 11/11] updating for 0.9.0

---
 DEPLOYMENT.md   | 6 +++---
 ReleaseNotes.md | 6 ++++++
 appveyor.yml    | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 72f0619..8e20101 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -8,12 +8,12 @@ are passing, and you're happy with the state of things...
 
 1. Create a branch named `release`
 1. Update [`ReleaseNotes.md`](ReleaseNotes.md), following the existing format
-1. Bump the version number in [`Directory.build.props`](Directory.build.props)
+1. Bump the version number in [`Directory.build.props`](Directory.build.props) and [`appveyor.yml`](appveyor.yml)
 1. Push the branch to GitHub and create a pull request
+1. If the build succeeds, accept the pull request
+1. Create and push a tag from the new HEAD `git tag v#.#.#` and `git push --tags`
 1. Create the NuGet packages (in the local solution root) for the new version: `dotnet pack --output ..\`
 1. Test the NuGet packages! [How to install NuGet package locally](http://stackoverflow.com/questions/10240029/how-to-install-a-nuget-package-nupkg-file-locally)
-1. If satisfied with the release, accept the pull request
-1. Create a tag `git tag v#.#.#`. For example, to create a tag for 1.0.0 `git tag v1.0.0`
 1. [Create a new release](https://help.github.com/articles/creating-releases) using the tag
 you just created and pasting in the release notes you just wrote up. Attach a copy of the latest `.nupkg` files generated above.
 1. Push the new packages up to NuGet `dotnet nuget push`
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 768926e..c7b6dcf 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,3 +1,9 @@
+### New in 0.9.0 (Released 2019/07/24)
+
+New features
+
+  - Support for .NET Core 2.2
+
 ### New in 0.8.0 (Released 2017/12/06)
 
 Bug fixes
diff --git a/appveyor.yml b/appveyor.yml
index b60eab9..d7247cd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.{build}
+version: 0.9.0-{build}
 
 image: Visual Studio 2017