From 41d4adf4443856f172ec84354a58bcb5ff51e736 Mon Sep 17 00:00:00 2001
From: Elad Zelingher <dark_leizar@walla.com>
Date: Sun, 31 Jul 2016 00:43:45 +0300
Subject: [PATCH 1/5] Trying to make uap10.0 work with DispatchProxy

---
 NuGet/WampSharp.nuspec                        | 18 +++++++++++
 .../Tests/WampSharp.Tests.Wampv2/project.json | 17 +++++++++++
 src/net45/WampSharp/project.json              | 30 +++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/NuGet/WampSharp.nuspec b/NuGet/WampSharp.nuspec
index 48ec6d6e7..d40b6af89 100644
--- a/NuGet/WampSharp.nuspec
+++ b/NuGet/WampSharp.nuspec
@@ -38,6 +38,22 @@
         <dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
         <dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
       </group>
+      <group targetFramework="UAP10.0">
+        <dependency id="Microsoft.CSharp" version="[4.0.1, )" />
+        <dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
+        <dependency id="System.Collections.Concurrent" version="[4.0.12, )" />
+        <dependency id="System.Collections.Immutable" version="[1.2.0, )" />
+        <dependency id="System.ComponentModel" version="[4.0.1, )" />
+        <dependency id="System.Net.Primitives" version="[4.0.11, )" />
+        <dependency id="System.Reactive" version="[3.0.0, )" />
+        <dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
+        <dependency id="System.Reflection.DispatchProxy" version="[4.0.1, )" />
+        <dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
+        <dependency id="System.Runtime" version="[4.1.0, )" />
+        <dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
+        <dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
+        <dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
+      </group>
     </dependencies>
     <id>WampSharp</id>
     <title>WampSharp</title>
@@ -55,5 +71,7 @@
     <file src="bin\pcl\WampSharp.xml" target="lib\portable-win81+wpa81\WampSharp.xml" />
     <file src="bin\netstandard1.3\WampSharp.dll" target="lib\netstandard1.3\WampSharp.dll" />
     <file src="bin\netstandard1.3\WampSharp.xml" target="lib\netstandard1.3\WampSharp.xml" />
+    <file src="bin\uap10.0\WampSharp.dll" target="lib\uap10.0\WampSharp.dll" />
+    <file src="bin\uap10.0\WampSharp.xml" target="lib\uap10.0\WampSharp.xml" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/project.json b/src/net45/Tests/WampSharp.Tests.Wampv2/project.json
index fbf1253f1..55aa8bc69 100644
--- a/src/net45/Tests/WampSharp.Tests.Wampv2/project.json
+++ b/src/net45/Tests/WampSharp.Tests.Wampv2/project.json
@@ -22,6 +22,23 @@
       "buildOptions": {
         "define": [ "NETCORE" ]
       }
+    },
+    "uap10.0": {
+      "imports": [
+        "netcoreapp1.0",
+        "dotnet"
+      ],
+      "dependencies": {
+        "NUnit": "3.4.0",
+        "dotnet-test-nunit": "3.4.0-beta-1",
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        }
+      },
+      "buildOptions": {
+        "define": [ "NETCORE" ]
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/net45/WampSharp/project.json b/src/net45/WampSharp/project.json
index fdd5a2059..521d99f93 100644
--- a/src/net45/WampSharp/project.json
+++ b/src/net45/WampSharp/project.json
@@ -30,6 +30,36 @@
         "System.Security.Cryptography.Algorithms": "4.2.0",
         "System.Text.RegularExpressions": "4.1.0"
       }
+    },
+    "uap10.0": {
+      "buildOptions": {
+        "define": [ "NET45", "NETCORE", "PCL", "MANUAL_PROXY", "DISPATCH_PROXY", "LIBLOG_PUBLIC", "LIBLOG_PORTABLE", "TPL", "ASYNC_LOCAL", "ASYNC", "WAMPCRA" ],
+        "xmlDoc": true
+      },
+      "dependencies": {
+        "Microsoft.CSharp": "4.0.1",
+        "System.Threading.Tasks.Dataflow": "4.6.0",
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Collections.Immutable": "1.2.0",
+        "System.ComponentModel": "4.0.1",
+        "System.Net.Primitives": "4.0.11",
+        "System.Reactive": "3.0.0",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.DispatchProxy": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Serialization.Primitives": "4.1.1",
+        "System.Security.Cryptography.Algorithms": "4.2.0",
+        "System.Text.RegularExpressions": "4.1.0",
+        "Microsoft.TargetingPack.Private.WinRT": {
+          "version": "1.0.1",
+          "type": "build"
+        },
+        "Microsoft.NETCore.UniversalWindowsPlatform": {
+          "version": "5.2.2",
+          "type": "build"
+        }
+      }
     }
   }
 }
\ No newline at end of file

From 80dcdab68cd5051a83d24f158a7b69cef1190419 Mon Sep 17 00:00:00 2001
From: Elad Zelingher <dark_leizar@walla.com>
Date: Sun, 31 Jul 2016 01:44:07 +0300
Subject: [PATCH 2/5] Trying to support uap10.0

---
 NuGet/WampSharp.Default.Client.nuspec         |  6 ++++
 NuGet/WampSharp.Windows.nuspec                |  2 ++
 NuGet/WampSharp.nuspec                        | 13 --------
 .../Default/WampSharp.Windows/NuGet.config    | 10 +++++++
 .../Default/WampSharp.Windows/project.json    | 30 +++++++++++++++++++
 .../WampSharp.Default.Client/project.json     | 11 +++++++
 src/net45/WampSharp/NuGet.config              | 10 +++++++
 src/net45/WampSharp/project.json              | 13 --------
 8 files changed, 69 insertions(+), 26 deletions(-)
 create mode 100644 src/net45/Default/WampSharp.Windows/NuGet.config
 create mode 100644 src/net45/Default/WampSharp.Windows/project.json
 create mode 100644 src/net45/WampSharp/NuGet.config

diff --git a/NuGet/WampSharp.Default.Client.nuspec b/NuGet/WampSharp.Default.Client.nuspec
index a7cfd5538..45924276d 100644
--- a/NuGet/WampSharp.Default.Client.nuspec
+++ b/NuGet/WampSharp.Default.Client.nuspec
@@ -14,6 +14,10 @@
         <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
         <dependency id="WampSharp.Windows" version="[$version$]" />
       </group>
+      <group targetFramework="uap10.0">
+        <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$]" />
@@ -34,6 +38,8 @@
     <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\uap10.0\WampSharp.Default.Client.dll" target="lib\uap10.0\WampSharp.Default.Client.dll" />
+    <file src="bin\uap10.0\WampSharp.Default.Client.xml" target="lib\uap10.0\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>
diff --git a/NuGet/WampSharp.Windows.nuspec b/NuGet/WampSharp.Windows.nuspec
index c3eee37b7..3c5bd1f1b 100644
--- a/NuGet/WampSharp.Windows.nuspec
+++ b/NuGet/WampSharp.Windows.nuspec
@@ -20,5 +20,7 @@
   <files>
     <file src="bin\pcl\WampSharp.Windows.dll" target="lib\portable-win81+wpa81\WampSharp.Windows.dll" />
     <file src="bin\pcl\WampSharp.Windows.xml" target="lib\portable-win81+wpa81\WampSharp.Windows.xml" />
+    <file src="bin\uap10.0\WampSharp.Windows.dll" target="lib\uap10.0\WampSharp.Windows.dll" />
+    <file src="bin\uap10.0\WampSharp.Windows.xml" target="lib\uap10.0\WampSharp.Windows.xml" />
   </files>
 </package>
\ No newline at end of file
diff --git a/NuGet/WampSharp.nuspec b/NuGet/WampSharp.nuspec
index d40b6af89..cb04f0504 100644
--- a/NuGet/WampSharp.nuspec
+++ b/NuGet/WampSharp.nuspec
@@ -39,20 +39,7 @@
         <dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
       </group>
       <group targetFramework="UAP10.0">
-        <dependency id="Microsoft.CSharp" version="[4.0.1, )" />
-        <dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
-        <dependency id="System.Collections.Concurrent" version="[4.0.12, )" />
-        <dependency id="System.Collections.Immutable" version="[1.2.0, )" />
-        <dependency id="System.ComponentModel" version="[4.0.1, )" />
-        <dependency id="System.Net.Primitives" version="[4.0.11, )" />
         <dependency id="System.Reactive" version="[3.0.0, )" />
-        <dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
-        <dependency id="System.Reflection.DispatchProxy" version="[4.0.1, )" />
-        <dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
-        <dependency id="System.Runtime" version="[4.1.0, )" />
-        <dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
-        <dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
-        <dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
       </group>
     </dependencies>
     <id>WampSharp</id>
diff --git a/src/net45/Default/WampSharp.Windows/NuGet.config b/src/net45/Default/WampSharp.Windows/NuGet.config
new file mode 100644
index 000000000..03f314ee0
--- /dev/null
+++ b/src/net45/Default/WampSharp.Windows/NuGet.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="CoreFx" value="https://www.myget.org/F/dotnet-core/" />
+  </packageSources>
+  <activePackageSource>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </activePackageSource>
+</configuration>
\ No newline at end of file
diff --git a/src/net45/Default/WampSharp.Windows/project.json b/src/net45/Default/WampSharp.Windows/project.json
new file mode 100644
index 000000000..8ffbfb144
--- /dev/null
+++ b/src/net45/Default/WampSharp.Windows/project.json
@@ -0,0 +1,30 @@
+{
+  "title": "WampSharp Windows support",
+  "version": "1.2.3-*",
+  "description": "Windows websocket connection for WampSharp",
+  "authors": [ "CodeSharp" ],
+  "packOptions": {
+    "requireLicenseAcceptance": false,
+    "tags": [ "websockets", "wampws", "rpc", "pubsub", "windows", "wampv2" ],
+    "projectUrl": "https://github.com/Code-Sharp/WampSharp/"
+  },
+  "frameworks": {
+    "uap10.0": {
+      "buildOptions": {
+        "xmlDoc": true,
+        "define": ["PCL"]
+      },
+      "dependencies": {
+        "WampSharp": { "target": "project" },
+        "Microsoft.TargetingPack.Private.WinRT": {
+          "version": "1.0.1",
+          "type": "build"
+        },
+        "Microsoft.NETCore.UniversalWindowsPlatform": {
+          "version": "5.2.2",
+          "type": "build"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/net45/WampSharp.Default.Client/project.json b/src/net45/WampSharp.Default.Client/project.json
index f5097dd93..d818ae12a 100644
--- a/src/net45/WampSharp.Default.Client/project.json
+++ b/src/net45/WampSharp.Default.Client/project.json
@@ -19,6 +19,17 @@
         "WampSharp.NewtonsoftMsgpack": { "target": "project" },
         "WampSharp.WebSockets": { "target": "project" }
       }
+    },
+    "uap10.0": {
+      "buildOptions": {
+        "xmlDoc": true,
+        "define": ["PCL"]
+      },
+      "dependencies": {
+        "WampSharp.NewtonsoftJson": { "target": "project" },
+        "WampSharp.NewtonsoftMsgpack": { "target": "project" },
+        "WampSharp.Windows": { "target": "project" }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/net45/WampSharp/NuGet.config b/src/net45/WampSharp/NuGet.config
new file mode 100644
index 000000000..03f314ee0
--- /dev/null
+++ b/src/net45/WampSharp/NuGet.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="CoreFx" value="https://www.myget.org/F/dotnet-core/" />
+  </packageSources>
+  <activePackageSource>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </activePackageSource>
+</configuration>
\ No newline at end of file
diff --git a/src/net45/WampSharp/project.json b/src/net45/WampSharp/project.json
index 521d99f93..74739dfc4 100644
--- a/src/net45/WampSharp/project.json
+++ b/src/net45/WampSharp/project.json
@@ -37,20 +37,7 @@
         "xmlDoc": true
       },
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1",
-        "System.Threading.Tasks.Dataflow": "4.6.0",
-        "System.Collections.Concurrent": "4.0.12",
-        "System.Collections.Immutable": "1.2.0",
-        "System.ComponentModel": "4.0.1",
-        "System.Net.Primitives": "4.0.11",
         "System.Reactive": "3.0.0",
-        "System.Reflection.Extensions": "4.0.1",
-        "System.Reflection.DispatchProxy": "4.0.1",
-        "System.Reflection.TypeExtensions": "4.1.0",
-        "System.Runtime": "4.1.0",
-        "System.Runtime.Serialization.Primitives": "4.1.1",
-        "System.Security.Cryptography.Algorithms": "4.2.0",
-        "System.Text.RegularExpressions": "4.1.0",
         "Microsoft.TargetingPack.Private.WinRT": {
           "version": "1.0.1",
           "type": "build"

From 8a8e3befe68323b8aa3d64ff3d2ed5ddae2aca0a Mon Sep 17 00:00:00 2001
From: Elad Zelingher <dark_leizar@walla.com>
Date: Sun, 31 Jul 2016 01:54:47 +0300
Subject: [PATCH 3/5] Moving NuGet.config

---
 .../Default/WampSharp.Windows => NuGet}/NuGet.config   |  0
 src/net45/WampSharp/NuGet.config                       | 10 ----------
 2 files changed, 10 deletions(-)
 rename {src/net45/Default/WampSharp.Windows => NuGet}/NuGet.config (100%)
 delete mode 100644 src/net45/WampSharp/NuGet.config

diff --git a/src/net45/Default/WampSharp.Windows/NuGet.config b/NuGet/NuGet.config
similarity index 100%
rename from src/net45/Default/WampSharp.Windows/NuGet.config
rename to NuGet/NuGet.config
diff --git a/src/net45/WampSharp/NuGet.config b/src/net45/WampSharp/NuGet.config
deleted file mode 100644
index 03f314ee0..000000000
--- a/src/net45/WampSharp/NuGet.config
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="CoreFx" value="https://www.myget.org/F/dotnet-core/" />
-  </packageSources>
-  <activePackageSource>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </activePackageSource>
-</configuration>
\ No newline at end of file

From f5f716faa9fe290d342cbfb9edd69096a077f1aa Mon Sep 17 00:00:00 2001
From: Elad Zelingher <dark_leizar@walla.com>
Date: Sun, 31 Jul 2016 01:59:09 +0300
Subject: [PATCH 4/5] Moved NuGet.config to net45

---
 {NuGet => src/net45}/NuGet.config | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 rename {NuGet => src/net45}/NuGet.config (51%)

diff --git a/NuGet/NuGet.config b/src/net45/NuGet.config
similarity index 51%
rename from NuGet/NuGet.config
rename to src/net45/NuGet.config
index 03f314ee0..f2f40b87e 100644
--- a/NuGet/NuGet.config
+++ b/src/net45/NuGet.config
@@ -2,9 +2,6 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="CoreFx" value="https://www.myget.org/F/dotnet-core/" />
+    <add key="corefx" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
-  <activePackageSource>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-  </activePackageSource>
 </configuration>
\ No newline at end of file

From 5bab1afdfd7f179394ddbfa8bdb43aade97cec89 Mon Sep 17 00:00:00 2001
From: Elad Zelingher <dark_leizar@walla.com>
Date: Sun, 31 Jul 2016 10:07:24 +0300
Subject: [PATCH 5/5] Readding dependencies

---
 NuGet/WampSharp.nuspec           | 13 +++++++++++++
 src/net45/WampSharp/project.json | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/NuGet/WampSharp.nuspec b/NuGet/WampSharp.nuspec
index cb04f0504..e2fd61d3c 100644
--- a/NuGet/WampSharp.nuspec
+++ b/NuGet/WampSharp.nuspec
@@ -39,7 +39,20 @@
         <dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
       </group>
       <group targetFramework="UAP10.0">
+        <dependency id="Microsoft.CSharp" version="[4.0.1, )" />
+        <dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
+        <dependency id="System.Collections.Concurrent" version="[4.0.12, )" />
+        <dependency id="System.Collections.Immutable" version="[1.2.0, )" />
+        <dependency id="System.ComponentModel" version="[4.0.1, )" />
+        <dependency id="System.Net.Primitives" version="[4.0.11, )" />
         <dependency id="System.Reactive" version="[3.0.0, )" />
+        <dependency id="System.Reflection.DispatchProxy" version="[4.0.1, )" />
+        <dependency id="System.Reflection.Extensions" version="[4.0.1, )" />
+        <dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
+        <dependency id="System.Runtime" version="[4.1.0, )" />
+        <dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
+        <dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
+        <dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
       </group>
     </dependencies>
     <id>WampSharp</id>
diff --git a/src/net45/WampSharp/project.json b/src/net45/WampSharp/project.json
index 74739dfc4..b549410bb 100644
--- a/src/net45/WampSharp/project.json
+++ b/src/net45/WampSharp/project.json
@@ -37,7 +37,20 @@
         "xmlDoc": true
       },
       "dependencies": {
+        "Microsoft.CSharp": "4.0.1",
+        "System.Threading.Tasks.Dataflow": "4.6.0",
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Collections.Immutable": "1.2.0",
+        "System.ComponentModel": "4.0.1",
+        "System.Net.Primitives": "4.0.11",
         "System.Reactive": "3.0.0",
+        "System.Reflection.DispatchProxy": "4.0.1",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Serialization.Primitives": "4.1.1",
+        "System.Security.Cryptography.Algorithms": "4.2.0",
+        "System.Text.RegularExpressions": "4.1.0",
         "Microsoft.TargetingPack.Private.WinRT": {
           "version": "1.0.1",
           "type": "build"