Skip to content

Commit 46adf10

Browse files
thinkingseriousthinkingserious
authored
Merge pull request #242 from sendgrid/async-fix
Version Bump v7.0.2: Async Fix
2 parents 6432c3c + ff34da7 commit 46adf10

File tree

10 files changed

+27
-20
lines changed

10 files changed

+27
-20
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## [7.0.2] - 2016-06-16
5+
### Fixed
6+
- Async broken in library, causing deadlocks and responses not returning in non-console apps: https://github.com/sendgrid/sendgrid-csharp/issues/235
7+
48
## [7.0.1] - 2016-06-15
59
### Fixed
610
- Hard-coded subject in mail helper: https://github.com/sendgrid/sendgrid-csharp/issues/234

‎SendGrid/Example/Example.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="SendGrid.CSharp.HTTP.Client, Version=2.0.0.0, Culture=neutral, PublicKeyToken=79219bf4e5ecaaca, processorArchitecture=MSIL">
54-
<HintPath>..\packages\SendGrid.CSharp.HTTP.Client.2.0.1\lib\SendGrid.CSharp.HTTP.Client.dll</HintPath>
53+
<Reference Include="SendGrid.CSharp.HTTP.Client, Version=2.0.4.0, Culture=neutral, PublicKeyToken=79219bf4e5ecaaca, processorArchitecture=MSIL">
54+
<HintPath>..\packages\SendGrid.CSharp.HTTP.Client.2.0.4\lib\SendGrid.CSharp.HTTP.Client.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="SendGrid.SmtpApi, Version=1.3.1.0, Culture=neutral, PublicKeyToken=2ae73662c35d80e4, processorArchitecture=MSIL">
@@ -72,7 +72,9 @@
7272
<None Include="app.config">
7373
<SubType>Designer</SubType>
7474
</None>
75-
<None Include="packages.config" />
75+
<None Include="packages.config">
76+
<SubType>Designer</SubType>
77+
</None>
7678
</ItemGroup>
7779
<ItemGroup>
7880
<WCFMetadata Include="Service References\" />

‎SendGrid/Example/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Example")]
13-
[assembly: AssemblyCopyright("Copyright © 2012")]
13+
[assembly: AssemblyCopyright("Copyright © 2016")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -35,5 +35,5 @@
3535
// by using the '*' as shown below:
3636
// [assembly: AssemblyVersion("1.0.*")]
3737

38-
[assembly: AssemblyVersion("7.0.1")]
39-
[assembly: AssemblyFileVersion("7.0.1")]
38+
[assembly: AssemblyVersion("7.0.2")]
39+
[assembly: AssemblyFileVersion("7.0.2")]

‎SendGrid/Example/packages.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
4-
<package id="SendGrid.CSharp.HTTP.Client" version="2.0.1" targetFramework="net452" />
5-
<package id="SendGrid.SmtpApi" version="1.3.1" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
4+
<package id="SendGrid.CSharp.HTTP.Client" version="2.0.4" targetFramework="net452" />
65
</packages>

‎SendGrid/SendGrid/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("7.0.1")]
36-
[assembly: AssemblyFileVersion("7.0.1")]
35+
[assembly: AssemblyVersion("7.0.2")]
36+
[assembly: AssemblyFileVersion("7.0.2")]

‎SendGrid/SendGrid/SendGrid.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="SendGrid.CSharp.HTTP.Client, Version=2.0.0.0, Culture=neutral, PublicKeyToken=79219bf4e5ecaaca, processorArchitecture=MSIL">
51-
<HintPath>..\packages\SendGrid.CSharp.HTTP.Client.2.0.1\lib\SendGrid.CSharp.HTTP.Client.dll</HintPath>
50+
<Reference Include="SendGrid.CSharp.HTTP.Client, Version=2.0.4.0, Culture=neutral, PublicKeyToken=79219bf4e5ecaaca, processorArchitecture=MSIL">
51+
<HintPath>..\packages\SendGrid.CSharp.HTTP.Client.2.0.4\lib\SendGrid.CSharp.HTTP.Client.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="System" />

‎SendGrid/SendGrid/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
5-
<package id="SendGrid.CSharp.HTTP.Client" version="2.0.1" targetFramework="net452" />
5+
<package id="SendGrid.CSharp.HTTP.Client" version="2.0.4" targetFramework="net452" />
66
</packages>

‎SendGrid/UnitTest/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("7.0.1")]
36-
[assembly: AssemblyFileVersion("7.0.1")]
35+
[assembly: AssemblyVersion("7.0.2")]
36+
[assembly: AssemblyFileVersion("7.0.2")]

‎SendGrid/UnitTest/UnitTests.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
6868
<Private>False</Private>
6969
</Reference>
70-
<Reference Include="SendGrid.CSharp.HTTP.Client, Version=2.0.0.0, Culture=neutral, PublicKeyToken=79219bf4e5ecaaca, processorArchitecture=MSIL">
71-
<HintPath>..\packages\SendGrid.CSharp.HTTP.Client.2.0.1\lib\SendGrid.CSharp.HTTP.Client.dll</HintPath>
70+
<Reference Include="SendGrid.CSharp.HTTP.Client, Version=2.0.4.0, Culture=neutral, PublicKeyToken=79219bf4e5ecaaca, processorArchitecture=MSIL">
71+
<HintPath>..\packages\SendGrid.CSharp.HTTP.Client.2.0.4\lib\SendGrid.CSharp.HTTP.Client.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="System" />
@@ -94,7 +94,9 @@
9494
</ProjectReference>
9595
</ItemGroup>
9696
<ItemGroup>
97-
<None Include="app.config" />
97+
<None Include="app.config">
98+
<SubType>Designer</SubType>
99+
</None>
98100
<None Include="packages.config" />
99101
<None Include="sendgrid-csharp.snk" />
100102
</ItemGroup>

‎SendGrid/UnitTest/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
44
<package id="NUnit" version="2.6.4" targetFramework="net45" />
55
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
6-
<package id="SendGrid.CSharp.HTTP.Client" version="2.0.1" targetFramework="net452" />
6+
<package id="SendGrid.CSharp.HTTP.Client" version="2.0.4" targetFramework="net452" />
77
</packages>

0 commit comments

Comments
 (0)