Skip to content

Commit fcf7ea5

Browse files
author
Cory Thompson
authored
Merge pull request #18 from nielsvoigt/SystemHttp
Target for net47 + removed dependency on external Http package
2 parents 969a0d1 + e7ec37c commit fcf7ea5

File tree

5 files changed

+35
-15
lines changed

5 files changed

+35
-15
lines changed

‎WebPush.Test/ECKeyHelperTest.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ public void TestGenerateKeys()
2525

2626
Assert.Equal(65, publicKeyLength);
2727
Assert.Equal(32, privateKeyLength);
28-
29-
;
3028
}
3129

3230
[Fact]

‎WebPush.nuspec‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>WebPush</id>
5-
<version>1.0.9</version>
5+
<version>1.0.10</version>
66
<authors>Cory Thompson</authors>
77
<owners>Cory Thompson</owners>
88
<licenseUrl>https://github.com/coryjthompson/web-push-csharp/blob/master/LICENSE</licenseUrl>
@@ -14,27 +14,31 @@
1414
<dependencies>
1515
<group targetFramework="netcoreapp1.0">
1616
<dependency id="BouncyCastle.NetCore" version="1.8.1.3"/>
17-
<dependency id="Newtonsoft.Json" version="10.0.1"/>
17+
<dependency id="Newtonsoft.Json" version="10.0.3"/>
1818
</group>
1919
<group targetFramework="netcoreapp1.1">
2020
<dependency id="BouncyCastle.NetCore" version="1.8.1.3"/>
21-
<dependency id="Newtonsoft.Json" version="10.0.1"/>
21+
<dependency id="Newtonsoft.Json" version="10.0.3"/>
2222
</group>
2323
<group targetFramework="netstandard1.3">
2424
<dependency id="BouncyCastle.NetCore" version="1.8.1.3"/>
25-
<dependency id="Newtonsoft.Json" version="10.0.1"/>
25+
<dependency id="Newtonsoft.Json" version="10.0.3"/>
26+
<dependency id="System.Net.Http" version="4.3.3"/>
2627
</group>
2728

2829
<group targetFramework="net45">
2930
<dependency id="BouncyCastle" version="1.8.1"/>
30-
<dependency id="Microsoft.Net.Http" version="2.2.29" />
31-
<dependency id="Newtonsoft.Json" version="10.0.1"/>
31+
<dependency id="Newtonsoft.Json" version="10.0.3"/>
3232
</group>
3333

3434
<group targetFramework="net46">
3535
<dependency id="BouncyCastle" version="1.8.1"/>
36-
<dependency id="Microsoft.Net.Http" version="2.2.29" />
37-
<dependency id="Newtonsoft.Json" version="10.0.1"/>
36+
<dependency id="Newtonsoft.Json" version="10.0.3"/>
37+
</group>
38+
39+
<group targetFramework="net47">
40+
<dependency id="BouncyCastle" version="1.8.1"/>
41+
<dependency id="Newtonsoft.Json" version="10.0.3"/>
3842
</group>
3943
</dependencies>
4044
</metadata>

‎WebPush.sln‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26430.6
3+
VisualStudioVersion = 15.0.26730.16
44
MinimumVisualStudioVersion = 15.0.26124.0
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPush", "WebPush\WebPush.csproj", "{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}"
66
EndProject
77
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPush.Test", "WebPush.Test\WebPush.Test.csproj", "{61890D98-5101-4F64-B4B1-E00351A42133}"
88
EndProject
9+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00145B67-A35F-46B3-B69B-45ABEB45905A}"
10+
ProjectSection(SolutionItems) = preProject
11+
build.cmd = build.cmd
12+
README.md = README.md
13+
WebPush.nuspec = WebPush.nuspec
14+
EndProjectSection
15+
EndProject
916
Global
1017
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1118
Debug|Any CPU = Debug|Any CPU
@@ -44,4 +51,7 @@ Global
4451
GlobalSection(SolutionProperties) = preSolution
4552
HideSolutionNode = FALSE
4653
EndGlobalSection
54+
GlobalSection(ExtensibilityGlobals) = postSolution
55+
SolutionGuid = {331EB5B3-39C1-44A0-B1D4-AF44344075D9}
56+
EndGlobalSection
4757
EndGlobal

‎WebPush/WebPush.csproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netstandard1.3;net45;net46</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netstandard1.3;net45;net46;net47</TargetFrameworks>
44
</PropertyGroup>
55

6-
<ItemGroup Condition="'$(TargetFramework)'=='net45' OR '$(TargetFramework)'=='net46'">
7-
<PackageReference Include="BouncyCastle" Version="1.8.1" />
8-
<PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
6+
<ItemGroup Condition="'$(TargetFramework)'=='net45' OR '$(TargetFramework)'=='net46' OR '$(TargetFramework)'=='net47'">
7+
<PackageReference Include="BouncyCastle" Version="1.8.1" />
8+
<Reference Include="System.Net.Http" />
99
</ItemGroup>
1010

1111
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0' OR '$(TargetFramework)'=='netcoreapp1.1' OR '$(TargetFramework)'=='netstandard1.3'">
1212
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.1.3" />
1313
</ItemGroup>
1414

15+
<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
16+
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.1.3" />
17+
<PackageReference Include="System.Net.Http" version="4.3.3" />
18+
</ItemGroup>
19+
1520
<ItemGroup>
1621
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1722
</ItemGroup>

‎WebPush/WebPushClient.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
using System.Net;
44
using System.Net.Http;
55
using System.Net.Http.Headers;
6+
using System.Runtime.CompilerServices;
67
using System.Threading.Tasks;
78
using WebPush.Util;
89

10+
[assembly: InternalsVisibleTo("WebPush.Test")]
11+
912
namespace WebPush
1013
{
1114
public class WebPushClient

0 commit comments

Comments
 (0)