Merged changed from dev branch

2016-09-22 21:31:48 -03:00
parent 6319933ed0 1d24bc7808
commit 683f0d5013
19 changed files with 167 additions and 64 deletions
--- a/src/Discord.Net.WebSocket/project.json
+++ b/src/Discord.Net.WebSocket/project.json
@@ -1,11 +1,10 @@
 {
-  "version": "1.0.0-*",
+  "version": "1.0.0-beta2-*",

  "buildOptions": {
    "compile": {
-      "include": [ "../Discord.Net.Entities/**.cs", "../Discord.Net.Utils/**.cs" ]
-    },
-    "define": [ "WEBSOCKET" ]
+      "include": [ "../Discord.Net.Utils/**.cs" ]
+    }
  },

  "dependencies": {