Skip to content

Commit 80dcdab

Browse files
author
Elad Zelingher
committed
Trying to support uap10.0
1 parent 41d4adf commit 80dcdab

File tree

8 files changed

+69
-26
lines changed

8 files changed

+69
-26
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: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,7 @@
3939
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
4040
</group>
4141
<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, )" />
4842
<dependency id="System.Reactive" version="[3.0.0, )" />
49-
<dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
50-
<dependency id="System.Reflection.DispatchProxy" 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, )" />
5643
</group>
5744
</dependencies>
5845
<id>WampSharp</id>

‎src/net45/Default/WampSharp.Windows/NuGet.config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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://www.myget.org/F/dotnet-core/" />
6+
</packageSources>
7+
<activePackageSource>
8+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
9+
</activePackageSource>
10+
</configuration>

‎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/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/NuGet.config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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://www.myget.org/F/dotnet-core/" />
6+
</packageSources>
7+
<activePackageSource>
8+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
9+
</activePackageSource>
10+
</configuration>

‎src/net45/WampSharp/project.json‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,7 @@
3737
"xmlDoc": true
3838
},
3939
"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",
4640
"System.Reactive": "3.0.0",
47-
"System.Reflection.Extensions": "4.0.1",
48-
"System.Reflection.DispatchProxy": "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",
5441
"Microsoft.TargetingPack.Private.WinRT": {
5542
"version": "1.0.1",
5643
"type": "build"

0 commit comments

Comments
 (0)