Skip to content

Commit

Permalink
Adding WebSocket4Net for netstandard1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Elad Zelingher committed Aug 24, 2016
1 parent 30bc0be commit ada6927
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 2 deletions.
18 changes: 16 additions & 2 deletions NuGet/WampSharp.WebSocket4Net.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,20 @@
<authors>CodeSharp</authors>
<owners />
<dependencies>
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.14.1]" />
<group targetFramework="net45">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
</group>
<group targetFramework="net40">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
<!--This line is temporary here, until WebSocket4Net fixes its dependencies-->
<dependency id="SuperSocket.ClientEngine.Core" version="[0.8.0.6, )" />
</group>
</dependencies>
<id>WampSharp.WebSocket4Net</id>
<title>WampSharp WebSocket4Net connection</title>
Expand All @@ -20,5 +32,7 @@
<file src="bin\net45\WampSharp.WebSocket4Net.xml" target="lib\net45\WampSharp.WebSocket4Net.xml" />
<file src="bin\net40\WampSharp.WebSocket4Net.dll" target="lib\net40\WampSharp.WebSocket4Net.dll" />
<file src="bin\net40\WampSharp.WebSocket4Net.xml" target="lib\net40\WampSharp.WebSocket4Net.xml" />
<file src="bin\netstandard1.3\WampSharp.WebSocket4Net.dll" target="lib\netstandard1.3\WampSharp.WebSocket4Net.dll" />
<file src="bin\netstandard1.3\WampSharp.WebSocket4Net.xml" target="lib\netstandard1.3\WampSharp.WebSocket4Net.xml" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>f9cef7a6-fcd5-4aaa-a1b0-b1fbbdd1efbc</ProjectGuid>
<RootNamespace>WampSharp.WebSocket4Net</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
23 changes: 23 additions & 0 deletions src/net45/Default/WampSharp.WebSocket4Net/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"title": "WampSharp WebSocket4Net connection",
"version": "1.2.3-*",
"description": "WampSharp WebSocket4Net support",
"authors": [ "CodeSharp" ],
"packOptions": {
"requireLicenseAcceptance": false,
"tags": [ "websockets", "wampws", "rpc", "pubsub", "websocket4net", "wampv1", "wampv2" ],
"projectUrl": "https://github.com/Code-Sharp/WampSharp/"
},
"frameworks": {
"netstandard1.3": {
"buildOptions": {
"xmlDoc": true
},
"dependencies": {
"WampSharp": { "target": "project" },
"WebSocket4Net": "0.15.0-beta4",
"SuperSocket.ClientEngine.Core": "0.8.0.6"
}
}
}
}
19 changes: 19 additions & 0 deletions src/net45/Default/WampSharp.Windows/WampSharp.Windows.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>4a966847-5f52-4afa-8cb7-2aaf93d7d2c5</ProjectGuid>
<RootNamespace>WampSharp.Windows</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
13 changes: 13 additions & 0 deletions src/net45/WampSharpDotNet.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.Default.Client",
EndProject
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}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.WebSocket4Net", "Default\WampSharp.WebSocket4Net\WampSharp.WebSocket4Net.xproj", "{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WampSharp.Windows", "Default\WampSharp.Windows\WampSharp.Windows.xproj", "{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -76,6 +80,14 @@ Global
{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{841605EB-80CE-48C7-8CAE-0366FECFAED1}.Release|Any CPU.Build.0 = Release|Any CPU
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A966847-5F52-4AFA-8CB7-2AAF93D7D2C5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -92,5 +104,6 @@ Global
{F3EAF470-1D65-45F5-BD49-EE4BB1D42A3A} = {234FC630-9975-4DD9-8A28-DAA75BB1DD7E}
{1485A2E0-E225-47D8-A26B-077C44094C07} = {A034FCD9-A025-4F24-9E26-3D438944A526}
{841605EB-80CE-48C7-8CAE-0366FECFAED1} = {234FC630-9975-4DD9-8A28-DAA75BB1DD7E}
{F9CEF7A6-FCD5-4AAA-A1B0-B1FBBDD1EFBC} = {EF15CA4F-CCAA-4435-A0B3-0E7FC1B955CD}
EndGlobalSection
EndGlobal

0 comments on commit ada6927

Please sign in to comment.