Skip to content

Target for net47 + removed dependency on external Http package #18

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
coryjthompson merged 1 commit into from
Nov 7, 2017
Merged

Target for net47 + removed dependency on external Http package #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions WebPush.Test/ECKeyHelperTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ public void TestGenerateKeys()

Assert.Equal(65, publicKeyLength);
Assert.Equal(32, privateKeyLength);

;
}

[Fact]
Expand Down
20 changes: 12 additions & 8 deletions WebPush.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>WebPush</id>
<version>1.0.9</version>
<version>1.0.10</version>
<authors>Cory Thompson</authors>
<owners>Cory Thompson</owners>
<licenseUrl>https://github.com/coryjthompson/web-push-csharp/blob/master/LICENSE</licenseUrl>
Expand All @@ -14,27 +14,31 @@
<dependencies>
<group targetFramework="netcoreapp1.0">
<dependency id="BouncyCastle.NetCore" version="1.8.1.3"/>
<dependency id="Newtonsoft.Json" version="10.0.1"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
</group>
<group targetFramework="netcoreapp1.1">
<dependency id="BouncyCastle.NetCore" version="1.8.1.3"/>
<dependency id="Newtonsoft.Json" version="10.0.1"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
</group>
<group targetFramework="netstandard1.3">
<dependency id="BouncyCastle.NetCore" version="1.8.1.3"/>
<dependency id="Newtonsoft.Json" version="10.0.1"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
<dependency id="System.Net.Http" version="4.3.3"/>
</group>

<group targetFramework="net45">
<dependency id="BouncyCastle" version="1.8.1"/>
<dependency id="Microsoft.Net.Http" version="2.2.29" />
<dependency id="Newtonsoft.Json" version="10.0.1"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
</group>

<group targetFramework="net46">
<dependency id="BouncyCastle" version="1.8.1"/>
<dependency id="Microsoft.Net.Http" version="2.2.29" />
<dependency id="Newtonsoft.Json" version="10.0.1"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
</group>

<group targetFramework="net47">
<dependency id="BouncyCastle" version="1.8.1"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
</group>
</dependencies>
</metadata>
Expand Down
12 changes: 11 additions & 1 deletion WebPush.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPush", "WebPush\WebPush.csproj", "{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPush.Test", "WebPush.Test\WebPush.Test.csproj", "{61890D98-5101-4F64-B4B1-E00351A42133}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00145B67-A35F-46B3-B69B-45ABEB45905A}"
ProjectSection(SolutionItems) = preProject
build.cmd = build.cmd
README.md = README.md
WebPush.nuspec = WebPush.nuspec
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -44,4 +51,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {331EB5B3-39C1-44A0-B1D4-AF44344075D9}
EndGlobalSection
EndGlobal
13 changes: 9 additions & 4 deletions WebPush/WebPush.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netstandard1.3;net45;net46</TargetFrameworks>
<TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netstandard1.3;net45;net46;net47</TargetFrameworks>
</PropertyGroup>

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

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

<ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.1.3" />
<PackageReference Include="System.Net.Http" version="4.3.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions WebPush/WebPushClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using WebPush.Util;

[assembly: InternalsVisibleTo("WebPush.Test")]

namespace WebPush
{
public class WebPushClient
Expand Down