diff options
| -rwxr-xr-x[-rw-r--r--] | SendGrid/.ci/tests.sh | 0 | ||||
| -rw-r--r-- | SendGrid/Example/Example.csproj | 34 | ||||
| -rw-r--r-- | SendGrid/Example/app.config | 4 | ||||
| -rw-r--r-- | SendGrid/SendGrid.sln | 68 | ||||
| -rw-r--r-- | SendGrid/SendGridMail/Mail.csproj | 48 | ||||
| -rw-r--r-- | SendGrid/SendGridMail/Properties/AssemblyInfo.cs | 6 | ||||
| -rw-r--r-- | SendGrid/SendGridMail/packages.config | 8 | ||||
| -rw-r--r-- | SendGrid/Tests/Tests.csproj | 40 | ||||
| -rw-r--r-- | SendGrid/Tests/app.config | 4 | ||||
| -rw-r--r-- | SendGrid/Tests/packages.config | 5 |
10 files changed, 101 insertions, 116 deletions
diff --git a/SendGrid/.ci/tests.sh b/SendGrid/.ci/tests.sh index 62e15d8..62e15d8 100644..100755 --- a/SendGrid/.ci/tests.sh +++ b/SendGrid/.ci/tests.sh diff --git a/SendGrid/Example/Example.csproj b/SendGrid/Example/Example.csproj index 4511d6e..603771f 100644 --- a/SendGrid/Example/Example.csproj +++ b/SendGrid/Example/Example.csproj @@ -3,8 +3,6 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -40,13 +38,19 @@ </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>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<ItemGroup>
<Reference Include="SendGrid.SmtpApi">
@@ -55,20 +59,6 @@ <Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net" />
- <Reference Include="System.Net.Http, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.dll</HintPath>
- </Reference>
- <Reference Include="System.Net.Http.Extensions">
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="System.Net.Http.Primitives">
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Primitives.dll</HintPath>
- </Reference>
- <Reference Include="System.Net.Http.WebRequest, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
- </Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -87,12 +77,6 @@ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\SendGridMail\Mail.csproj">
- <Project>{3c687bef-ff50-44ad-8315-2d4237281af8}</Project>
- <Name>Mail</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -104,4 +88,10 @@ <Target Name="AfterBuild">
</Target>
-->
+ <ItemGroup>
+ <ProjectReference Include="..\SendGridMail\Mail.csproj">
+ <Project>{3C687BEF-FF50-44AD-8315-2D4237281AF8}</Project>
+ <Name>Mail</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/SendGrid/Example/app.config b/SendGrid/Example/app.config index 0ecd483..e7e5866 100644 --- a/SendGrid/Example/app.config +++ b/SendGrid/Example/app.config @@ -8,11 +8,11 @@ <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.8.0" newVersion="2.6.8.0" />
+ <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.8.0" newVersion="2.6.8.0" />
+ <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" />
diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln index af2fcae..5338798 100644 --- a/SendGrid/SendGrid.sln +++ b/SendGrid/SendGrid.sln @@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 2012
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}"
@@ -49,34 +49,16 @@ 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 = ReleaseNet40|Any CPU
- {0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|Mixed Platforms.ActiveCfg = ReleaseNet40|Any CPU
- {0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet40|x86.ActiveCfg = ReleaseNet40|Any CPU
- {0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|Any CPU.ActiveCfg = ReleaseNet45|Any CPU
- {0319E73A-7039-4858-B047-1EDF88BB6BD1}.ReleaseNet45|Mixed Platforms.ActiveCfg = ReleaseNet45|Any CPU
- {0319E73A-7039-4858-B047-1EDF88BB6BD1}.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}.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
- {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|x86.ActiveCfg = Debug|x86
- {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|x86.Build.0 = Debug|x86
- {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Any CPU.ActiveCfg = Release|x86
- {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {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
+ {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
@@ -102,11 +84,35 @@ Global {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}.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
+ {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|x86.ActiveCfg = Debug|x86
+ {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|x86.Build.0 = Debug|x86
+ {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Any CPU.ActiveCfg = Release|x86
+ {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {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
EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
+ GlobalSection(NestedProjects) = preSolution
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 5786116..5a77684 100644 --- a/SendGrid/SendGridMail/Mail.csproj +++ b/SendGrid/SendGridMail/Mail.csproj @@ -16,7 +16,7 @@ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DebugType>pdbonly</DebugType>
<OutputPath>bin\BuildNet40\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>TRACE, BUILD</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<RestorePackages>true</RestorePackages>
@@ -55,29 +55,31 @@ <BootstrapperEnabled>true</BootstrapperEnabled>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <Configuration Condition=" '$(Configuration)' == '' ">ReleaseNet40</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>
<PropertyGroup>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup>
- <StartupObject />
- </PropertyGroup>
- <PropertyGroup>
<AssemblyName>SendGridMail</AssemblyName>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNet40|AnyCPU' ">
+ <AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
+ <SignAssembly>true</SignAssembly>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildNet40|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>
+ </PropertyGroup>
<ItemGroup Condition="'$(Configuration)' == 'ReleaseNet40' Or '$(Configuration)' == 'BuildNet40'">
- <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
- </Reference>
<Reference Include="System.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Threading.Tasks.dll</HintPath>
</Reference>
@@ -87,6 +89,15 @@ <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">
@@ -141,11 +152,6 @@ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <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>
<!-- 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/SendGrid/SendGridMail/Properties/AssemblyInfo.cs b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs index 3ae7c11..019e8b1 100644 --- a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs +++ b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs @@ -1,6 +1,4 @@ -#define build
-
-using System.Reflection;
+using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -27,7 +25,7 @@ using System.Runtime.InteropServices; [assembly: Guid("193fa200-8430-4206-aacd-2d2bb2dfa6cf")]
-#if (build)
+#if (BUILD)
[assembly: InternalsVisibleTo("Tests")]
#else
[assembly: InternalsVisibleTo("Tests," + "" +
diff --git a/SendGrid/SendGridMail/packages.config b/SendGrid/SendGridMail/packages.config index 488a394..2ac00e6 100644 --- a/SendGrid/SendGridMail/packages.config +++ b/SendGrid/SendGridMail/packages.config @@ -1,7 +1,7 @@ <?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" />
- <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40"/>
- <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40"/>
-</packages>
+</packages>
\ No newline at end of file diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj index f27ab40..83171f9 100644 --- a/SendGrid/Tests/Tests.csproj +++ b/SendGrid/Tests/Tests.csproj @@ -3,8 +3,6 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0319E73A-7039-4858-B047-1EDF88BB6BD1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -48,6 +46,9 @@ <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildNet40|AnyCPU' ">
+ <SignAssembly>false</SignAssembly>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -79,20 +80,6 @@ <HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.IO.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
- <Reference Include="System.Net.Http, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.dll</HintPath>
- </Reference>
- <Reference Include="System.Net.Http.Extensions">
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Extensions.dll</HintPath>
- </Reference>
- <Reference Include="System.Net.Http.Primitives">
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.Primitives.dll</HintPath>
- </Reference>
- <Reference Include="System.Net.Http.WebRequest, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Microsoft.Net.Http.2.2.18\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
- </Reference>
<Reference Include="System.Runtime">
<HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Runtime.dll</HintPath>
</Reference>
@@ -117,12 +104,6 @@ </None>
<None Include="sendgrid-csharp.snk" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\SendGridMail\Mail.csproj">
- <Project>{3c687bef-ff50-44ad-8315-2d4237281af8}</Project>
- <Name>Mail</Name>
- </ProjectReference>
- </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.
@@ -131,11 +112,16 @@ <Target Name="AfterBuild">
</Target>
-->
- <Import Project="..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" />
+ <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.13\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.13\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" />
+ <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')" />
-</Project>
-
+ <ItemGroup>
+ <ProjectReference Include="..\SendGridMail\Mail.csproj">
+ <Project>{3C687BEF-FF50-44AD-8315-2D4237281AF8}</Project>
+ <Name>Mail</Name>
+ </ProjectReference>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/SendGrid/Tests/app.config b/SendGrid/Tests/app.config index 9a90fbb..ad37edb 100644 --- a/SendGrid/Tests/app.config +++ b/SendGrid/Tests/app.config @@ -4,11 +4,11 @@ <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.6.0" newVersion="2.6.6.0" />
+ <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.6.0" newVersion="2.6.6.0" />
+ <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" />
diff --git a/SendGrid/Tests/packages.config b/SendGrid/Tests/packages.config index 52efbcb..f3e3a50 100644 --- a/SendGrid/Tests/packages.config +++ b/SendGrid/Tests/packages.config @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40"/>
- <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40"/>
- <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net40" />
+ <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" />
|