From 778070d9b3dde34f44bd0f08cc70e41eb1d0ee95 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 16 Dec 2016 23:01:56 +0100 Subject: [PATCH] Removed discord.net submodule for now --- .gitmodules | 4 ---- NadekoBot.sln | 32 -------------------------------- discord.net | 1 - src/NadekoBot/project.json | 4 +--- 4 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 .gitmodules delete mode 160000 discord.net diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1996477a..00000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "discord.net"] - path = discord.net - url = https://github.com/kwoth/discord.net - branch = rogue-dev diff --git a/NadekoBot.sln b/NadekoBot.sln index 147256fe..6a872243 100644 --- a/NadekoBot.sln +++ b/NadekoBot.sln @@ -12,14 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NadekoBot", "src\NadekoBot\NadekoBot.xproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Commands", "discord.net\src\Discord.Net.Commands\Discord.Net.Commands.xproj", "{F29E2B91-6877-4EF1-8B54-523FE06F780C}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Core", "discord.net\src\Discord.Net.Core\Discord.Net.Core.xproj", "{526FAB2E-03EA-4231-B480-555F926B1750}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.WebSocket", "discord.net\src\Discord.Net.WebSocket\Discord.Net.WebSocket.xproj", "{2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Rest", "discord.net\src\Discord.Net.Rest\Discord.Net.Rest.xproj", "{E8B62DD4-5A6B-4C66-916B-A782247BC983}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,30 +25,6 @@ Global {45EC1473-C678-4857-A544-07DFE0D0B478}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.ActiveCfg = Release|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.Build.0 = Release|Any CPU - {F29E2B91-6877-4EF1-8B54-523FE06F780C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F29E2B91-6877-4EF1-8B54-523FE06F780C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F29E2B91-6877-4EF1-8B54-523FE06F780C}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU - {F29E2B91-6877-4EF1-8B54-523FE06F780C}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU - {F29E2B91-6877-4EF1-8B54-523FE06F780C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F29E2B91-6877-4EF1-8B54-523FE06F780C}.Release|Any CPU.Build.0 = Release|Any CPU - {526FAB2E-03EA-4231-B480-555F926B1750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {526FAB2E-03EA-4231-B480-555F926B1750}.Debug|Any CPU.Build.0 = Debug|Any CPU - {526FAB2E-03EA-4231-B480-555F926B1750}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU - {526FAB2E-03EA-4231-B480-555F926B1750}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU - {526FAB2E-03EA-4231-B480-555F926B1750}.Release|Any CPU.ActiveCfg = Release|Any CPU - {526FAB2E-03EA-4231-B480-555F926B1750}.Release|Any CPU.Build.0 = Release|Any CPU - {2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU - {2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU - {2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BA94A35-7DE0-4E19-9DAC-D6378845B8D0}.Release|Any CPU.Build.0 = Release|Any CPU - {E8B62DD4-5A6B-4C66-916B-A782247BC983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8B62DD4-5A6B-4C66-916B-A782247BC983}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8B62DD4-5A6B-4C66-916B-A782247BC983}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU - {E8B62DD4-5A6B-4C66-916B-A782247BC983}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU - {E8B62DD4-5A6B-4C66-916B-A782247BC983}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8B62DD4-5A6B-4C66-916B-A782247BC983}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/discord.net b/discord.net deleted file mode 160000 index c102f52b..00000000 --- a/discord.net +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c102f52bfa1a6fd6ffbbd7c7f65d07342e8b6851 diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index ac27a4f3..90ff822c 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -38,9 +38,7 @@ "Newtonsoft.Json": "9.0.2-beta1", "NLog": "5.0.0-beta03", "System.Diagnostics.Contracts": "4.3.0", - "System.Xml.XPath": "4.3.0", - "Discord.Net.Commands": "1.0.0-*", - "Discord.Net.WebSocket": "1.0.0-*" + "System.Xml.XPath": "4.3.0" }, "tools": { "Microsoft.EntityFrameworkCore.Tools.DotNet": "1.1.0-preview4-final",