Merge from develop

Author: Elad Zelingher

.gitignore

@@ -4,23 +4,50 @@
 # User-specific files
 *.suo
 *.user
+*.userosscache
 *.sln.docstates
 
-# Build results
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
 
+# Build results
 [Dd]ebug/
+[Dd]ebugPublic/
 [Rr]elease/
+[Rr]eleases/
 x64/
-build/
+x86/
+bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
 *_i.c
 *_p.c
+*_i.h
 *.ilk
 *.meta
 *.obj
@@ -40,28 +67,42 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
+*.svclog
 *.scc
 
+# Chutzpah Test files
+_Chutzpah*
+
 # Visual C++ cache files
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
 
 # Guidance Automation Toolkit
 *.gpState
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
 
 # TeamCity is a build add-in
 _TeamCity*
@@ -70,8 +111,16 @@ _TeamCity*
 *.dotCover
 
 # NCrunch
-*.ncrunch*
+_NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
 
 # Installshield output folder
 [Ee]xpress/
@@ -90,59 +139,115 @@ DocProject/Help/html
 publish/
 
 # Publish Web Output
-*.Publish.xml
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-packages/
-
-# Windows Azure Build Output
-csx
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
 *.build.csdef
 
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
 
 # Others
-sql/
-*.Cache
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
-*.[Pp]ublish.xml
+*.dbproj.schemaview
 *.pfx
 *.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
 
 # RIA/Silverlight projects
 Generated_Code/
 
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
 # SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
 
-# =========================
-# Windows detritus
-# =========================
+# Visual Studio 6 workspace options file
+*.opt
 
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
 
-# Folder config file
-Desktop.ini
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
 
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
+# FAKE - F# Make
+.fake/
 
-# Mac crap
-.DS_Store
+# JetBrains Rider
+.idea/
+*.sln.iml

.travis.yml

@@ -4,15 +4,19 @@ language: csharp
 
 solution: src/mono/WampSharpMono.sln
 
+mono:
+  - 4.2.3
+
+before_install:
+  - mkdir -p .nuget
+  - wget -O .nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+  - mono .nuget/nuget.exe # Output NuGet's version number
+
 install:
-  - travis_retry nuget restore src/mono/WampSharpMono.sln
-  - travis_retry nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
+  - mono .nuget/nuget.exe restore src/mono/WampSharpMono.sln -Verbosity detailed
+  - mono .nuget/nuget.exe install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner -Verbosity detailed
 
 script:
   - xbuild /p:Configuration=Release src/mono/WampSharpMono.sln
   - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/mono/Tests/WampSharp.Tests/bin/Release/WampSharp.Tests.dll
-  - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/mono/Tests/WampSharp.Tests.Wampv2/bin/Release/WampSharp.Tests.Wampv2.dll
-
-branches:
- except:
-  - wampv1
+  - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/mono/Tests/WampSharp.Tests.Wampv2/bin/Release/WampSharp.Tests.Wampv2.dll

NuGet/NuGet.exe

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>WampSharp.AspNetCore.WebSockets.Server</id>
+    <version>$version$</version>
+    <title>WampSharp AspNetCore WebSockets Server support</title>
+    <authors>CodeSharp</authors>
+    <projectUrl>https://github.com/Code-Sharp/WampSharp/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>WampSharp Microsoft.AspNetCore.WebSockets.Server support</description>
+    <tags>websockets,wampws,rpc,pubsub,wampv1,wampv2,aspnetcore</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard1.3">
+        <dependency id="Microsoft.AspNetCore.WebSockets.Server" version="[0.1.0, )" />
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="WampSharp.WebSockets" version="[$version$]" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="bin\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.dll" target="lib\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.dll" />
+    <file src="bin\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.xml" target="lib\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.xml" />
+  </files>
+</package>

NuGet/WampSharp.AspNetCore.WebSockets.Server.nuspec

@@ -14,6 +14,11 @@
         <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
         <dependency id="WampSharp.Windows" version="[$version$]" />
       </group>
+      <group targetFramework=".NETStandard1.3">
+        <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
+        <dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
+        <dependency id="WampSharp.WebSockets" version="[$version$]" />
+      </group>
     </dependencies>
     <id>WampSharp.Default.Client</id>
     <title>WampSharp default client binding</title>
@@ -29,5 +34,7 @@
     <file src="bin\net40\WampSharp.Default.Client.xml" target="lib\net40\WampSharp.Default.Client.xml" />
     <file src="bin\pcl\WampSharp.Default.Client.dll" target="lib\portable-win81+wpa81\WampSharp.Default.Client.dll" />
     <file src="bin\pcl\WampSharp.Default.Client.xml" target="lib\portable-win81+wpa81\WampSharp.Default.Client.xml" />
+    <file src="bin\netstandard1.3\WampSharp.Default.Client.dll" target="lib\netstandard1.3\WampSharp.Default.Client.dll" />
+    <file src="bin\netstandard1.3\WampSharp.Default.Client.xml" target="lib\netstandard1.3\WampSharp.Default.Client.xml" />
   </files>
 </package>

NuGet/WampSharp.Default.Client.nuspec

@@ -16,6 +16,9 @@
       <group targetFramework="portable-win81+wpa81">
         <dependency id="WampSharp.Default.Client" version="[$version$]" />
       </group>
+      <group targetFramework=".NETStandard1.3">
+        <dependency id="WampSharp.Default.Client" version="[$version$]" />
+      </group>
     </dependencies>
     <id>WampSharp.Default</id>
     <title>WampSharp default binding</title>

NuGet/WampSharp.Default.nuspec

@@ -5,8 +5,22 @@
     <authors>CodeSharp</authors>
     <owners />
     <dependencies>
-      <dependency id="WampSharp" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="6.0.5" />
+      <group targetFramework="net45">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="Newtonsoft.Json" version="[6.0.5, )" />
+      </group>
+      <group targetFramework="net40">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="Newtonsoft.Json" version="[6.0.5, )" />
+      </group>
+      <group targetFramework="portable-win81+wpa81">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="Newtonsoft.Json" version="[6.0.5, )" />
+      </group>
+      <group targetFramework=".NETStandard1.3">
+        <dependency id="WampSharp" version="[$version$]" />
+        <dependency id="Newtonsoft.Json" version="[9.0.1, )" />
+      </group>
     </dependencies>
     <id>WampSharp.NewtonsoftJson</id>
     <title>WampSharp Newtonsoft.Json binding</title>
@@ -22,5 +36,7 @@
     <file src="bin\net40\WampSharp.NewtonsoftJson.xml" target="lib\net40\WampSharp.NewtonsoftJson.xml" />
     <file src="bin\pcl\WampSharp.NewtonsoftJson.dll" target="lib\portable-win81+wpa81\WampSharp.NewtonsoftJson.dll" />
     <file src="bin\pcl\WampSharp.NewtonsoftJson.xml" target="lib\portable-win81+wpa81\WampSharp.NewtonsoftJson.xml" />
+    <file src="bin\netstandard1.3\WampSharp.NewtonsoftJson.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.dll" />
+    <file src="bin\netstandard1.3\WampSharp.NewtonsoftJson.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.xml" />
   </files>
 </package>