Skip to content

Commit d685ac8

Browse files
thinkingseriousthinkingserious
committed
Merge pull request #163 from sendgrid/v3_beta
V3 beta
2 parents f46affc + 6cb3660 commit d685ac8

File tree

13 files changed

+45
-13
lines changed

13 files changed

+45
-13
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ SendGrid/SendGrid.userprefs
1818
SendGrid/packages/
1919
SendGrid/TestResult.xml
2020
SendGrid/SendGrid.sln.VisualState.xml
21-
22-
*.snk
21+
*.pfx
22+
*.PublicKey

‎SendGrid/SendGrid.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ Global
5252
{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.Build.0 = BuildNet45|Any CPU
5353
{0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|x86.ActiveCfg = Release|Any CPU
5454
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Any CPU.ActiveCfg = BuildNet45|Any CPU
55-
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = Debug|Any CPU
55+
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = Release|Any CPU
5656
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|x86.ActiveCfg = BuildNet45|Any CPU
5757
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
58+
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
5959
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|x86.ActiveCfg = Debug|Any CPU
6060
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
61-
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
61+
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
6262
{F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|x86.ActiveCfg = Release|Any CPU
6363
{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Any CPU.ActiveCfg = BuildNet45|Any CPU
6464
{3C687BEF-FF50-44AD-8315-2D4237281AF8}.BuildNet45|Any CPU.Build.0 = BuildNet45|Any CPU

‎SendGrid/SendGrid/SendGrid.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<PropertyGroup>
3737
<StartupObject />
3838
</PropertyGroup>
39+
<PropertyGroup>
40+
<SignAssembly>true</SignAssembly>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
44+
</PropertyGroup>
3945
<ItemGroup>
4046
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4147
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -63,6 +69,7 @@
6369
<ItemGroup>
6470
<None Include="App.config" />
6571
<None Include="packages.config" />
72+
<None Include="sendgrid-csharp.snk" />
6673
</ItemGroup>
6774
<ItemGroup />
6875
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎SendGrid/SendGrid/sendgrid-csharp.snk‎

596 Bytes
Binary file not shown.

‎SendGrid/SendGridMail/Mail.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<Prefer32Bit>false</Prefer32Bit>
9292
</PropertyGroup>
9393
<PropertyGroup>
94-
<SignAssembly>false</SignAssembly>
94+
<SignAssembly>true</SignAssembly>
9595
</PropertyGroup>
9696
<PropertyGroup>
9797
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>

‎SendGrid/SendGridMail/Properties/AssemblyInfo.cs‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,26 @@
2626
[assembly: Guid("193fa200-8430-4206-aacd-2d2bb2dfa6cf")]
2727

2828
#if (BUILD)
29-
[assembly: InternalsVisibleTo("Tests")]
29+
[assembly: InternalsVisibleTo("Tests," + "" +
30+
"PublicKey=0024000004800000940000000602000000240000525341310004000001000100812ec26a66c8e0" +
31+
"8c790704ac4b46bcc9da9f4bca4da0ec7c06ce6dcd73baeb2c5525f36a237b253e80e16febb4c0" +
32+
"52f50734d5e1cf3bf478d9c88f0f69df53b47306419182983bc35c33c3bafb5e90b9bd7aa7b9a9" +
33+
"da09abe3667d50db891012e077e4b9aefe9799a58222fa67127c230219755d7670073c7463d90c" +
34+
"f9e79dba")]
3035
#elif (DEBUG)
31-
[assembly: InternalsVisibleTo("Tests")]
36+
[assembly: InternalsVisibleTo("Tests," + "" +
37+
"PublicKey=0024000004800000940000000602000000240000525341310004000001000100812ec26a66c8e0" +
38+
"8c790704ac4b46bcc9da9f4bca4da0ec7c06ce6dcd73baeb2c5525f36a237b253e80e16febb4c0" +
39+
"52f50734d5e1cf3bf478d9c88f0f69df53b47306419182983bc35c33c3bafb5e90b9bd7aa7b9a9" +
40+
"da09abe3667d50db891012e077e4b9aefe9799a58222fa67127c230219755d7670073c7463d90c" +
41+
"f9e79dba")]
3242
#else
3343
[assembly: InternalsVisibleTo("Tests," + "" +
34-
"PublicKey=00240000048000009400000006020000002400005253413100040000010001004126bffd5a4461" +
35-
"e915193b2695401cee8d67bb14b252a34e5230e6468582f108aafbe31d39f2059240461d622e86" +
36-
"2a294169d5f2659efe0d68b30d7ceee310356c70b54ece3c8c69bbd9db86e07c34ff4fd5d7528b" +
37-
"3ddf078d272025cb7a588030c78020f5eb91872b38dc2832f561fe184715bb8edb6f0b3b644de5" +
38-
"2bc588ae")]
44+
"PublicKey=0024000004800000940000000602000000240000525341310004000001000100812ec26a66c8e0" +
45+
"8c790704ac4b46bcc9da9f4bca4da0ec7c06ce6dcd73baeb2c5525f36a237b253e80e16febb4c0" +
46+
"52f50734d5e1cf3bf478d9c88f0f69df53b47306419182983bc35c33c3bafb5e90b9bd7aa7b9a9" +
47+
"da09abe3667d50db891012e077e4b9aefe9799a58222fa67127c230219755d7670073c7463d90c" +
48+
"f9e79dba")]
3949
#endif
4050
// Version information for an assembly consists of the following four values:
4151
//

‎SendGrid/SendGridMail/SendGridMail.pfx‎

1.67 KB
Binary file not shown.

‎SendGrid/SendGridMail/sendgrid-csharp.snk‎

596 Bytes
Binary file not shown.

‎SendGrid/Tests/Tests.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
<PropertyGroup>
4949
<OutputType>Library</OutputType>
5050
</PropertyGroup>
51+
<PropertyGroup>
52+
<SignAssembly>true</SignAssembly>
53+
</PropertyGroup>
54+
<PropertyGroup>
55+
<AssemblyOriginatorKeyFile>sendgrid-csharp.snk</AssemblyOriginatorKeyFile>
56+
</PropertyGroup>
5157
<ItemGroup>
5258
<Reference Include="Microsoft.CSharp" />
5359
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />

‎SendGrid/Tests/Transport/TestWebApi.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ internal class TestWebApi
1515
private const string TestUsername = "username";
1616
private const string TestPassword = "password";
1717

18+
1819
[Test]
1920
public void TestFetchFileBodies()
2021
{
@@ -78,5 +79,6 @@ public void TestFetchFormParams()
7879
Assert.True(
7980
result.Any(r => r.Key == "x-smtpapi" && r.Value == String.Format("{{\"category\" : \"{0}\"}}", categoryName)));
8081
}
82+
8183
}
8284
}

0 commit comments

Comments
 (0)