From 9730c30ba0798b20993df010e0a2fc4957e2c8ea Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 00:25:55 -0800 Subject: [PATCH 1/8] Updating assembly dependencies. --- .gitignore | 5 +++- SendGrid/SendGrid.sln | 9 ++++--- SendGrid/SendGrid/SendGrid.csproj | 7 ++++++ SendGrid/SendGridMail/Mail.csproj | 5 ++-- .../SendGridMail/Properties/AssemblyInfo.cs | 24 +++++++++++++------ SendGrid/Tests/Tests.csproj | 6 +++++ SendGrid/Tests/Transport/TestWebApi.cs | 2 ++ 7 files changed, 45 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index d37669d50..fbffa6694 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,7 @@ SendGrid/packages/ SendGrid/TestResult.xml SendGrid/SendGrid.sln.VisualState.xml -*.snk \ No newline at end of file +*.snk +*.pfx +SendGrid/Tests/sendgrid-csharp.PublicKey +*.PublicKey \ No newline at end of file diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln index 030ed4710..f72c40812 100644 --- a/SendGrid/SendGrid.sln +++ b/SendGrid/SendGrid.sln @@ -52,13 +52,16 @@ 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|Mixed Platforms.Build.0 = 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|Mixed Platforms.Build.0 = 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|Mixed Platforms.Build.0 = 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 diff --git a/SendGrid/SendGrid/SendGrid.csproj b/SendGrid/SendGrid/SendGrid.csproj index 8bbed1363..e8cc19a67 100644 --- a/SendGrid/SendGrid/SendGrid.csproj +++ b/SendGrid/SendGrid/SendGrid.csproj @@ -36,6 +36,12 @@ + + true + + + SendGrid.pfx + ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll @@ -63,6 +69,7 @@ + diff --git a/SendGrid/SendGridMail/Mail.csproj b/SendGrid/SendGridMail/Mail.csproj index 154fb43d3..2322921c2 100644 --- a/SendGrid/SendGridMail/Mail.csproj +++ b/SendGrid/SendGridMail/Mail.csproj @@ -91,10 +91,10 @@ false - false + true - sendgrid-csharp.snk + SendGridMail.pfx @@ -118,6 +118,7 @@ + diff --git a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs index bf0d7b35c..5ca685d32 100644 --- a/SendGrid/SendGridMail/Properties/AssemblyInfo.cs +++ b/SendGrid/SendGridMail/Properties/AssemblyInfo.cs @@ -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: // diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj index 94882c1ed..ff31ea6e2 100644 --- a/SendGrid/Tests/Tests.csproj +++ b/SendGrid/Tests/Tests.csproj @@ -48,6 +48,12 @@ Library + + true + + + sendgrid-csharp.snk + diff --git a/SendGrid/Tests/Transport/TestWebApi.cs b/SendGrid/Tests/Transport/TestWebApi.cs index a06ca6965..5e09b9d33 100644 --- a/SendGrid/Tests/Transport/TestWebApi.cs +++ b/SendGrid/Tests/Transport/TestWebApi.cs @@ -15,6 +15,7 @@ internal class TestWebApi private const string TestUsername = "username"; private const string TestPassword = "password"; + [Test] public void TestFetchFileBodies() { @@ -78,5 +79,6 @@ public void TestFetchFormParams() Assert.True( result.Any(r => r.Key == "x-smtpapi" && r.Value == String.Format("{{\"category\" : \"{0}\"}}", categoryName))); } + } } \ No newline at end of file From 3734df9fd20d33e35ed666aa32ba08a0dbd7f081 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 00:41:06 -0800 Subject: [PATCH 2/8] Removing pfx files breaks Travis and creates an extra step for contributors --- .gitignore | 1 - SendGrid/SendGrid/SendGrid.pfx | Bin 0 -> 1709 bytes SendGrid/SendGridMail/SendGridMail.pfx | Bin 0 -> 1709 bytes 3 files changed, 1 deletion(-) create mode 100644 SendGrid/SendGrid/SendGrid.pfx create mode 100644 SendGrid/SendGridMail/SendGridMail.pfx diff --git a/.gitignore b/.gitignore index fbffa6694..05f9e58cf 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,5 @@ SendGrid/TestResult.xml SendGrid/SendGrid.sln.VisualState.xml *.snk -*.pfx SendGrid/Tests/sendgrid-csharp.PublicKey *.PublicKey \ No newline at end of file diff --git a/SendGrid/SendGrid/SendGrid.pfx b/SendGrid/SendGrid/SendGrid.pfx new file mode 100644 index 0000000000000000000000000000000000000000..4085fa07442a008f5a2fc161d65e1760c8bbd0c7 GIT binary patch literal 1709 zcmcIldo+}37=PztFi|R(E^bFGa^#yCm!Txr(!~riD!VQfjVUx{Y2DV$=Wb1Il^V*h zOQe*PHdKR{kV=&6lGbfo?W?nE+jI8M-SeI2{eHjS^E}`Ce3#$(5R_1i#o!Q> z;7gF*9KS1mRvsgb5uyYJ9woRy*$F{$75_-#F5^+$_fXD-kxf|fXO|oigB7CK3IxU8 zL{tgHzhrpvm3SHB=dFn&UYrY9tn_0%icRB86m5Cgq7JSbVSqA4w|P+ zI_X_U53D;Ptlhx0brjD$uime%KW&h)FzDeWvYNnib3T+`i)+lk$C+s?`ADs^8=Y0N zx7;`+ijiq2t7dRjs11ay_kl7M)0;*LufLH5nWjX>VAJpR!fbj##%?#Xu$GbSCN8bao8ra>@9C9 z#5wZ=yCfGFOy*gLJ#}M?XeJ7?;-zJEuCxaZkQobUEq+hAl`%5_@PsGAo0B{3>2U%-z$96rZi>s)xpr_BjDXVy}of(rMHH|e{6AgnLEfe`n6;1#oT)-nb|kl zb_?>C*Er~U_h?jAi_|OPGx~O@_RPPgHAG%w4FnEzT(#)#YZ5|PU@9H;2@b=s=@GB9 z#|k{uRa?&2?C)i=B&9R?Ljy*KtV>`0l(9;?nea|9Sve_KkRwhfG8q@R#SjoA+QA`s2jst3S8}BcB#q?L?K@hWDN)yJO(vejUmz1oxnce4~~Ff z5Ck|d{J_^h6S%^4NeKkUAhU%y44i~o5ahwY2V&-@E=@rHR2K@_QQ!-Lp%c@Vr(ZHP zmItjD1?4apA)h-J2b24t=(y}#S>>e$bJ$=4brOPN1VS7ZgT*SWj|@5&J~YDL>&SSp zLp-<=kzd{fvqB0W?j$$Fm4I`@_IBRvb5T2_f?%uW0L+et};c9)4 zeqUL;(FyM>Wzs1vk_4hA{j9aG97*Zl{j?R)K%@y$1}kyc4S2;9t{R?6L=nk@Y|{s51hdny0` literal 0 HcmV?d00001 diff --git a/SendGrid/SendGridMail/SendGridMail.pfx b/SendGrid/SendGridMail/SendGridMail.pfx new file mode 100644 index 0000000000000000000000000000000000000000..867e4996797395f46e26e41d41ca032cfad58235 GIT binary patch literal 1709 zcmcIldo+}39DcuV#%M4bVMz=}i$zo4H#07Sa$P%etqvtgX*9+fB$o)8SrxTJY$ZgI zja)XQsK~m6RwOF4Ax+68*CVpnS7+C@=j@-m=RLpgeV*t2{l542U7qt|LQ)=z5HKOh zi$vBr!9MYUf`}toLXrznNZJl%2TVvP|Hl&HC!&y$4dqN2X(Y)%tE40lG)stlR7(Zp=mC*=>SkFoDGg*+>i^@*G@`KIa-Jvk@C zHhemzv@dv%s5)|L%rQ5wQnGVE{*4hWzNvz12Q6C1E z-T2kI1%9W($>Zj)3Uvu}JEjz%tJK)r_XPU#;$Zx$=)9;nyK94xMFqgvH z2hS~pe9#)X77{S$%2P`1t-BFFX+PUD_q|Sfz^l~Lb-Ne4o>6U>yyunHeF3d?EtBeD z+T0iCyN1^&4-gN3kTNTAmMu7yN$alEGbR@eX%zd0FgkxfktCA-`l^4UCpnyNtJ$or zJajIC7d^fszgg5G7r5C-WkdR+R^H`Ri$}<~&8S8Dm>MI9YsZPP?c9>Cpg65k5;5PD zF*}`>pD2}DcI$rk2AtVVG2zvm5_`qf(+|BPoyLnY?B<>AO7FO?ZKP}L_9!e`ER*z9 zpi%Qc^%A%L@%z5L^}~Mb_}@&Y)*UR@H1INdeOF~WXDxn)y;aksHePtN{z=wi>D(ga z3ge1Fof1boGxeRF-nfF($k6o0H{n5|M}i05G?|MLFDoY6p%23|IpOFaTCSA0k6Q1A1^Q zV;W$>nGOdH>IN_qhsXl3U@&1=!5n>XIwgg-`ufRNd30)dOwtZ4{9rt8vGtI7 zgG;ownt9x}RQ>V6W7;w^8%=jjcut=Ixd!yC7FrK|GS@zF;z^QB&PcX0aYT(d8VDspEZARHD0vs#hhk# i63~hDBg);B%1Zt*M{#tkPwP!}a!zFjw|@Qd!SM%{(s|AR literal 0 HcmV?d00001 From ad59f05a248adde9bd32c972099bc9a3e3bd4c23 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 01:03:13 -0800 Subject: [PATCH 3/8] Working locally --- SendGrid/SendGrid.sln | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln index f72c40812..030ed4710 100644 --- a/SendGrid/SendGrid.sln +++ b/SendGrid/SendGrid.sln @@ -52,16 +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 = Release|Any CPU - {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.Build.0 = Release|Any CPU + {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.BuildNet45|Mixed Platforms.ActiveCfg = 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 = Release|Any CPU - {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.Build.0 = Release|Any CPU + {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|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 = Release|Any CPU - {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F39ADCE7-63B5-406D-9BE8-C407920B6B8F}.Release|Mixed Platforms.ActiveCfg = Debug|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 From 7d0a4148b09c29ea870da76af35a841f19317449 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 01:26:22 -0800 Subject: [PATCH 4/8] Trying to make Travis happy --- .gitignore | 3 +-- SendGrid/SendGrid.sln | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 05f9e58cf..1e5f1fae7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ SendGrid/SendGrid.userprefs SendGrid/packages/ SendGrid/TestResult.xml SendGrid/SendGrid.sln.VisualState.xml - +*.pfx *.snk -SendGrid/Tests/sendgrid-csharp.PublicKey *.PublicKey \ No newline at end of file diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln index 030ed4710..e6a4aed46 100644 --- a/SendGrid/SendGrid.sln +++ b/SendGrid/SendGrid.sln @@ -37,19 +37,19 @@ 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 {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Any CPU.Build.0 = BuildNet45|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.Build.0 = BuildNet45|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|x86.ActiveCfg = Debug|Any CPU {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Any CPU.Build.0 = Release|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.Build.0 = BuildNet45|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.Build.0 = Debug|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 @@ -96,20 +96,20 @@ Global {1C318867-440B-4EB9-99E3-C0CC2C556962}.Release|x86.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Any CPU.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Any CPU.Build.0 = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.ActiveCfg = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.Build.0 = Release|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|x86.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|x86.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.Build.0 = Release|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|x86.ActiveCfg = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|x86.Build.0 = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Any CPU.Build.0 = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.Build.0 = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|x86.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection From b9d064cce1cad5d36898851363f0dbdd752514a3 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 01:42:53 -0800 Subject: [PATCH 5/8] Try signing the classic way --- SendGrid/SendGrid/SendGrid.csproj | 2 +- SendGrid/SendGridMail/Mail.csproj | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/SendGrid/SendGrid/SendGrid.csproj b/SendGrid/SendGrid/SendGrid.csproj index e8cc19a67..4cb5b56e9 100644 --- a/SendGrid/SendGrid/SendGrid.csproj +++ b/SendGrid/SendGrid/SendGrid.csproj @@ -37,7 +37,7 @@ - true + false SendGrid.pfx diff --git a/SendGrid/SendGridMail/Mail.csproj b/SendGrid/SendGridMail/Mail.csproj index 2322921c2..85ee4a37a 100644 --- a/SendGrid/SendGridMail/Mail.csproj +++ b/SendGrid/SendGridMail/Mail.csproj @@ -94,7 +94,7 @@ true - SendGridMail.pfx + sendgrid-csharp.snk @@ -118,7 +118,6 @@ - From 1925f21b75ff4d1bb4c0c242eb0861b17bdd3e26 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 03:47:53 -0800 Subject: [PATCH 6/8] Adding classic keys --- .gitignore | 1 - SendGrid/SendGrid/sendgrid-csharp.snk | Bin 0 -> 596 bytes SendGrid/SendGridMail/sendgrid-csharp.snk | Bin 0 -> 596 bytes SendGrid/Tests/sendgrid-csharp.snk | Bin 0 -> 596 bytes 4 files changed, 1 deletion(-) create mode 100644 SendGrid/SendGrid/sendgrid-csharp.snk create mode 100644 SendGrid/SendGridMail/sendgrid-csharp.snk create mode 100644 SendGrid/Tests/sendgrid-csharp.snk diff --git a/.gitignore b/.gitignore index 1e5f1fae7..17ba00d00 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,4 @@ SendGrid/packages/ SendGrid/TestResult.xml SendGrid/SendGrid.sln.VisualState.xml *.pfx -*.snk *.PublicKey \ No newline at end of file diff --git a/SendGrid/SendGrid/sendgrid-csharp.snk b/SendGrid/SendGrid/sendgrid-csharp.snk new file mode 100644 index 0000000000000000000000000000000000000000..aff294450f95a824178d614548f39b7e71142615 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097jF2ZVN$l#252L!B3M!d<|pG(S3pzM4G z&TY+ey6Y@eCG%<{dnG=A;cx4-z*6-GG}YnHJM?(j$d3qvZ+e_Gxa(qy+^pbLd$t-QeofN(xr3Uw*P@bAiv! zE|F#@AvSboj>&ew6ZGrRMA4Szfqm^k+nO&-ZEyYfkQ|5cqw<$#uI3PuDJg82P#ty$ z#H0OhEcDR_jEUj3*WfUi}-KFr@uG7N1$7yP&lCl zo)|H4I8@n?AAM`RJD#tJ$zxWPgr$sJuei7t3%G)O`E$e z>Y@be9v--sN?=&8qd*>X^xGO!xTlq`@f|+iwbr0{J2&_pTz-ftq#lmX_IaI50zZEqhSR%%rmKZ}7ztVw- iR{jRch|fKzM1oq{(8hjClEHL&$sa`L8#iryDNzz$%^v&! literal 0 HcmV?d00001 diff --git a/SendGrid/SendGridMail/sendgrid-csharp.snk b/SendGrid/SendGridMail/sendgrid-csharp.snk new file mode 100644 index 0000000000000000000000000000000000000000..aff294450f95a824178d614548f39b7e71142615 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097jF2ZVN$l#252L!B3M!d<|pG(S3pzM4G z&TY+ey6Y@eCG%<{dnG=A;cx4-z*6-GG}YnHJM?(j$d3qvZ+e_Gxa(qy+^pbLd$t-QeofN(xr3Uw*P@bAiv! zE|F#@AvSboj>&ew6ZGrRMA4Szfqm^k+nO&-ZEyYfkQ|5cqw<$#uI3PuDJg82P#ty$ z#H0OhEcDR_jEUj3*WfUi}-KFr@uG7N1$7yP&lCl zo)|H4I8@n?AAM`RJD#tJ$zxWPgr$sJuei7t3%G)O`E$e z>Y@be9v--sN?=&8qd*>X^xGO!xTlq`@f|+iwbr0{J2&_pTz-ftq#lmX_IaI50zZEqhSR%%rmKZ}7ztVw- iR{jRch|fKzM1oq{(8hjClEHL&$sa`L8#iryDNzz$%^v&! literal 0 HcmV?d00001 diff --git a/SendGrid/Tests/sendgrid-csharp.snk b/SendGrid/Tests/sendgrid-csharp.snk new file mode 100644 index 0000000000000000000000000000000000000000..aff294450f95a824178d614548f39b7e71142615 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097jF2ZVN$l#252L!B3M!d<|pG(S3pzM4G z&TY+ey6Y@eCG%<{dnG=A;cx4-z*6-GG}YnHJM?(j$d3qvZ+e_Gxa(qy+^pbLd$t-QeofN(xr3Uw*P@bAiv! zE|F#@AvSboj>&ew6ZGrRMA4Szfqm^k+nO&-ZEyYfkQ|5cqw<$#uI3PuDJg82P#ty$ z#H0OhEcDR_jEUj3*WfUi}-KFr@uG7N1$7yP&lCl zo)|H4I8@n?AAM`RJD#tJ$zxWPgr$sJuei7t3%G)O`E$e z>Y@be9v--sN?=&8qd*>X^xGO!xTlq`@f|+iwbr0{J2&_pTz-ftq#lmX_IaI50zZEqhSR%%rmKZ}7ztVw- iR{jRch|fKzM1oq{(8hjClEHL&$sa`L8#iryDNzz$%^v&! literal 0 HcmV?d00001 From c5cc14696dbd2c52b29fd71a33aafe2fc31c9f9a Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 09:51:40 -0800 Subject: [PATCH 7/8] Updating assembly signings --- SendGrid/SendGrid/SendGrid.csproj | 6 +++--- SendGrid/SendGrid/SendGrid.pfx | Bin 1709 -> 0 bytes SendGrid/UnitTest/UnitTests.csproj | 7 +++++++ SendGrid/UnitTest/sendgrid-csharp.snk | Bin 0 -> 596 bytes 4 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 SendGrid/SendGrid/SendGrid.pfx create mode 100644 SendGrid/UnitTest/sendgrid-csharp.snk diff --git a/SendGrid/SendGrid/SendGrid.csproj b/SendGrid/SendGrid/SendGrid.csproj index 4cb5b56e9..d9645d0aa 100644 --- a/SendGrid/SendGrid/SendGrid.csproj +++ b/SendGrid/SendGrid/SendGrid.csproj @@ -37,10 +37,10 @@ - false + true - SendGrid.pfx + sendgrid-csharp.snk @@ -69,7 +69,7 @@ - + diff --git a/SendGrid/SendGrid/SendGrid.pfx b/SendGrid/SendGrid/SendGrid.pfx deleted file mode 100644 index 4085fa07442a008f5a2fc161d65e1760c8bbd0c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1709 zcmcIldo+}37=PztFi|R(E^bFGa^#yCm!Txr(!~riD!VQfjVUx{Y2DV$=Wb1Il^V*h zOQe*PHdKR{kV=&6lGbfo?W?nE+jI8M-SeI2{eHjS^E}`Ce3#$(5R_1i#o!Q> z;7gF*9KS1mRvsgb5uyYJ9woRy*$F{$75_-#F5^+$_fXD-kxf|fXO|oigB7CK3IxU8 zL{tgHzhrpvm3SHB=dFn&UYrY9tn_0%icRB86m5Cgq7JSbVSqA4w|P+ zI_X_U53D;Ptlhx0brjD$uime%KW&h)FzDeWvYNnib3T+`i)+lk$C+s?`ADs^8=Y0N zx7;`+ijiq2t7dRjs11ay_kl7M)0;*LufLH5nWjX>VAJpR!fbj##%?#Xu$GbSCN8bao8ra>@9C9 z#5wZ=yCfGFOy*gLJ#}M?XeJ7?;-zJEuCxaZkQobUEq+hAl`%5_@PsGAo0B{3>2U%-z$96rZi>s)xpr_BjDXVy}of(rMHH|e{6AgnLEfe`n6;1#oT)-nb|kl zb_?>C*Er~U_h?jAi_|OPGx~O@_RPPgHAG%w4FnEzT(#)#YZ5|PU@9H;2@b=s=@GB9 z#|k{uRa?&2?C)i=B&9R?Ljy*KtV>`0l(9;?nea|9Sve_KkRwhfG8q@R#SjoA+QA`s2jst3S8}BcB#q?L?K@hWDN)yJO(vejUmz1oxnce4~~Ff z5Ck|d{J_^h6S%^4NeKkUAhU%y44i~o5ahwY2V&-@E=@rHR2K@_QQ!-Lp%c@Vr(ZHP zmItjD1?4apA)h-J2b24t=(y}#S>>e$bJ$=4brOPN1VS7ZgT*SWj|@5&J~YDL>&SSp zLp-<=kzd{fvqB0W?j$$Fm4I`@_IBRvb5T2_f?%uW0L+et};c9)4 zeqUL;(FyM>Wzs1vk_4hA{j9aG97*Zl{j?R)K%@y$1}kyc4S2;9t{R?6L=nk@Y|{s51hdny0` diff --git a/SendGrid/UnitTest/UnitTests.csproj b/SendGrid/UnitTest/UnitTests.csproj index 1c6f0fce3..d6ef8ae65 100644 --- a/SendGrid/UnitTest/UnitTests.csproj +++ b/SendGrid/UnitTest/UnitTests.csproj @@ -35,6 +35,12 @@ prompt 4 + + true + + + sendgrid-csharp.snk + @@ -85,6 +91,7 @@ + diff --git a/SendGrid/UnitTest/sendgrid-csharp.snk b/SendGrid/UnitTest/sendgrid-csharp.snk new file mode 100644 index 0000000000000000000000000000000000000000..aff294450f95a824178d614548f39b7e71142615 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097jF2ZVN$l#252L!B3M!d<|pG(S3pzM4G z&TY+ey6Y@eCG%<{dnG=A;cx4-z*6-GG}YnHJM?(j$d3qvZ+e_Gxa(qy+^pbLd$t-QeofN(xr3Uw*P@bAiv! zE|F#@AvSboj>&ew6ZGrRMA4Szfqm^k+nO&-ZEyYfkQ|5cqw<$#uI3PuDJg82P#ty$ z#H0OhEcDR_jEUj3*WfUi}-KFr@uG7N1$7yP&lCl zo)|H4I8@n?AAM`RJD#tJ$zxWPgr$sJuei7t3%G)O`E$e z>Y@be9v--sN?=&8qd*>X^xGO!xTlq`@f|+iwbr0{J2&_pTz-ftq#lmX_IaI50zZEqhSR%%rmKZ}7ztVw- iR{jRch|fKzM1oq{(8hjClEHL&$sa`L8#iryDNzz$%^v&! literal 0 HcmV?d00001 From 6cb3660577c4a68af42f66f21439c0c29ffa3942 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 24 Nov 2015 10:09:33 -0800 Subject: [PATCH 8/8] Update build settings --- SendGrid/SendGrid.sln | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/SendGrid/SendGrid.sln b/SendGrid/SendGrid.sln index e6a4aed46..476f63930 100644 --- a/SendGrid/SendGrid.sln +++ b/SendGrid/SendGrid.sln @@ -37,28 +37,28 @@ 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 = Debug|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.BuildNet45|Mixed Platforms.Build.0 = Debug|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|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 {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Any CPU.Build.0 = BuildNet45|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|Mixed Platforms.Build.0 = BuildNet45|Any CPU {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Debug|x86.ActiveCfg = Debug|Any CPU {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Any CPU.Build.0 = Release|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {0319E73A-7039-4858-B047-1EDF88BB6BD1}.Release|Mixed Platforms.ActiveCfg = BuildNet45|Any CPU + {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 @@ -96,20 +96,20 @@ Global {1C318867-440B-4EB9-99E3-C0CC2C556962}.Release|x86.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Any CPU.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Any CPU.Build.0 = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.Build.0 = Debug|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.ActiveCfg = Release|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|Mixed Platforms.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|x86.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.BuildNet45|x86.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|Mixed Platforms.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|x86.ActiveCfg = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Debug|x86.Build.0 = Debug|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Any CPU.Build.0 = Release|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.Build.0 = Debug|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|x86.ActiveCfg = Release|Any CPU {8A66032B-0D1C-4F24-B0E3-A250F31D09D8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection