Skip to content

Commit ada6927

Browse files
author
Elad Zelingher
committed
Adding WebSocket4Net for netstandard1.3
1 parent 30bc0be commit ada6927

File tree

5 files changed

+90
-2
lines changed

5 files changed

+90
-2
lines changed

‎NuGet/WampSharp.WebSocket4Net.nuspec‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,20 @@
55
<authors>CodeSharp</authors>
66
<owners />
77
<dependencies>
8-
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="WebSocket4Net" version="[0.14.1]" />
8+
<group targetFramework="net45">
9+
<dependency id="WampSharp" version="[$version$]" />
10+
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
11+
</group>
12+
<group targetFramework="net40">
13+
<dependency id="WampSharp" version="[$version$]" />
14+
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
15+
</group>
16+
<group targetFramework=".NETStandard1.3">
17+
<dependency id="WampSharp" version="[$version$]" />
18+
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
19+
<!--This line is temporary here, until WebSocket4Net fixes its dependencies-->
20+
<dependency id="SuperSocket.ClientEngine.Core" version="[0.8.0.6, )" />
21+
</group>
1022
</dependencies>
1123
<id>WampSharp.WebSocket4Net</id>
1224
<title>WampSharp WebSocket4Net connection</title>
@@ -20,5 +32,7 @@
2032
<file src="bin\net45\WampSharp.WebSocket4Net.xml" target="lib\net45\WampSharp.WebSocket4Net.xml" />
2133
<file src="bin\net40\WampSharp.WebSocket4Net.dll" target="lib\net40\WampSharp.WebSocket4Net.dll" />
2234
<file src="bin\net40\WampSharp.WebSocket4Net.xml" target="lib\net40\WampSharp.WebSocket4Net.xml" />
35+
<file src="bin\netstandard1.3\WampSharp.WebSocket4Net.dll" target="lib\netstandard1.3\WampSharp.WebSocket4Net.dll" />
36+
<file src="bin\netstandard1.3\WampSharp.WebSocket4Net.xml" target="lib\netstandard1.3\WampSharp.WebSocket4Net.xml" />
2337
</files>
2438
</package>

‎src/net45/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.xproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>f9cef7a6-fcd5-4aaa-a1b0-b1fbbdd1efbc</ProjectGuid>
10+
<RootNamespace>WampSharp.WebSocket4Net</RootNamespace>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
13+
</PropertyGroup>
14+
15+
<PropertyGroup>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
</PropertyGroup>
18+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
19+
</Project>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"title": "WampSharp WebSocket4Net connection",
3+
"version": "1.2.3-*",
4+
"description": "WampSharp WebSocket4Net support",
5+
"authors": [ "CodeSharp" ],
6+
"packOptions": {
7+
"requireLicenseAcceptance": false,
8+
"tags": [ "websockets", "wampws", "rpc", "pubsub", "websocket4net", "wampv1", "wampv2" ],
9+
"projectUrl": "https://github.com/Code-Sharp/WampSharp/"
10+
},
11+
"frameworks": {
12+
"netstandard1.3": {
13+
"buildOptions": {
14+
"xmlDoc": true
15+
},
16+
"dependencies": {
17+
"WampSharp": { "target": "project" },
18+
"WebSocket4Net": "0.15.0-beta4",
19+
"SuperSocket.ClientEngine.Core": "0.8.0.6"
20+
}
21+
}
22+
}
23+
}

‎src/net45/Default/WampSharp.Windows/WampSharp.Windows.xproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>4a966847-5f52-4afa-8cb7-2aaf93d7d2c5</ProjectGuid>
10+
<RootNamespace>WampSharp.Windows</RootNamespace>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
13+
</PropertyGroup>
14+
15+
<PropertyGroup>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
</PropertyGroup>
18+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
19+
</Project>

‎src/net45/WampSharpDotNet.sln‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.Default.Client",
3434
EndProject
3535
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.AspNetCore.WebSockets.Server", "Extensions\WampSharp.AspNetCore.WebSockets.Server\WampSharp.AspNetCore.WebSockets.Server.xproj", "{841605EB-80CE-48C7-8CAE-0366FECFAED1}"
3636
EndProject
37+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.WebSocket4Net", "Default\WampSharp.WebSocket4Net\WampSharp.WebSocket4Net.xproj", "{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}"
38+
EndProject
39+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.Windows", "Default\WampSharp.Windows\WampSharp.Windows.xproj", "{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}"
40+
EndProject
3741
Global
3842
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3943
Debug|Any CPU = Debug|Any CPU
@@ -76,6 +80,14 @@ Global
7680
{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
7781
{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
7882
{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Release|Any CPU.Build.0 = Release|Any CPU
83+
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84+
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
85+
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
86+
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
87+
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Release|Any CPU.Build.0 = Release|Any CPU
7991
EndGlobalSection
8092
GlobalSection(SolutionProperties) = preSolution
8193
HideSolutionNode = FALSE
@@ -92,5 +104,6 @@ Global
92104
{F3EAF470-1D65-45F5-BD49-EE4BB1D42A3A} = {234FC630-9975-4DD9-8A28-DAA75BB1DD7E}
93105
{1485A2E0-E225-47D8-A26B-077C44094C07} = {A034FCD9-A025-4F24-9E26-3D438944A526}
94106
{841605EB-80CE-48C7-8CAE-0366FECFAED1} = {234FC630-9975-4DD9-8A28-DAA75BB1DD7E}
107+
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC} = {EF15CA4F-CCAA-4435-A0B3-0E7FC1B955CD}
95108
EndGlobalSection
96109
EndGlobal

0 commit comments

Comments
 (0)