diff --git a/Discord.Net.sln b/Discord.Net.sln
index 48d0dbf93..8aaecee31 100644
--- a/Discord.Net.sln
+++ b/Discord.Net.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.25914.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F7F3E124-93C7-4846-AE87-9CE12BD82859}"
ProjectSection(SolutionItems) = preProject
@@ -9,19 +9,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net", "src\Discord.Net\Discord.Net.xproj", "{496DB20A-A455-4D01-B6BC-90FE6D7C6B81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net", "src\Discord.Net\Discord.Net.csproj", "{496DB20A-A455-4D01-B6BC-90FE6D7C6B81}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Core", "src\Discord.Net.Core\Discord.Net.Core.xproj", "{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Core", "src\Discord.Net.Core\Discord.Net.Core.csproj", "{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Impls", "Impls", "{288C363D-A636-4EAE-9AC1-4698B641B26E}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Rest", "src\Discord.Net.Rest\Discord.Net.Rest.xproj", "{BFC6DC28-0351-4573-926A-D4124244C04F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Rest", "src\Discord.Net.Rest\Discord.Net.Rest.csproj", "{BFC6DC28-0351-4573-926A-D4124244C04F}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.WebSocket", "src\Discord.Net.WebSocket\Discord.Net.WebSocket.xproj", "{22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.WebSocket", "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj", "{22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Rpc", "src\Discord.Net.Rpc\Discord.Net.Rpc.xproj", "{5688A353-121E-40A1-8BFA-B17B91FB48FB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Rpc", "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj", "{5688A353-121E-40A1-8BFA-B17B91FB48FB}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Commands", "src\Discord.Net.Commands\Discord.Net.Commands.xproj", "{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Discord.Net.Commands", "src\Discord.Net.Commands\Discord.Net.Commands.csproj", "{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,28 +31,28 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{496DB20A-A455-4D01-B6BC-90FE6D7C6B81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{496DB20A-A455-4D01-B6BC-90FE6D7C6B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {496DB20A-A455-4D01-B6BC-90FE6D7C6B81}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {496DB20A-A455-4D01-B6BC-90FE6D7C6B81}.Release|Any CPU.Build.0 = Release|Any CPU
+ {496DB20A-A455-4D01-B6BC-90FE6D7C6B81}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {496DB20A-A455-4D01-B6BC-90FE6D7C6B81}.Release|Any CPU.Build.0 = Debug|Any CPU
{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.Build.0 = Debug|Any CPU
{BFC6DC28-0351-4573-926A-D4124244C04F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFC6DC28-0351-4573-926A-D4124244C04F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BFC6DC28-0351-4573-926A-D4124244C04F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BFC6DC28-0351-4573-926A-D4124244C04F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BFC6DC28-0351-4573-926A-D4124244C04F}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {BFC6DC28-0351-4573-926A-D4124244C04F}.Release|Any CPU.Build.0 = Debug|Any CPU
{22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {22AB6C66-536C-4AC2-BBDB-A8BC4EB6B14D}.Release|Any CPU.Build.0 = Debug|Any CPU
{5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5688A353-121E-40A1-8BFA-B17B91FB48FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {5688A353-121E-40A1-8BFA-B17B91FB48FB}.Release|Any CPU.Build.0 = Debug|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
new file mode 100644
index 000000000..2f137dbc7
--- /dev/null
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -0,0 +1,45 @@
+
+
+
+
+ A Discord.Net extension adding support for bot commands.
+ 1.0.0-beta2
+ netstandard1.3
+ Discord.Net.Commands
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ $(PackageTargetFallback);dotnet5.4;dnxcore50;portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.0.0-alpha-20161104-2
+ All
+
+
+ 1.6.0
+
+
+
+
+ $(DefineConstants);RELEASE
+ $(NoWarn);CS1573;CS1591
+ true
+ true
+
+
+
+
diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.xproj b/src/Discord.Net.Commands/Discord.Net.Commands.xproj
deleted file mode 100644
index 597faf69c..000000000
--- a/src/Discord.Net.Commands/Discord.Net.Commands.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 078dd7e6-943d-4d09-afc2-d2ba58b76c9c
- Discord.Commands
- .\obj
- .\bin\
- v4.5.2
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Discord.Net.Commands/project.json b/src/Discord.Net.Commands/project.json
deleted file mode 100644
index e730296a8..000000000
--- a/src/Discord.Net.Commands/project.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "version": "1.0.0-beta2-*",
- "description": "A Discord.Net extension adding support for bot commands.",
- "authors": [ "RogueException" ],
-
- "packOptions": {
- "tags": [ "discord", "discordapp" ],
- "licenseUrl": "http://opensource.org/licenses/MIT",
- "projectUrl": "https://github.com/RogueException/Discord.Net",
- "repository": {
- "type": "git",
- "url": "git://github.com/RogueException/Discord.Net"
- }
- },
-
- "configurations": {
- "Release": {
- "buildOptions": {
- "define": [ "RELEASE" ],
- "nowarn": [ "CS1573", "CS1591" ],
- "optimize": true,
- "warningsAsErrors": true,
- "xmlDoc": true
- }
- }
- },
-
- "dependencies": {
- "Discord.Net.Core": {
- "target": "project"
- }
- },
-
- "frameworks": {
- "netstandard1.3": {
- "imports": [
- "dotnet5.4",
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
new file mode 100644
index 000000000..1c054c620
--- /dev/null
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -0,0 +1,63 @@
+
+
+
+
+ A .Net API wrapper and bot framework for Discord.
+ 1.0.0-beta2
+ netstandard1.3
+ Discord.Net.Core
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ $(PackageTargetFallback);dotnet5.4;dnxcore50;portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+ 1.0.0-alpha-20161104-2
+ All
+
+
+ 1.6.0
+
+
+ 4.0.1
+
+
+ 9.0.1
+
+
+ 4.0.12
+
+
+ 1.2.0
+
+
+ 3.0.0
+
+
+ 4.1.0
+
+
+ 4.0.0
+ All
+
+
+
+
+ $(DefineConstants);RELEASE
+ $(NoWarn);CS1573;CS1591
+ true
+ true
+
+
+
+
diff --git a/src/Discord.Net.Core/Discord.Net.Core.xproj b/src/Discord.Net.Core/Discord.Net.Core.xproj
deleted file mode 100644
index 6759e09b4..000000000
--- a/src/Discord.Net.Core/Discord.Net.Core.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 91e9e7bd-75c9-4e98-84aa-2c271922e5c2
- Discord
- .\obj
- .\bin\
- v4.5.2
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Discord.Net.Core/project.json b/src/Discord.Net.Core/project.json
deleted file mode 100644
index c44be49b6..000000000
--- a/src/Discord.Net.Core/project.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "version": "1.0.0-beta2-*",
- "description": "A .Net API wrapper and bot framework for Discord.",
- "authors": [ "RogueException" ],
-
- "packOptions": {
- "tags": [ "discord", "discordapp" ],
- "licenseUrl": "http://opensource.org/licenses/MIT",
- "projectUrl": "https://github.com/RogueException/Discord.Net",
- "repository": {
- "type": "git",
- "url": "git://github.com/RogueException/Discord.Net"
- }
- },
-
- "configurations": {
- "Release": {
- "buildOptions": {
- "define": [ "RELEASE" ],
- "nowarn": [ "CS1573", "CS1591" ],
- "optimize": true,
- "warningsAsErrors": true,
- "xmlDoc": true
- }
- }
- },
-
- "dependencies": {
- "Microsoft.Win32.Primitives": "4.0.1",
- "Newtonsoft.Json": "9.0.1",
- "System.Collections.Concurrent": "4.0.12",
- "System.Collections.Immutable": "1.2.0",
- "System.Interactive.Async": "3.0.0",
- "System.Net.Http": "4.1.0",
- "System.Net.WebSockets.Client": {
- "version": "4.0.0",
- "type": "build"
- }
- },
-
- "frameworks": {
- "netstandard1.3": {
- "imports": [
- "dotnet5.4",
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
new file mode 100644
index 000000000..0802a5975
--- /dev/null
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -0,0 +1,48 @@
+
+
+
+
+ A core Discord.Net library containing the REST client and models.
+ 1.0.0-beta2
+ netstandard1.3
+ Discord.Net.Rest
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ $(PackageTargetFallback);dotnet5.4;dnxcore50;portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.0.0-alpha-20161104-2
+ All
+
+
+ 1.6.0
+
+
+ 4.0.1
+
+
+
+
+ $(DefineConstants);RELEASE
+ $(NoWarn);CS1573;CS1591
+ true
+ true
+
+
+
+
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.xproj b/src/Discord.Net.Rest/Discord.Net.Rest.xproj
deleted file mode 100644
index 6a5d3e2b8..000000000
--- a/src/Discord.Net.Rest/Discord.Net.Rest.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- bfc6dc28-0351-4573-926a-d4124244c04f
- Discord.Rest
- .\obj
- .\bin\
- v4.6.1
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Discord.Net.Rest/project.json b/src/Discord.Net.Rest/project.json
deleted file mode 100644
index 19b244961..000000000
--- a/src/Discord.Net.Rest/project.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "version": "1.0.0-beta2-*",
- "description": "A core Discord.Net library containing the REST client and models.",
- "authors": [ "RogueException" ],
-
- "packOptions": {
- "tags": [ "discord", "discordapp" ],
- "licenseUrl": "http://opensource.org/licenses/MIT",
- "projectUrl": "https://github.com/RogueException/Discord.Net",
- "repository": {
- "type": "git",
- "url": "git://github.com/RogueException/Discord.Net"
- }
- },
-
- "configurations": {
- "Release": {
- "buildOptions": {
- "define": [ "RELEASE" ],
- "nowarn": [ "CS1573", "CS1591" ],
- "optimize": true,
- "warningsAsErrors": true,
- "xmlDoc": true
- }
- }
- },
-
- "dependencies": {
- "Discord.Net.Core": {
- "target": "project"
- },
- "System.IO.FileSystem": "4.0.1"
- },
-
- "frameworks": {
- "netstandard1.3": {
- "imports": [
- "dotnet5.4",
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
new file mode 100644
index 000000000..b676332b8
--- /dev/null
+++ b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
@@ -0,0 +1,52 @@
+
+
+
+
+ A core Discord.Net library containing the RPC client and models.
+ 1.0.0-beta2
+ netstandard1.3
+ Discord.Net.Rpc
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ $(PackageTargetFallback);dotnet5.4;dnxcore50;portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.0.0-alpha-20161104-2
+ All
+
+
+ 1.6.0
+
+
+ 4.1.0
+
+
+ 4.0.0
+
+
+
+
+ $(DefineConstants);RELEASE
+ $(NoWarn);CS1573;CS1591
+ true
+ true
+
+
+
+
diff --git a/src/Discord.Net.Rpc/Discord.Net.Rpc.xproj b/src/Discord.Net.Rpc/Discord.Net.Rpc.xproj
deleted file mode 100644
index c5d036842..000000000
--- a/src/Discord.Net.Rpc/Discord.Net.Rpc.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 5688a353-121e-40a1-8bfa-b17b91fb48fb
- Discord.Rpc
- .\obj
- .\bin\
- v4.6.1
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Discord.Net.Rpc/project.json b/src/Discord.Net.Rpc/project.json
deleted file mode 100644
index dc1944f5b..000000000
--- a/src/Discord.Net.Rpc/project.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "version": "1.0.0-beta2-*",
- "description": "A core Discord.Net library containing the RPC client and models.",
- "authors": [ "RogueException" ],
-
- "packOptions": {
- "tags": [ "discord", "discordapp" ],
- "licenseUrl": "http://opensource.org/licenses/MIT",
- "projectUrl": "https://github.com/RogueException/Discord.Net",
- "repository": {
- "type": "git",
- "url": "git://github.com/RogueException/Discord.Net"
- }
- },
-
- "configurations": {
- "Release": {
- "buildOptions": {
- "define": [ "RELEASE" ],
- "nowarn": [ "CS1573", "CS1591" ],
- "optimize": true,
- "warningsAsErrors": true,
- "xmlDoc": true
- }
- }
- },
-
- "dependencies": {
- "Discord.Net.Core": {
- "target": "project"
- },
- "Discord.Net.Rest": {
- "target": "project"
- },
- "System.IO.Compression": "4.1.0",
- "System.Net.WebSockets.Client": "4.0.0"
- },
-
- "frameworks": {
- "netstandard1.3": {
- "imports": [
- "dotnet5.4",
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
new file mode 100644
index 000000000..8019981ea
--- /dev/null
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -0,0 +1,62 @@
+
+
+
+
+ A core Discord.Net library containing the WebSocket client and models.
+ 1.0.0-beta2
+ netstandard1.3
+ true
+ Discord.Net.WebSocket
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ $(PackageTargetFallback);dotnet5.4;dnxcore50;portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.0.0-alpha-20161104-2
+ All
+
+
+ 1.6.0
+
+
+ 4.1.0
+
+
+ 4.0.0
+
+
+ 4.1.0
+
+
+ 4.0.0
+
+
+ 4.1.0
+
+
+
+
+ $(DefineConstants);RELEASE
+ $(NoWarn);CS1573;CS1591
+ true
+ true
+
+
+
+
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xproj
deleted file mode 100644
index 45e13b5ce..000000000
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 22ab6c66-536c-4ac2-bbdb-a8bc4eb6b14d
- Discord.WebSocket
- .\obj
- .\bin\
- v4.6.1
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Discord.Net.WebSocket/project.json b/src/Discord.Net.WebSocket/project.json
deleted file mode 100644
index 7bc15a34d..000000000
--- a/src/Discord.Net.WebSocket/project.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "version": "1.0.0-beta2-*",
- "description": "A core Discord.Net library containing the WebSocket client and models.",
- "authors": [ "RogueException" ],
-
- "packOptions": {
- "tags": [ "discord", "discordapp" ],
- "licenseUrl": "http://opensource.org/licenses/MIT",
- "projectUrl": "https://github.com/RogueException/Discord.Net",
- "repository": {
- "type": "git",
- "url": "git://github.com/RogueException/Discord.Net"
- }
- },
-
- "buildOptions": {
- "allowUnsafe": true
- },
-
- "configurations": {
- "Release": {
- "buildOptions": {
- "define": [ "RELEASE" ],
- "nowarn": [ "CS1573", "CS1591" ],
- "optimize": true,
- "warningsAsErrors": true,
- "xmlDoc": true
- }
- }
- },
-
- "dependencies": {
- "Discord.Net.Core": {
- "target": "project"
- },
- "Discord.Net.Rest": {
- "target": "project"
- },
- "System.IO.Compression": "4.1.0",
- "System.Net.NameResolution": "4.0.0",
- "System.Net.Sockets": "4.1.0",
- "System.Net.WebSockets.Client": "4.0.0",
- "System.Runtime.InteropServices": "4.1.0"
- },
-
- "frameworks": {
- "netstandard1.3": {
- "imports": [
- "dotnet5.4",
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
diff --git a/src/Discord.Net/Discord.Net.csproj b/src/Discord.Net/Discord.Net.csproj
new file mode 100644
index 000000000..c3a7eb7f2
--- /dev/null
+++ b/src/Discord.Net/Discord.Net.csproj
@@ -0,0 +1,46 @@
+
+
+
+
+ An aynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.
+ 1.0.0-beta2
+ netstandard1.3
+ Discord.Net
+ discord;discordapp
+ https://github.com/RogueException/Discord.Net
+ http://opensource.org/licenses/MIT
+ git
+ git://github.com/RogueException/Discord.Net
+ $(PackageTargetFallback);dotnet5.4;dnxcore50;portable-net45+win8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.0.0-alpha-20161104-2
+ All
+
+
+ 1.6.0
+
+
+
+
+ $(DefineConstants);RELEASE
+
+
+
+
diff --git a/src/Discord.Net/Discord.Net.xproj b/src/Discord.Net/Discord.Net.xproj
deleted file mode 100644
index 079338b62..000000000
--- a/src/Discord.Net/Discord.Net.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 496db20a-a455-4d01-b6bc-90fe6d7c6b81
- Discord.Net
- .\obj
- .\bin\
- v4.6.1
-
-
- 2.0
-
-
-
\ No newline at end of file
diff --git a/src/Discord.Net/project.json b/src/Discord.Net/project.json
deleted file mode 100644
index 4286df5ea..000000000
--- a/src/Discord.Net/project.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "version": "1.0.0-beta2-*",
- "description": "An aynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.",
- "authors": [ "RogueException" ],
-
- "packOptions": {
- "tags": [ "discord", "discordapp" ],
- "licenseUrl": "http://opensource.org/licenses/MIT",
- "projectUrl": "https://github.com/RogueException/Discord.Net",
- "repository": {
- "type": "git",
- "url": "git://github.com/RogueException/Discord.Net"
- }
- },
-
- "dependencies": {
- "Discord.Net.Core": {
- "target": "project"
- },
- "Discord.Net.Rest": {
- "target": "project"
- },
- "Discord.Net.WebSocket": {
- "target": "project"
- },
- "Discord.Net.Rpc": {
- "target": "project"
- },
- "Discord.Net.Commands": {
- "target": "project"
- }
- },
-
- "frameworks": {
- "netstandard1.3": {
- "imports": [
- "dotnet5.4",
- "dnxcore50",
- "portable-net45+win8"
- ]
- }
- }
-}
\ No newline at end of file