diff options
| author | Elmer Thomas <elmer@thinkingserious.com> | 2015-11-11 11:23:49 -0800 |
|---|---|---|
| committer | Elmer Thomas <elmer@thinkingserious.com> | 2015-11-11 11:23:49 -0800 |
| commit | 916513f5f9db92db7f10e70b3599bd35ef94e324 (patch) | |
| tree | b39e0f0e03c6c3518202ee5810e6d2689dd4ce64 /SendGrid | |
| parent | 85291331846705096b35e75fc4d73491e4fecaaf (diff) | |
| download | sendgrid-csharp-916513f5f9db92db7f10e70b3599bd35ef94e324.zip sendgrid-csharp-916513f5f9db92db7f10e70b3599bd35ef94e324.tar.gz sendgrid-csharp-916513f5f9db92db7f10e70b3599bd35ef94e324.tar.bz2 | |
Updating build for Travis
Diffstat (limited to 'SendGrid')
| -rw-r--r-- | SendGrid/Example/app.config | 23 | ||||
| -rw-r--r-- | SendGrid/SendGrid.sln | 19 | ||||
| -rw-r--r-- | SendGrid/SendGridMail/Mail.csproj | 3 | ||||
| -rw-r--r-- | SendGrid/UnitTests/packages.config | 2 |
4 files changed, 25 insertions, 22 deletions
diff --git a/SendGrid/Example/app.config b/SendGrid/Example/app.config index f05baaa..ea6ea7f 100644 --- a/SendGrid/Example/app.config +++ b/SendGrid/Example/app.config @@ -1,27 +1,26 @@ -<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<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.2.18.0" newVersion="2.2.18.0" />
+ <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.2.18.0" newVersion="2.2.18.0"/>
</dependentAssembly>
<dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file +</configuration>
diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln index 7b84ae9..c026698 100644 --- a/SendGrid/SendGrid.sln +++ b/SendGrid/SendGrid.sln @@ -37,8 +37,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU
{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|x86.ActiveCfg = BuildNet45|Any CPU
{0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|x86.Build.0 = BuildNet45|Any CPU
{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Any CPU.ActiveCfg = BuildNet45|Any CPU
@@ -52,7 +52,8 @@ Global {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 = BuildNet45|Any CPU
- {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU
+ {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|x86.ActiveCfg = BuildNet45|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -64,8 +65,8 @@ Global {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|x86.ActiveCfg = Release|Any CPU
{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|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU
{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|x86.ActiveCfg = BuildNet45|Any CPU
{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|x86.Build.0 = BuildNet45|Any CPU
{3C687BEF-FF50-44AD-8315-2D4237281AF8}.Debug|Any CPU.ActiveCfg = BuildNet45|Any CPU
@@ -80,8 +81,8 @@ Global {3C687BEF-FF50-44AD-8315-2D4237281AF8}.Release|x86.ActiveCfg = Release|Any CPU
{1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|Any CPU.ActiveCfg = Release|Any CPU
{1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|Any CPU.Build.0 = Release|Any CPU
- {1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|Mixed Platforms.ActiveCfg = Release|Any CPU
- {1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|Mixed Platforms.Build.0 = Release|Any CPU
+ {1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU
{1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|x86.ActiveCfg = Release|Any CPU
{1C318867-440B-4EB9-99E3-C0CC2C556962}.BuildNet45|x86.Build.0 = Release|Any CPU
{1C318867-440B-4EB9-99E3-C0CC2C556962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -98,8 +99,8 @@ Global {1C318867-440B-4EB9-99E3-C0CC2C556962}.Release|x86.Build.0 = Release|Any CPU
{2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|Any CPU.ActiveCfg = Release|Any CPU
{2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|Any CPU.Build.0 = Release|Any CPU
- {2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|Mixed Platforms.ActiveCfg = Release|Any CPU
- {2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|Mixed Platforms.Build.0 = Release|Any CPU
+ {2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU
{2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|x86.ActiveCfg = Release|Any CPU
{2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.BuildNet45|x86.Build.0 = Release|Any CPU
{2BE80F7D-EBB3-47F5-8CCB-B0F634D51849}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/SendGrid/SendGridMail/Mail.csproj b/SendGrid/SendGridMail/Mail.csproj index 2106b6a..154fb43 100644 --- a/SendGrid/SendGridMail/Mail.csproj +++ b/SendGrid/SendGridMail/Mail.csproj @@ -74,18 +74,21 @@ <DefineConstants>TRACE, RELEASE</DefineConstants>
<DebugType>
</DebugType>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildNet45|AnyCPU' ">
<Optimize>false</Optimize>
<SignAssembly>false</SignAssembly>
<DebugType>
</DebugType>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<SignAssembly>false</SignAssembly>
<Optimize>false</Optimize>
<DebugType>
</DebugType>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
diff --git a/SendGrid/UnitTests/packages.config b/SendGrid/UnitTests/packages.config index 64b5d8e..505e588 100644 --- a/SendGrid/UnitTests/packages.config +++ b/SendGrid/UnitTests/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" /> + <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> </packages>
\ No newline at end of file |