Skip to content

Commit 221d46e

Browse files
author
Cory Thompson
committed
Add support for dotnetcore1.0, dotnetcore1.1, dotnetstandard1.3, .net4.5 and .net4.6
1 parent 13e70f4 commit 221d46e

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ install:
77
- dotnet restore
88

99
script:
10-
- dotnet build
11-
- dotnet test WebPush.Test/WebPush.Test.csproj
10+
- dotnet build --framework=netcoreapp1.0
11+
- dotnet test --framework=netcoreapp1.0 WebPush.Test/WebPush.Test.csproj

‎WebPush.Test/WebPush.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp1.0</TargetFramework>
3+
<TargetFrameworks>netcoreapp1.0;netcoreapp1.1</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />

‎WebPush.sln

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26124.0
3+
VisualStudioVersion = 15.0.26430.6
54
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebPush", "WebPush\WebPush.csproj", "{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPush", "WebPush\WebPush.csproj", "{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}"
76
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebPush.Test", "WebPush.Test\WebPush.Test.csproj", "{61890D98-5101-4F64-B4B1-E00351A42133}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPush.Test", "WebPush.Test\WebPush.Test.csproj", "{61890D98-5101-4F64-B4B1-E00351A42133}"
98
EndProject
109
Global
1110
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,33 +15,33 @@ Global
1615
Release|x64 = Release|x64
1716
Release|x86 = Release|x86
1817
EndGlobalSection
19-
GlobalSection(SolutionProperties) = preSolution
20-
HideSolutionNode = FALSE
21-
EndGlobalSection
2218
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2319
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2420
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x64.ActiveCfg = Debug|x64
26-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x64.Build.0 = Debug|x64
27-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x86.ActiveCfg = Debug|x86
28-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x86.Build.0 = Debug|x86
21+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x64.ActiveCfg = Debug|Any CPU
22+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x64.Build.0 = Debug|Any CPU
23+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x86.ActiveCfg = Debug|Any CPU
24+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Debug|x86.Build.0 = Debug|Any CPU
2925
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|Any CPU.ActiveCfg = Release|Any CPU
3026
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x64.ActiveCfg = Release|x64
32-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x64.Build.0 = Release|x64
33-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x86.ActiveCfg = Release|x86
34-
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x86.Build.0 = Release|x86
27+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x64.ActiveCfg = Release|Any CPU
28+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x64.Build.0 = Release|Any CPU
29+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x86.ActiveCfg = Release|Any CPU
30+
{4CDE5EA4-CEF7-4CA0-B1C7-512D1D355E00}.Release|x86.Build.0 = Release|Any CPU
3531
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3632
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x64.ActiveCfg = Debug|x64
38-
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x64.Build.0 = Debug|x64
39-
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x86.ActiveCfg = Debug|x86
40-
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x86.Build.0 = Debug|x86
33+
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x64.ActiveCfg = Debug|Any CPU
34+
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x64.Build.0 = Debug|Any CPU
35+
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x86.ActiveCfg = Debug|Any CPU
36+
{61890D98-5101-4F64-B4B1-E00351A42133}.Debug|x86.Build.0 = Debug|Any CPU
4137
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|Any CPU.ActiveCfg = Release|Any CPU
4238
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x64.ActiveCfg = Release|x64
44-
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x64.Build.0 = Release|x64
45-
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x86.ActiveCfg = Release|x86
46-
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x86.Build.0 = Release|x86
39+
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x64.ActiveCfg = Release|Any CPU
40+
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x64.Build.0 = Release|Any CPU
41+
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x86.ActiveCfg = Release|Any CPU
42+
{61890D98-5101-4F64-B4B1-E00351A42133}.Release|x86.Build.0 = Release|Any CPU
43+
EndGlobalSection
44+
GlobalSection(SolutionProperties) = preSolution
45+
HideSolutionNode = FALSE
4746
EndGlobalSection
4847
EndGlobal

‎WebPush/WebPush.csproj

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp1.0</TargetFramework>
3+
<TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netstandard1.3;net45;net46</TargetFrameworks>
44
</PropertyGroup>
5+
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" />
9+
</ItemGroup>
10+
11+
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0' OR '$(TargetFramework)'=='netcoreapp1.1' OR '$(TargetFramework)'=='netstandard1.3'">
12+
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.1.3" />
13+
</ItemGroup>
14+
515
<ItemGroup>
6-
<PackageReference Include="BouncyCastle.NetCore" Version="1.8.1.3" />
716
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
817
</ItemGroup>
918
</Project>

0 commit comments

Comments
 (0)