Skip to content

Commit e615f08

Browse files
darkldarkl
authored
Merge pull request #142 from Code-Sharp/develop
UAP packages
2 parents e0f00b9 + 5bab1af commit e615f08

File tree

8 files changed

+121
-0
lines changed

8 files changed

+121
-0
lines changed

‎NuGet/WampSharp.Default.Client.nuspec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
1515
<dependency id="WampSharp.Windows" version="[$version$]" />
1616
</group>
17+
<group targetFramework="uap10.0">
18+
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
19+
<dependency id="WampSharp.Windows" version="[$version$]" />
20+
</group>
1721
<group targetFramework=".NETStandard1.3">
1822
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
1923
<dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
@@ -34,6 +38,8 @@
3438
<file src="bin\net40\WampSharp.Default.Client.xml" target="lib\net40\WampSharp.Default.Client.xml" />
3539
<file src="bin\pcl\WampSharp.Default.Client.dll" target="lib\portable-win81+wpa81\WampSharp.Default.Client.dll" />
3640
<file src="bin\pcl\WampSharp.Default.Client.xml" target="lib\portable-win81+wpa81\WampSharp.Default.Client.xml" />
41+
<file src="bin\uap10.0\WampSharp.Default.Client.dll" target="lib\uap10.0\WampSharp.Default.Client.dll" />
42+
<file src="bin\uap10.0\WampSharp.Default.Client.xml" target="lib\uap10.0\WampSharp.Default.Client.xml" />
3743
<file src="bin\netstandard1.3\WampSharp.Default.Client.dll" target="lib\netstandard1.3\WampSharp.Default.Client.dll" />
3844
<file src="bin\netstandard1.3\WampSharp.Default.Client.xml" target="lib\netstandard1.3\WampSharp.Default.Client.xml" />
3945
</files>

‎NuGet/WampSharp.Windows.nuspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@
2020
<files>
2121
<file src="bin\pcl\WampSharp.Windows.dll" target="lib\portable-win81+wpa81\WampSharp.Windows.dll" />
2222
<file src="bin\pcl\WampSharp.Windows.xml" target="lib\portable-win81+wpa81\WampSharp.Windows.xml" />
23+
<file src="bin\uap10.0\WampSharp.Windows.dll" target="lib\uap10.0\WampSharp.Windows.dll" />
24+
<file src="bin\uap10.0\WampSharp.Windows.xml" target="lib\uap10.0\WampSharp.Windows.xml" />
2325
</files>
2426
</package>

‎NuGet/WampSharp.nuspec‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,22 @@
3838
<dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
3939
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
4040
</group>
41+
<group targetFramework="UAP10.0">
42+
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
43+
<dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
44+
<dependency id="System.Collections.Concurrent" version="[4.0.12, )" />
45+
<dependency id="System.Collections.Immutable" version="[1.2.0, )" />
46+
<dependency id="System.ComponentModel" version="[4.0.1, )" />
47+
<dependency id="System.Net.Primitives" version="[4.0.11, )" />
48+
<dependency id="System.Reactive" version="[3.0.0, )" />
49+
<dependency id="System.Reflection.DispatchProxy" version="[4.0.1, )" />
50+
<dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
51+
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
52+
<dependency id="System.Runtime" version="[4.1.0, )" />
53+
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
54+
<dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
55+
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
56+
</group>
4157
</dependencies>
4258
<id>WampSharp</id>
4359
<title>WampSharp</title>
@@ -55,5 +71,7 @@
5571
<file src="bin\pcl\WampSharp.xml" target="lib\portable-win81+wpa81\WampSharp.xml" />
5672
<file src="bin\netstandard1.3\WampSharp.dll" target="lib\netstandard1.3\WampSharp.dll" />
5773
<file src="bin\netstandard1.3\WampSharp.xml" target="lib\netstandard1.3\WampSharp.xml" />
74+
<file src="bin\uap10.0\WampSharp.dll" target="lib\uap10.0\WampSharp.dll" />
75+
<file src="bin\uap10.0\WampSharp.xml" target="lib\uap10.0\WampSharp.xml" />
5876
</files>
5977
</package>

‎src/net45/Default/WampSharp.Windows/project.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"title": "WampSharp Windows support",
3+
"version": "1.2.3-*",
4+
"description": "Windows websocket connection for WampSharp",
5+
"authors": [ "CodeSharp" ],
6+
"packOptions": {
7+
"requireLicenseAcceptance": false,
8+
"tags": [ "websockets", "wampws", "rpc", "pubsub", "windows", "wampv2" ],
9+
"projectUrl": "https://github.com/Code-Sharp/WampSharp/"
10+
},
11+
"frameworks": {
12+
"uap10.0": {
13+
"buildOptions": {
14+
"xmlDoc": true,
15+
"define": ["PCL"]
16+
},
17+
"dependencies": {
18+
"WampSharp": { "target": "project" },
19+
"Microsoft.TargetingPack.Private.WinRT": {
20+
"version": "1.0.1",
21+
"type": "build"
22+
},
23+
"Microsoft.NETCore.UniversalWindowsPlatform": {
24+
"version": "5.2.2",
25+
"type": "build"
26+
}
27+
}
28+
}
29+
}
30+
}

‎src/net45/NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
<add key="corefx" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
6+
</packageSources>
7+
</configuration>

‎src/net45/Tests/WampSharp.Tests.Wampv2/project.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,23 @@
2222
"buildOptions": {
2323
"define": [ "NETCORE" ]
2424
}
25+
},
26+
"uap10.0": {
27+
"imports": [
28+
"netcoreapp1.0",
29+
"dotnet"
30+
],
31+
"dependencies": {
32+
"NUnit": "3.4.0",
33+
"dotnet-test-nunit": "3.4.0-beta-1",
34+
"Microsoft.NETCore.App": {
35+
"version": "1.0.0-*",
36+
"type": "platform"
37+
}
38+
},
39+
"buildOptions": {
40+
"define": [ "NETCORE" ]
41+
}
2542
}
2643
}
2744
}

‎src/net45/WampSharp.Default.Client/project.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@
1919
"WampSharp.NewtonsoftMsgpack": { "target": "project" },
2020
"WampSharp.WebSockets": { "target": "project" }
2121
}
22+
},
23+
"uap10.0": {
24+
"buildOptions": {
25+
"xmlDoc": true,
26+
"define": ["PCL"]
27+
},
28+
"dependencies": {
29+
"WampSharp.NewtonsoftJson": { "target": "project" },
30+
"WampSharp.NewtonsoftMsgpack": { "target": "project" },
31+
"WampSharp.Windows": { "target": "project" }
32+
}
2233
}
2334
}
2435
}

‎src/net45/WampSharp/project.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,36 @@
3030
"System.Security.Cryptography.Algorithms": "4.2.0",
3131
"System.Text.RegularExpressions": "4.1.0"
3232
}
33+
},
34+
"uap10.0": {
35+
"buildOptions": {
36+
"define": [ "NET45", "NETCORE", "PCL", "MANUAL_PROXY", "DISPATCH_PROXY", "LIBLOG_PUBLIC", "LIBLOG_PORTABLE", "TPL", "ASYNC_LOCAL", "ASYNC", "WAMPCRA" ],
37+
"xmlDoc": true
38+
},
39+
"dependencies": {
40+
"Microsoft.CSharp": "4.0.1",
41+
"System.Threading.Tasks.Dataflow": "4.6.0",
42+
"System.Collections.Concurrent": "4.0.12",
43+
"System.Collections.Immutable": "1.2.0",
44+
"System.ComponentModel": "4.0.1",
45+
"System.Net.Primitives": "4.0.11",
46+
"System.Reactive": "3.0.0",
47+
"System.Reflection.DispatchProxy": "4.0.1",
48+
"System.Reflection.Extensions": "4.0.1",
49+
"System.Reflection.TypeExtensions": "4.1.0",
50+
"System.Runtime": "4.1.0",
51+
"System.Runtime.Serialization.Primitives": "4.1.1",
52+
"System.Security.Cryptography.Algorithms": "4.2.0",
53+
"System.Text.RegularExpressions": "4.1.0",
54+
"Microsoft.TargetingPack.Private.WinRT": {
55+
"version": "1.0.1",
56+
"type": "build"
57+
},
58+
"Microsoft.NETCore.UniversalWindowsPlatform": {
59+
"version": "5.2.2",
60+
"type": "build"
61+
}
62+
}
3363
}
3464
}
3565
}

0 commit comments

Comments
 (0)