fix build configs and tests

6 files changed, 54 insertions, 47 deletions

diff --git a/SendGrid/.ci/tests.sh b/SendGrid/.ci/tests.sh
index 52d7516..e109d30 100755
--- a/SendGrid/.ci/tests.sh
+++ b/SendGrid/.ci/tests.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 
 mono --runtime=v4.0 .nuget/NuGet.exe install NUnit.Runners -Version 2.6.1 -o packages
-mono --runtime=v4.0 packages/NUnit.Runners.2.6.1/tools/nunit-console.exe -noxml -nodots -labels -stoponerror Tests/bin/BuildNet40/Tests.dll
+mono --runtime=v4.0 packages/NUnit.Runners.2.6.1/tools/nunit-console.exe -noxml -nodots -labels -stoponerror Tests/bin/BuildNet45/Tests.dll
 exit $?
diff --git a/SendGrid/Example/Example.csproj b/SendGrid/Example/Example.csproj
index 910bd0d..8152179 100644
--- a/SendGrid/Example/Example.csproj
+++ b/SendGrid/Example/Example.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>Example</RootNamespace>

     <AssemblyName>Example</AssemblyName>

-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <TargetFrameworkProfile>

     </TargetFrameworkProfile>

     <FileAlignment>512</FileAlignment>

@@ -36,19 +36,8 @@
     <WarningLevel>4</WarningLevel>

     <Prefer32Bit>false</Prefer32Bit>

   </PropertyGroup>

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

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

-    <WarningLevel>4</WarningLevel>

-    <Optimize>false</Optimize>

-  </PropertyGroup>

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

-    <OutputPath>bin\x86\ReleaseNet45\</OutputPath>

-    <PlatformTarget>AnyCPU</PlatformTarget>

-    <WarningLevel>4</WarningLevel>

-    <Optimize>false</Optimize>

-  </PropertyGroup>

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

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

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

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

     <WarningLevel>4</WarningLevel>

     <Optimize>false</Optimize>

   </PropertyGroup>

diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln
index bad3faa..15f66d6 100644
--- a/SendGrid/SendGrid.sln
+++ b/SendGrid/SendGrid.sln
@@ -43,11 +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

-		{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}.BuildNet45|Any CPU.ActiveCfg = BuildNet45|x86

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

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

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

+		{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|x86.Build.0 = BuildNet45|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

@@ -63,11 +63,11 @@ Global
 		{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}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

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

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

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

+		{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|x86.ActiveCfg = Debug|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

diff --git a/SendGrid/SendGridMail/Mail.csproj b/SendGrid/SendGridMail/Mail.csproj
index b6fa355..19ec745 100644
--- a/SendGrid/SendGridMail/Mail.csproj
+++ b/SendGrid/SendGridMail/Mail.csproj
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>

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

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

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

+    <SignAssembly>false</SignAssembly>

+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

+    <DebugType>pdbonly</DebugType>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DefineConstants>TRACE, DEBUG</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <RestorePackages>true</RestorePackages>

+    <Prefer32Bit>false</Prefer32Bit>

+    <BuildPackage>false</BuildPackage>

+    <SignAssembly>false</SignAssembly>

+  </PropertyGroup>

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

     <SignAssembly>false</SignAssembly>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <DebugType>pdbonly</DebugType>

     <OutputPath>bin\BuildNet45\</OutputPath>

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

+    <DefineConstants>TRACE, BUILD</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <RestorePackages>true</RestorePackages>

@@ -19,7 +32,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <DebugType>pdbonly</DebugType>

     <Optimize>True</Optimize>

-    <OutputPath>bin\ReleaseNet45\</OutputPath>

+    <OutputPath>bin\Release\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -44,7 +57,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>

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

     <RestorePackages>true</RestorePackages>

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

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

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

     <TargetFrameworkProfile />

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

@@ -58,19 +71,21 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

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

     <SignAssembly>true</SignAssembly>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

-    <Prefer32Bit>false</Prefer32Bit>

-    <DefineConstants>TRACE</DefineConstants>

+    <DefineConstants>TRACE, RELEASE</DefineConstants>

+    <DebugType>

+    </DebugType>

   </PropertyGroup>

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

     <Optimize>false</Optimize>

     <SignAssembly>false</SignAssembly>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

-    <Prefer32Bit>false</Prefer32Bit>

-    <DefineConstants>TRACE, BUILD</DefineConstants>

+    <DebugType>

+    </DebugType>

   </PropertyGroup>

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

-    <DefineConstants>TRACE, DEBUG</DefineConstants>

+    <SignAssembly>false</SignAssembly>

+    <Optimize>false</Optimize>

+    <DebugType>

+    </DebugType>

   </PropertyGroup>

   <ItemGroup>

     <Reference Include="SendGrid.SmtpApi">

@@ -124,4 +139,4 @@
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>
\ No newline at end of file
+</Project>

diff --git a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs
index 6067283..fc4b4f5 100644
--- a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs
+++ b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs
@@ -25,11 +25,15 @@ using System.Runtime.InteropServices;
 

 [assembly: Guid("193fa200-8430-4206-aacd-2d2bb2dfa6cf")]

 

-#if BUILD

+#if (BUILD)

 [assembly: InternalsVisibleTo("Tests")]

-#elif DEBUG

+#endif

+

+#if (DEBUG)

 [assembly: InternalsVisibleTo("Tests")]

-#else

+#endif

+

+#if (RELEASE)

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

                               "PublicKey=00240000048000009400000006020000002400005253413100040000010001004126bffd5a4461" +

                               "e915193b2695401cee8d67bb14b252a34e5230e6468582f108aafbe31d39f2059240461d622e86" +

diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj
index 41c828e..ff18252 100644
--- a/SendGrid/Tests/Tests.csproj
+++ b/SendGrid/Tests/Tests.csproj
@@ -16,7 +16,7 @@
     <DebugType>full</DebugType>

     <Optimize>False</Optimize>

     <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <DefineConstants>TRACE, DEBUG</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <Prefer32Bit>false</Prefer32Bit>

@@ -24,7 +24,6 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <SignAssembly>true</SignAssembly>

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

-    <DebugType>pdbonly</DebugType>

     <Optimize>True</Optimize>

     <OutputPath>bin\Release\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

@@ -38,17 +37,17 @@
     <ProjectGuid>{0319E73A-7039-4858-B047-1EDF88BB6BD1}</ProjectGuid>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <TargetFrameworkProfile />

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

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

+    <AssemblyName>Tests</AssemblyName>

   </PropertyGroup>

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

     <DefineConstants>TRACE, BUILD</DefineConstants>

-    <Prefer32Bit>false</Prefer32Bit>

+    <SignAssembly>false</SignAssembly>

   </PropertyGroup>

   <PropertyGroup>

     <OutputType>Library</OutputType>

   </PropertyGroup>

-  <PropertyGroup>

-    <StartupObject />

-  </PropertyGroup>

   <ItemGroup>

     <Reference Include="Moq">

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

@@ -77,7 +76,7 @@
   </ItemGroup>

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