deprecate NET40

8 files changed, 86 insertions, 199 deletions

diff --git a/SendGrid/Example/Example.csproj b/SendGrid/Example/Example.csproj
index d498fb2..910bd0d 100644
--- a/SendGrid/Example/Example.csproj
+++ b/SendGrid/Example/Example.csproj
@@ -56,11 +56,6 @@
     <Reference Include="System" />

     <Reference Include="System.Core" />

     <Reference Include="System.Net" />

-    <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="Program.cs" />

@@ -91,4 +86,4 @@
       <Name>Mail</Name>

     </ProjectReference>

   </ItemGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln
index 5338798..bad3faa 100644
--- a/SendGrid/SendGrid.sln
+++ b/SendGrid/SendGrid.sln
@@ -1,6 +1,6 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2012

+# Visual Studio 2013

 VisualStudioVersion = 12.0.30501.0

 MinimumVisualStudioVersion = 10.0.40219.1

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{0319E73A-7039-4858-B047-1EDF88BB6BD1}"

@@ -17,28 +17,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mail", "SendGridMail\Mail.c
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		BuildNet40|Any CPU = BuildNet40|Any CPU

-		BuildNet40|Mixed Platforms = BuildNet40|Mixed Platforms

-		BuildNet40|x86 = BuildNet40|x86

+		BuildNet45|Any CPU = BuildNet45|Any CPU

+		BuildNet45|Mixed Platforms = BuildNet45|Mixed Platforms

+		BuildNet45|x86 = BuildNet45|x86

 		Debug|Any CPU = Debug|Any CPU

 		Debug|Mixed Platforms = Debug|Mixed Platforms

 		Debug|x86 = Debug|x86

 		Release|Any CPU = Release|Any CPU

 		Release|Mixed Platforms = Release|Mixed Platforms

 		Release|x86 = Release|x86

-		ReleaseNet40|Any CPU = ReleaseNet40|Any CPU

-		ReleaseNet40|Mixed Platforms = ReleaseNet40|Mixed Platforms

-		ReleaseNet40|x86 = ReleaseNet40|x86

-		ReleaseNet45|Any CPU = ReleaseNet45|Any CPU

-		ReleaseNet45|Mixed Platforms = ReleaseNet45|Mixed Platforms

-		ReleaseNet45|x86 = ReleaseNet45|x86

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet40|Any CPU.ActiveCfg = BuildNet40|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet40|Any CPU.Build.0 = BuildNet40|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet40|Mixed Platforms.ActiveCfg = BuildNet40|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet40|Mixed Platforms.Build.0 = BuildNet40|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet40|x86.ActiveCfg = BuildNet40|Any CPU

+		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|Any CPU.ActiveCfg = BuildNet45|Any CPU

+		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|Any CPU.Build.0 = BuildNet45|Any CPU

+		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU

+		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|Mixed Platforms.Build.0 = BuildNet45|Any CPU

+		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|x86.ActiveCfg = BuildNet45|Any CPU

 		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

@@ -49,46 +43,11 @@ Global
 		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

 		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU

 		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|x86.ActiveCfg = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|Any CPU.ActiveCfg = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|Any CPU.Build.0 = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|Mixed Platforms.Build.0 = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|x86.ActiveCfg = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|Any CPU.ActiveCfg = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|Any CPU.Build.0 = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|Mixed Platforms.ActiveCfg = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|Mixed Platforms.Build.0 = Release|Any CPU

-		{0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|x86.ActiveCfg = Release|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet40|Any CPU.ActiveCfg = BuildNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet40|Any CPU.Build.0 = BuildNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet40|Mixed Platforms.ActiveCfg = BuildNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet40|Mixed Platforms.Build.0 = BuildNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet40|x86.ActiveCfg = BuildNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Any CPU.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Any CPU.Build.0 = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Mixed Platforms.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Mixed Platforms.Build.0 = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|x86.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Any CPU.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Any CPU.Build.0 = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Mixed Platforms.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Mixed Platforms.Build.0 = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|x86.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet40|Any CPU.ActiveCfg = ReleaseNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet40|Any CPU.Build.0 = ReleaseNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet40|Mixed Platforms.ActiveCfg = ReleaseNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet40|Mixed Platforms.Build.0 = ReleaseNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet40|x86.ActiveCfg = ReleaseNet40|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet45|Any CPU.Build.0 = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet45|Mixed Platforms.ActiveCfg = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet45|Mixed Platforms.Build.0 = ReleaseNet45|Any CPU

-		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.ReleaseNet45|x86.ActiveCfg = ReleaseNet45|Any CPU

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet40|Any CPU.ActiveCfg = BuildNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet40|Mixed Platforms.ActiveCfg = BuildNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet40|Mixed Platforms.Build.0 = BuildNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet40|x86.ActiveCfg = BuildNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet40|x86.Build.0 = BuildNet40|x86

+		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Any CPU.ActiveCfg = BuildNet40|x86

+		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = BuildNet40|x86

+		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.Build.0 = BuildNet40|x86

+		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|x86.ActiveCfg = BuildNet40|x86

+		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|x86.Build.0 = BuildNet40|x86

 		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Any CPU.ActiveCfg = Debug|x86

 		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86

 		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.Build.0 = Debug|x86

@@ -99,20 +58,26 @@ Global
 		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.Build.0 = Release|x86

 		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|x86.ActiveCfg = Release|x86

 		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|x86.Build.0 = Release|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet40|Any CPU.ActiveCfg = ReleaseNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet40|Mixed Platforms.ActiveCfg = ReleaseNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet40|x86.ActiveCfg = ReleaseNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet40|x86.Build.0 = ReleaseNet40|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet45|Mixed Platforms.ActiveCfg = ReleaseNet45|x86

-		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.ReleaseNet45|x86.ActiveCfg = ReleaseNet45|x86

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Any CPU.ActiveCfg = BuildNet45|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Any CPU.Build.0 = BuildNet45|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Mixed Platforms.Build.0 = BuildNet45|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|x86.ActiveCfg = BuildNet45|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Any CPU.ActiveCfg = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Any CPU.Build.0 = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Mixed Platforms.Build.0 = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|x86.ActiveCfg = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Any CPU.Build.0 = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|Mixed Platforms.Build.0 = Release|Any CPU

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|x86.ActiveCfg = Release|Any CPU

 	EndGlobalSection

-	GlobalSection(NestedProjects) = preSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 	GlobalSection(MonoDevelopProperties) = preSolution

 		StartupItem = Tests\Tests.csproj

 	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

 EndGlobal

diff --git a/SendGrid/SendGridMail/Mail.csproj b/SendGrid/SendGridMail/Mail.csproj
index 5a77684..9968f16 100644
--- a/SendGrid/SendGridMail/Mail.csproj
+++ b/SendGrid/SendGridMail/Mail.csproj
@@ -1,22 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseNet40'">

-    <SignAssembly>true</SignAssembly>

-    <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

-    <DebugType>pdbonly</DebugType>

-    <Optimize>True</Optimize>

-    <OutputPath>bin\ReleaseNet40\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)' == 'BuildNet40'">

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+  <PropertyGroup Condition="'$(Configuration)' == 'BuildNet45' Or '$(Configuration)' == 'Debug'">

+    <SignAssembly>false</SignAssembly>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <DebugType>pdbonly</DebugType>

-    <OutputPath>bin\BuildNet40\</OutputPath>

-    <DefineConstants>TRACE, BUILD</DefineConstants>

+    <OutputPath>bin\BuildNet45\</OutputPath>

+    <DefineConstants>TRACE, BUILD, DEBUG</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <RestorePackages>true</RestorePackages>

@@ -24,7 +13,7 @@
     <BuildPackage>false</BuildPackage>

     <SignAssembly>false</SignAssembly>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)' == 'ReleaseNet45'">

+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">

     <SignAssembly>true</SignAssembly>

     <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

@@ -57,6 +46,8 @@
     <RestorePackages>true</RestorePackages>

     <Configuration Condition=" '$(Configuration)' == '' ">ReleaseNet40</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <TargetFrameworkProfile />

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

   </PropertyGroup>

   <PropertyGroup>

     <OutputType>Library</OutputType>

@@ -64,41 +55,23 @@
   <PropertyGroup>

     <AssemblyName>SendGridMail</AssemblyName>

   </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNet40|AnyCPU' ">

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

     <SignAssembly>true</SignAssembly>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <Prefer32Bit>false</Prefer32Bit>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

   </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildNet40|AnyCPU' ">

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildNet45|AnyCPU' ">

     <Optimize>false</Optimize>

     <SignAssembly>false</SignAssembly>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNet45|AnyCPU' ">

-    <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

-    <SignAssembly>true</SignAssembly>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <Prefer32Bit>false</Prefer32Bit>

+    <DefineConstants>TRACE, BUILD</DefineConstants>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">

+    <DefineConstants>TRACE, DEBUG</DefineConstants>

   </PropertyGroup>

-  <ItemGroup Condition="'$(Configuration)' == 'ReleaseNet40' Or '$(Configuration)' == 'BuildNet40'">

-    <Reference Include="System.Threading.Tasks">

-      <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Threading.Tasks.dll</HintPath>

-    </Reference>

-    <Reference Include="System.Runtime">

-      <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Runtime.dll</HintPath>

-    </Reference>

-    <Reference Include="System.IO">

-      <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.IO.dll</HintPath>

-    </Reference>

-    <Reference Include="Microsoft.Threading.Tasks">

-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>

-    </Reference>

-    <Reference Include="Microsoft.Threading.Tasks.Extensions">

-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>

-    </Reference>

-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">

-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>

-    </Reference>

-  </ItemGroup>

   <ItemGroup>

     <Reference Include="SendGrid.SmtpApi">

       <HintPath>..\packages\SendGrid.SmtpApi.1.1.3\lib\net40\SendGrid.SmtpApi.dll</HintPath>

@@ -107,14 +80,6 @@
     <Reference Include="System.Core" />

     <Reference Include="System.Net" />

     <Reference Include="System.Net.Http" />

-    <Reference Include="System.Net.Http.WebRequest" />

-    <Reference Include="System.Runtime.Serialization" />

-    <Reference Include="System.ServiceModel.Web" />

-    <Reference Include="System.Web" />

-    <Reference Include="System.Xml.Linq" />

-    <Reference Include="System.Data.DataSetExtensions" />

-    <Reference Include="Microsoft.CSharp" />

-    <Reference Include="System.Data" />

     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

diff --git a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs
index 019e8b1..dbff93a 100644
--- a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs
+++ b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs
@@ -27,6 +27,8 @@ using System.Runtime.InteropServices;
 

 #if (BUILD)

 [assembly: InternalsVisibleTo("Tests")]

+#elif (DEBUG)

+[assembly: InternalsVisibleTo("Tests")]

 #else

 [assembly: InternalsVisibleTo("Tests," + "" +

                               "PublicKey=00240000048000009400000006020000002400005253413100040000010001004126bffd5a4461" +

@@ -46,5 +48,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:

 // [assembly: AssemblyVersion("1.0.*")]

 

-[assembly: AssemblyVersion("3.0.3")]

-[assembly: AssemblyFileVersion("3.0.3")]
\ No newline at end of file
+[assembly: AssemblyVersion("4.0.0")]

+[assembly: AssemblyFileVersion("4.0.0")]
\ No newline at end of file
diff --git a/SendGrid/SendGridMail/packages.config b/SendGrid/SendGridMail/packages.config
index 2ac00e6..d05ec44 100644
--- a/SendGrid/SendGridMail/packages.config
+++ b/SendGrid/SendGridMail/packages.config
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40" />

-  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />

-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />

   <package id="SendGrid.SmtpApi" version="1.1.3" targetFramework="net40" />

 </packages>
\ No newline at end of file
diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj
index 19d501e..41c828e 100644
--- a/SendGrid/Tests/Tests.csproj
+++ b/SendGrid/Tests/Tests.csproj
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProjectGuid>{0319E73A-7039-4858-B047-1EDF88BB6BD1}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>Tests</RootNamespace>

-    <AssemblyName>Tests</AssemblyName>

-    <FileAlignment>512</FileAlignment>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

-    <TargetFrameworkProfile />

-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>

-    <RestorePackages>true</RestorePackages>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'BuildNet40' ">

+  <PropertyGroup Condition=" '$(Configuration)' == 'BuildNet45' ">

     <SignAssembly>false</SignAssembly>

     <DebugSymbols>True</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>False</Optimize>

-    <OutputPath>bin\BuildNet40\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <OutputPath>bin\BuildNet45\</OutputPath>

+    <DefineConstants>BUILD;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <Prefer32Bit>false</Prefer32Bit>

@@ -30,7 +16,7 @@
     <DebugType>full</DebugType>

     <Optimize>False</Optimize>

     <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <Prefer32Bit>false</Prefer32Bit>

@@ -46,21 +32,26 @@
     <WarningLevel>4</WarningLevel>

     <Prefer32Bit>false</Prefer32Bit>

   </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildNet40|AnyCPU' ">

-    <SignAssembly>false</SignAssembly>

+  <PropertyGroup>

+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>

+    <RestorePackages>true</RestorePackages>

+    <ProjectGuid>{0319E73A-7039-4858-B047-1EDF88BB6BD1}</ProjectGuid>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <TargetFrameworkProfile />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'BuildNet45|AnyCPU'">

+    <DefineConstants>TRACE, BUILD</DefineConstants>

+    <Prefer32Bit>false</Prefer32Bit>

+  </PropertyGroup>

+  <PropertyGroup>

+    <OutputType>Library</OutputType>

+  </PropertyGroup>

+  <PropertyGroup>

+    <StartupObject />

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Microsoft.Threading.Tasks">

-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>

-    </Reference>

-    <Reference Include="Microsoft.Threading.Tasks.Extensions">

-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>

-    </Reference>

-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">

-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>

-    </Reference>

     <Reference Include="Moq">

-      <HintPath>..\packages\Moq.4.2.1402.2112\lib\NET40\Moq.dll</HintPath>

+      <HintPath>..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

     </Reference>

     <Reference Include="nunit.framework">

       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>

@@ -70,21 +61,7 @@
     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core" />

-    <Reference Include="System.IO">

-      <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.IO.dll</HintPath>

-    </Reference>

     <Reference Include="System.Net" />

-    <Reference Include="System.Runtime">

-      <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Runtime.dll</HintPath>

-    </Reference>

-    <Reference Include="System.Threading.Tasks">

-      <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Threading.Tasks.dll</HintPath>

-    </Reference>

-    <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="Properties\AssemblyInfo.cs" />

@@ -98,24 +75,12 @@
     </None>

     <None Include="sendgrid-csharp.snk" />

   </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>

-  -->

-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">

-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />

-    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />

-  </Target>

-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

   <ItemGroup>

     <ProjectReference Include="..\SendGridMail\Mail.csproj">

-      <Project>{3C687BEF-FF50-44AD-8315-2D4237281AF8}</Project>

+      <Project>{3c687bef-ff50-44ad-8315-2d4237281af8}</Project>

       <Name>Mail</Name>

     </ProjectReference>

   </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

 </Project>
\ No newline at end of file
diff --git a/SendGrid/Tests/app.config b/SendGrid/Tests/app.config
index ad37edb..1696bcc 100644
--- a/SendGrid/Tests/app.config
+++ b/SendGrid/Tests/app.config
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <configuration>

   <runtime>

     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

       <dependentAssembly>

-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />

+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

+        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>

       </dependentAssembly>

       <dependentAssembly>

-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />

+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

+        <bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0"/>

       </dependentAssembly>

       <dependentAssembly>

-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>

       </dependentAssembly>

     </assemblyBinding>

   </runtime>

-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

diff --git a/SendGrid/Tests/packages.config b/SendGrid/Tests/packages.config
index f3e3a50..25c4bf6 100644
--- a/SendGrid/Tests/packages.config
+++ b/SendGrid/Tests/packages.config
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 

 <packages>

-  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40" />

-  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />

   <package id="Moq" version="4.2.1402.2112" targetFramework="net40" />

   <package id="NUnit" version="2.6.3" targetFramework="net40" />

   <package id="SendGrid.SmtpApi" version="1.1.3" targetFramework="net40" />