Skip to content

V3 beta #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 24, 2015
Merged

V3 beta #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
778267f
Merge remote-tracking branch 'refs/remotes/origin/master' into v3_beta
thinkingserious Nov 24, 2015
9730c30
Updating assembly dependencies.
thinkingserious Nov 24, 2015
3734df9
Removing pfx files breaks Travis and creates an extra step for contri…
thinkingserious Nov 24, 2015
ad59f05
Working locally
thinkingserious Nov 24, 2015
7d0a414
Trying to make Travis happy
thinkingserious Nov 24, 2015
b9d064c
Try signing the classic way
thinkingserious Nov 24, 2015
1925f21
Adding classic keys
thinkingserious Nov 24, 2015
c5cc146
Updating assembly signings
thinkingserious Nov 24, 2015
6cb3660
Update build settings
thinkingserious Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ SendGrid/SendGrid.userprefs
SendGrid/packages/
SendGrid/TestResult.xml
SendGrid/SendGrid.sln.VisualState.xml

*.snk
*.pfx
*.PublicKey
6 changes: 3 additions & 3 deletions SendGrid/SendGrid.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ Global
{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.Build.0 = BuildNet45|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 = Debug|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = Release|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
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|x86.ActiveCfg = Debug|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{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
Expand Down
7 changes: 7 additions & 0 deletions SendGrid/SendGrid/SendGrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
</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>
Expand Down Expand Up @@ -63,6 +69,7 @@
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="sendgrid-csharp.snk" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Binary file added SendGrid/SendGrid/sendgrid-csharp.snk
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion SendGrid/SendGridMail/Mail.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
Expand Down
24 changes: 17 additions & 7 deletions SendGrid/SendGridMail/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,26 @@
[assembly: Guid("193fa200-8430-4206-aacd-2d2bb2dfa6cf")]

#if (BUILD)
[assembly: InternalsVisibleTo("Tests")]
[assembly: InternalsVisibleTo("Tests," + "" +
"PublicKey=0024000004800000940000000602000000240000525341310004000001000100812ec26a66c8e0" +
"8c790704ac4b46bcc9da9f4bca4da0ec7c06ce6dcd73baeb2c5525f36a237b253e80e16febb4c0" +
"52f50734d5e1cf3bf478d9c88f0f69df53b47306419182983bc35c33c3bafb5e90b9bd7aa7b9a9" +
"da09abe3667d50db891012e077e4b9aefe9799a58222fa67127c230219755d7670073c7463d90c" +
"f9e79dba")]
#elif (DEBUG)
[assembly: InternalsVisibleTo("Tests")]
[assembly: InternalsVisibleTo("Tests," + "" +
"PublicKey=0024000004800000940000000602000000240000525341310004000001000100812ec26a66c8e0" +
"8c790704ac4b46bcc9da9f4bca4da0ec7c06ce6dcd73baeb2c5525f36a237b253e80e16febb4c0" +
"52f50734d5e1cf3bf478d9c88f0f69df53b47306419182983bc35c33c3bafb5e90b9bd7aa7b9a9" +
"da09abe3667d50db891012e077e4b9aefe9799a58222fa67127c230219755d7670073c7463d90c" +
"f9e79dba")]
#else
[assembly: InternalsVisibleTo("Tests," + "" +
"PublicKey=00240000048000009400000006020000002400005253413100040000010001004126bffd5a4461" +
"e915193b2695401cee8d67bb14b252a34e5230e6468582f108aafbe31d39f2059240461d622e86" +
"2a294169d5f2659efe0d68b30d7ceee310356c70b54ece3c8c69bbd9db86e07c34ff4fd5d7528b" +
"3ddf078d272025cb7a588030c78020f5eb91872b38dc2832f561fe184715bb8edb6f0b3b644de5" +
"2bc588ae")]
"PublicKey=0024000004800000940000000602000000240000525341310004000001000100812ec26a66c8e0" +
"8c790704ac4b46bcc9da9f4bca4da0ec7c06ce6dcd73baeb2c5525f36a237b253e80e16febb4c0" +
"52f50734d5e1cf3bf478d9c88f0f69df53b47306419182983bc35c33c3bafb5e90b9bd7aa7b9a9" +
"da09abe3667d50db891012e077e4b9aefe9799a58222fa67127c230219755d7670073c7463d90c" +
"f9e79dba")]
#endif
// Version information for an assembly consists of the following four values:
//
Expand Down
Binary file added SendGrid/SendGridMail/SendGridMail.pfx
View file
Open in desktop
Binary file not shown.
Binary file added SendGrid/SendGridMail/sendgrid-csharp.snk
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions SendGrid/Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<PropertyGroup>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
Expand Down
2 changes: 2 additions & 0 deletions SendGrid/Tests/Transport/TestWebApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ internal class TestWebApi
private const string TestUsername = "username";
private const string TestPassword = "password";


[Test]
public void TestFetchFileBodies()
{
Expand Down Expand Up @@ -78,5 +79,6 @@ public void TestFetchFormParams()
Assert.True(
result.Any(r => r.Key == "x-smtpapi" && r.Value == String.Format("{{\"category\" : \"{0}\"}}", categoryName)));
}

}
}
Binary file added SendGrid/Tests/sendgrid-csharp.snk
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions SendGrid/UnitTest/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down Expand Up @@ -85,6 +91,7 @@
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="sendgrid-csharp.snk" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
Expand Down
Binary file added SendGrid/UnitTest/sendgrid-csharp.snk
View file
Open in desktop
Binary file not shown.