patch

DiscordBot/DiscordBot.csproj

@@ -8,7 +8,7 @@
 		<StartupObject />
 		<SignAssembly>False</SignAssembly>
 		<IsPublishable>True</IsPublishable>
-		<AssemblyVersion>1.0.0.12</AssemblyVersion>
+		<AssemblyVersion>1.0.0.14</AssemblyVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

DiscordBot/Program.cs

@@ -7,15 +7,16 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
-using Discord;
-
 using DiscordBot.Discord.Core;
 
 using PluginManager;
+
 using PluginManager.Items;
 using PluginManager.Online;
 using PluginManager.Others;
 
+using Terminal.Gui;
+
 namespace DiscordBot;
 
 public class Program
@@ -31,70 +32,142 @@ public class Program
     [Obsolete]
     public static void Main(string[] args)
     {
+
         Console.WriteLine("Loading resources ...");
         PreLoadComponents().Wait();
-        do
-        {
-            if (!Config.ContainsKey("ServerID"))
-            {
 
 
-                Console.WriteLine("Please enter the server ID: ");
+        if (!Config.ContainsKey("ServerID") || (!Config.ContainsKey("token") || Config.GetValue<string>("token") == null || (Config.GetValue<string>("token")?.Length != 70 && Config.GetValue<string>("token")?.Length != 59)) || (!Config.ContainsKey("prefix") || Config.GetValue<string>("prefix") == null || Config.GetValue<string>("prefix")?.Length != 1) || (args.Length > 0 && args[0] == "/newconfig"))
-                Console_Utilities.WriteColorText("You can find it in the Server Settings at &r\"Widget\"&c section");
-                Console.WriteLine("Example: 1234567890123456789");
-
-                Console.WriteLine("This is not required, but is recommended. If you refuse to provide the ID, just press enter.\nThe server id is required to make easier for the bot to interact with the server.\nRemember: this bot is for one server ONLY.");
-                Console.Write("User Input > ");
-                ConsoleKeyInfo key = Console.ReadKey();
-                if (key.Key == ConsoleKey.Enter)
-                    Config.AddValueToVariables("ServerID", "null", false);
-                else
         {
-                    string SID = key.KeyChar + Console.ReadLine();
+            Application.Init();
-                    if (SID.Length != 18)
+            var top = Application.Top;
-                    {
-                        Console.Clear();
-                        Console_Utilities.WriteColorText("&rYour server ID is not 18 characters long. Please try again. \n");
 
-                        continue;
+            Application.IsMouseDisabled = true;
-                    }
+            var win = new Window("Discord Bot Config - " + Assembly.GetExecutingAssembly().GetName().Version)
-                    Config.AddValueToVariables("ServerID", SID, false);
+            {
-                }
+                X = 0,
+                Y = 1,
+                Width = Dim.Fill(),
+                Height = Dim.Fill()
+            };
+
+            top.Add(win);
+
+            var labelInfo = new Label("Configuration file not found or invalid. Please fill the following fields to create a new configuration file.")
+            {
+                X = Pos.Center(),
+                Y = 2
+            };
+
+
+            var labelToken = new Label("Please insert your token here: ")
+            {
+                X = 5,
+                Y = 5
+            };
+
+            var textFiledToken = new TextField("")
+            {
+                X = Pos.Left(labelToken) + labelToken.Text.Length + 2,
+                Y = labelToken.Y,
+                Width = 70
+            };
+
+            var labelPrefix = new Label("Please insert your prefix here: ")
+            {
+                X = 5,
+                Y = 8
+            };
+            var textFiledPrefix = new TextField("")
+            {
+                X = Pos.Left(labelPrefix) + labelPrefix.Text.Length + 2,
+                Y = labelPrefix.Y,
+                Width = 1
+            };
+
+            var labelServerid = new Label("Please insert your server id here (optional): ")
+            {
+                X = 5,
+                Y = 11,
+
+            };
+            var textFiledServerID = new TextField("null")
+            {
+                X = Pos.Left(labelServerid) + labelServerid.Text.Length + 2,
+                Y = labelServerid.Y,
+                Width = 18
+            };
+
+            var button = new Button("Submit")
+            {
+                X = Pos.Center() - 10,
+                Y = 16
+            };
+
+            var button2 = new Button("License")
+            {
+                X = Pos.Center() + 10,
+                Y = 16
+            };
+
+            Console.CancelKeyPress += (sender, e) =>
+            {
+                top.Running = false;
+
+            };
+
+            button.Clicked += () =>
+            {
+                string passMessage = "";
+                if (textFiledToken.Text.Length != 70 && textFiledToken.Text.Length != 59)
+                    passMessage += "Invalid token, ";
+                if (textFiledPrefix.Text.ContainsAny("0123456789/\\ ") || textFiledPrefix.Text.Length != 1)
+                    passMessage += "Invalid prefix, ";
+                if (textFiledServerID.Text.Length != 18 && textFiledServerID.Text.Length > 0)
+                    passMessage += "Invalid serverID";
+
+                if (passMessage != "")
+                {
+                    MessageBox.ErrorQuery("Discord Bot Settings", "Failed to pass check. Invalid information given:\n" + passMessage, "Retry");
+                    return;
                 }
 
-            if (!Config.ContainsKey("token") || Config.GetValue<string>("token") == null || (Config.GetValue<string>("token")?.Length != 70 && Config.GetValue<string>("token")?.Length != 59))
+
+                Config.AddValueToVariables<string>("ServerID", ((string)textFiledServerID.Text), true);
+                Config.AddValueToVariables<string>("token", ((string)textFiledToken.Text), true);
+                Config.AddValueToVariables<string>("prefix", ((string)textFiledPrefix.Text), true);
+
+                MessageBox.Query("Discord Bot Settings", "Successfully saved config !\nJust start the bot :D", "Start :D");
+                top.Running = false;
+
+
+            };
+
+            button2.Clicked += async () =>
             {
-                Console.WriteLine("Please insert your token");
+                string[] license = await File.ReadAllLinesAsync("LICENSE.txt");
-                Console.Write("Token = ");
+                string ProductLicense = "Seth Discord Bot\n\nDeveloped by Wizzy#9181\nThis application can be used and modified by anyone. Plugin development for this application is also free and supported";
-                var token = Console.ReadLine();
+                int r = MessageBox.Query("Discord Bot Settings", ProductLicense, "Close", "Read about libraries used");
-                if (token?.Length == 59 || token?.Length == 70)
+                if (r == 1)
-                    Config.AddValueToVariables("token", token, true);
-                else
                 {
-                    Console.Clear();
+                    int i = 0;
-                    Console_Utilities.WriteColorText("&rThe token length is invalid !");
+                    while (i < license.Length)
-                    continue;
+                    {
-                }
+                        string print_message = license[i++] + "\n";
+                        for (; i < license.Length && !license[i].StartsWith("-----------"); i++)
+                            print_message += license[i] + "\n";
+                        if (MessageBox.Query("Licenses", print_message, "Next", "Quit") == 1) break;
                     }
 
-            if (!Config.ContainsKey("prefix") || Config.GetValue<string>("prefix") == null || Config.GetValue<string>("prefix")?.Length != 1)
-            {
-                Console.WriteLine("Please insert your prefix (max. 1 character long):");
-                Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces, numbers, '/' or '\\' allowed");
-                Console.Write("Prefix = ");
-                var prefix = Console.ReadLine()![0];
-
-                if (prefix == ' ' || char.IsDigit(prefix) || prefix == '/' || prefix == '\\')
-                {
-                    Console.Clear();
-                    Console_Utilities.WriteColorText("&rThe prefix is invalid");
-                    continue;
-                }
-                Config.AddValueToVariables("prefix", prefix.ToString(), false);
                 }
+            };
 
-            break;
+            win.Add(labelInfo, labelPrefix, labelServerid, labelToken);
-        } while (true);
+            win.Add(textFiledToken, textFiledPrefix, textFiledServerID);
+            win.Add(button, button2);
+            Application.Run();
+            Application.Shutdown();
+        }
 
         HandleInput(args).Wait();
     }
@@ -231,6 +304,11 @@ public class Program
             len = 0;
         }
 
+        if (len == 2 && args[0] == "/procKill")
+        {
+            Process.GetProcessById(int.Parse(args[1])).Kill();
+            len = 0;
+        }
 
 
         var b = await StartNoGUI();
@@ -371,7 +449,7 @@ public class Program
 
 
         List<string> onlineSettingsList = await ServerCom.ReadTextFromURL("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/OnlineData");
-        main.Stop();
+        main.Stop("Loaded online settings. Loading updates ...");
         foreach (var key in onlineSettingsList)
         {
             if (key.Length <= 3 || !key.Contains(' ')) continue;
@@ -388,20 +466,26 @@ public class Program
 
                             string url = $"https://github.com/Wizzy69/SethDiscordBot/releases/download/v{newVersion}/net6.0.zip";
                             //string url2 = $"https://github.com/Wizzy69/SethDiscordBot/releases/download/v{newVersion}-preview/net6.0.zip";
-                            Process.Start("./Updater/Updater.exe", $"/update {url} ./DiscordBot.exe ./");
+
+                            Process.Start(".\\Updater\\Updater.exe", $"{newVersion} {url} {Process.GetCurrentProcess().ProcessName}");
+
                         }
                         else
                         {
                             string url = $"https://github.com/Wizzy69/SethDiscordBot/releases/download/v{newVersion}/net6.0_linux.zip";
-                            Process.Start("./Updater/Updater", $"/update {url} ./DiscordBot ./");
+                            Console.WriteLine("Downloading update ...");
-                        }
+                            await ServerCom.DownloadFileNoProgressAsync(url, "./update.zip");
+                            await File.WriteAllTextAsync("Install.sh", "#!/bin/bash\nunzip -qq update.zip -d ./\nrm update.zip\nchmod +x SethDiscordBot\n./DiscordBot");
+                            Process.Start("Install.sh").WaitForExit();
                             Environment.Exit(0);
+
+                        }
                     }
 
                     break;
                 case "UpdaterVersion":
                     string updaternewversion = s[1];
-                    if (Config.UpdaterVersion != updaternewversion)
+                    if (Config.UpdaterVersion != updaternewversion && Functions.GetOperatingSystem() == PluginManager.Others.OperatingSystem.WINDOWS)
                     {
                         Console.Clear();
                         Console.WriteLine("Installing updater ...\nDo NOT close the bot during update !");
@@ -412,7 +496,7 @@ public class Program
                         Config.UpdaterVersion = updaternewversion;
                         File.Delete("Updater.zip");
                         await Config.SaveConfig(SaveType.NORMAL);
-                        bar.Stop();
+                        bar.Stop("Updater has been updated !");
                         Console.Clear();
                     }
                     break;

PluginManager/Config.cs

@@ -11,7 +11,7 @@ namespace PluginManager
 {
     internal class AppConfig
     {
-        public string UpdaterVersion { get; set; }
+        public string? UpdaterVersion { get; set; }
         public Dictionary<string, object>? ApplicationVariables { get; init; }
         public List<string>? ProtectedKeyWords { get; init; }
         public Dictionary<string, string>? PluginVersions { get; init; }

PluginManager/Items/ConsoleCommandsHandler.cs

@@ -14,9 +14,7 @@ using PluginManager.Interfaces;
 using PluginManager.Loaders;
 using PluginManager.Online;
 using PluginManager.Online.Helpers;
-using PluginManager.Online.Updates;
 using PluginManager.Others;
-
 namespace PluginManager.Items;
 
 public class ConsoleCommandsHandler
@@ -162,8 +160,18 @@ public class ConsoleCommandsHandler
                     path = "./Data/Plugins/" + info[0] + "s/" + name + "." + (info[0] == "Command" ? PluginLoader.pluginCMDExtension : PluginLoader.pluginEVEExtension);
                 else
                     path = $"./{info[1].Split('/')[info[1].Split('/').Length - 1]}";
-                //Console.WriteLine("Downloading: " + path + " [" + info[1] + "]");
+                if (Others.OperatingSystem.WINDOWS == Functions.GetOperatingSystem())
+                {
                     await ServerCom.DownloadFileAsync(info[1], path);
+                }
+                else if (Others.OperatingSystem.LINUX == Functions.GetOperatingSystem())
+                {
+                    Others.Console_Utilities.ProgressBar bar = new Console_Utilities.ProgressBar(ProgressBarType.NO_END);
+                    bar.Start();
+                    await ServerCom.DownloadFileNoProgressAsync(info[1], path);
+                    bar.Stop("Plugin Downloaded !");
+                }
+
                 if (info[0] == "Event")
                     Config.PluginConfig.InstalledPlugins.Add(new(name, PluginType.Event));
                 else if (info[0] == "Command")
@@ -187,7 +195,16 @@ public class ConsoleCommandsHandler
                         var split = line.Split(',');
                         Console.WriteLine($"\nDownloading item: {split[1]}");
                         if (File.Exists("./" + split[1])) File.Delete("./" + split[1]);
+                        if (Others.OperatingSystem.WINDOWS == Functions.GetOperatingSystem())
                             await ServerCom.DownloadFileAsync(split[0], "./" + split[1]);
+                        else if (Others.OperatingSystem.LINUX == Functions.GetOperatingSystem())
+                        {
+                            Others.Console_Utilities.ProgressBar bar = new Console_Utilities.ProgressBar(ProgressBarType.NO_END);
+                            bar.Start();
+                            await ServerCom.DownloadFileNoProgressAsync(split[0], "./" + split[1]);
+                            bar.Stop("Item downloaded !");
+
+                        }
                         Console.WriteLine();
                         if (split[0].EndsWith(".pak"))
                             File.Move("./" + split[1], "./Data/PAKS/" + split[1], true);
@@ -197,7 +214,7 @@ public class ConsoleCommandsHandler
                             var bar = new Console_Utilities.ProgressBar(ProgressBarType.NO_END);// { Max = 100f, Color = ConsoleColor.Green };
                             bar.Start();
                             await Functions.ExtractArchive("./" + split[1], "./", null, UnzipProgressType.PercentageFromTotalSize);
-                            bar.Stop();
+                            bar.Stop("Extracted");
                             Console.WriteLine("\n");
                             File.Delete("./" + split[1]);
                         }
@@ -208,10 +225,12 @@ public class ConsoleCommandsHandler
                 VersionString? ver = await VersionString.GetVersionOfPackageFromWeb(name);
                 if (ver is null) throw new Exception("Incorrect version");
                 Config.SetPluginVersion(name, $"{ver.PackageVersionID}.{ver.PackageMainVersion}.{ver.PackageCheckVersion}");
-                // Console.WriteLine();
 
                 isDownloading = false;
+
+
             }
+
         );
 
 
@@ -264,17 +283,18 @@ public class ConsoleCommandsHandler
                 bar.Start();
                 await Config.SaveConfig(SaveType.NORMAL);
                 await Config.SaveConfig(SaveType.BACKUP);
-                await Task.Delay(4000);
+                bar.Stop("Saved config !");
-                bar.Stop();
                 Console.WriteLine();
                 await client.StopAsync();
                 await client.DisposeAsync();
+
+                await Task.Delay(1000);
                 Environment.Exit(0);
 
             }
         );
 
-        AddCommand("extern", "Load an external command", "extern [pluginName]", async (args) =>
+        AddCommand("import", "Load an external command", "import [pluginName]", async (args) =>
         {
             if (args.Length <= 1) return;
             string pName = Functions.MergeStrings(args, 1);

PluginManager/Others/Console Utilities.cs

@@ -42,12 +42,15 @@ namespace PluginManager.Others
             public bool NoColor { get; init; }
             public ProgressBarType type { get; set; }
 
+            public int TotalLength { get; private set; }
+
             private int BarLength = 32;
             private int position = 1;
             private bool positive = true;
 
             private bool isRunning;
 
+
             public async void Start()
             {
                 if (type != ProgressBarType.NO_END)
@@ -63,6 +66,23 @@ namespace PluginManager.Others
                 }
             }
 
+            public async void Start(string message)
+            {
+                if (type != ProgressBarType.NO_END)
+                    throw new Exception("Only NO_END progress bar can use this method");
+                if (isRunning)
+                    throw new Exception("This progress bar is already running");
+
+                isRunning = true;
+
+                TotalLength = message.Length + BarLength + 5;
+                while (isRunning)
+                {
+                    UpdateNoEnd(message);
+                    await System.Threading.Tasks.Task.Delay(100);
+                }
+            }
+
             public void Stop()
             {
                 if (type != ProgressBarType.NO_END)
@@ -72,20 +92,45 @@ namespace PluginManager.Others
                 isRunning = false;
             }
 
+            public void Stop(string message)
+            {
+                Stop();
+
+                if (message is not null)
+                {
+                    Console.CursorLeft = 0;
+                    for (int i = 0; i < BarLength + message.Length + 1; i++)
+                        Console.Write(" ");
+                    Console.CursorLeft = 0;
+                    Console.WriteLine(message);
+                }
+            }
+
             public void Update(float progress)
             {
-                switch (type)
+                if (type == ProgressBarType.NO_END)
-                {
+                    throw new Exception("This function is for progress bars with end");
-                    case ProgressBarType.NORMAL:
+
                 UpdateNormal(progress);
-                        return;
-                    case ProgressBarType.NO_END:
-                        if (progress <= 99.9f)
-                            UpdateNoEnd();
-                        return;
-                    default:
-                        return;
             }
+
+            private void UpdateNoEnd(string message)
+            {
+                Console.CursorLeft = 0;
+                Console.Write("[");
+                for (int i = 1; i <= position; i++)
+                    Console.Write(" ");
+                Console.Write("<==()==>");
+                position += positive ? 1 : -1;
+                for (int i = position; i <= BarLength - 1 - (positive ? 0 : 2); i++)
+                    Console.Write(" ");
+                Console.Write("] " + message);
+
+
+
+
+                if (position == BarLength - 1 || position == 1)
+                    positive = !positive;
             }
 
             private void UpdateNoEnd()
@@ -101,6 +146,8 @@ namespace PluginManager.Others
                 Console.Write("]");
 
 
+
+
                 if (position == BarLength - 1 || position == 1)
                     positive = !positive;
             }

PluginManager/PluginManager.csproj

@@ -17,6 +17,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Discord.Net" Version="3.7.2" />
+		<PackageReference Include="Terminal.Gui" Version="1.8.2" />
 	</ItemGroup>
 
 </Project>

SethDiscordBot.sln

@@ -7,38 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBot", "DiscordBot\Di
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginManager", "PluginManager\PluginManager.csproj", "{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{1862ABD5-7C30-4F15-A561-45AC8A9CA10E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Events", "Events", "{A290C028-77C4-4D1D-AB43-DDFE6ABD9012}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{449FA364-0B72-43FF-B3A3-806E2916200E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_Utils", "Plugins\CMD_Utils\CMD_Utils.csproj", "{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicCommands", "Plugins\MusicCommands\MusicCommands.csproj", "{B1B4976E-5112-4217-B57B-3A03C5207B6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVE_LevelingSystem", "Plugins\EVE_LevelingSystem\EVE_LevelingSystem.csproj", "{EEC445DC-0C4B-43EA-8694-606BA0390B77}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_LevelingSystem", "Plugins\CMD_LevelingSystem\CMD_LevelingSystem.csproj", "{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roles", "Plugins\Roles\Roles.csproj", "{954F2AA9-6624-4554-946D-0F17B84487C3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Others", "Others", "{727BBA0B-9114-4BC8-B9A8-3F461449A564}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Updater", "Plugins\Updater\Updater.csproj", "{24616F7E-E2E9-45A3-8A44-AB51FCD2D525}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeGamesModule", "Plugins\FreeGamesModule\FreeGamesModule.csproj", "{8959C766-414D-4EF8-BC85-9928B30AAF0A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBotWindowsUI", "Plugins\DiscordBotWindowsUI\DiscordBotWindowsUI.csproj", "{EFE12083-F9FE-4807-8E39-809E0391BAF0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsUI", "Plugins\WindowsUI\WindowsUI.csproj", "{ECF79CD3-789E-476D-8512-CE0FAF71ADF5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlashCommands", "Plugins\SlashCommands\SlashCommands.csproj", "{56D7545A-6DCF-4996-A1A5-40180CE9DE10}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Slash", "Slash", "{0B1FD8FA-35D3-4DC1-9D98-6178247B29CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SlashRandom", "Plugins\SlashRandom\SlashRandom.csproj", "{23A4778E-A65C-44B7-A82C-AE2A35103E8D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,71 +21,10 @@ Global
 		{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{954F2AA9-6624-4554-946D-0F17B84487C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{954F2AA9-6624-4554-946D-0F17B84487C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{954F2AA9-6624-4554-946D-0F17B84487C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{954F2AA9-6624-4554-946D-0F17B84487C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24616F7E-E2E9-45A3-8A44-AB51FCD2D525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24616F7E-E2E9-45A3-8A44-AB51FCD2D525}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24616F7E-E2E9-45A3-8A44-AB51FCD2D525}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24616F7E-E2E9-45A3-8A44-AB51FCD2D525}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8959C766-414D-4EF8-BC85-9928B30AAF0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8959C766-414D-4EF8-BC85-9928B30AAF0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8959C766-414D-4EF8-BC85-9928B30AAF0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8959C766-414D-4EF8-BC85-9928B30AAF0A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFE12083-F9FE-4807-8E39-809E0391BAF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFE12083-F9FE-4807-8E39-809E0391BAF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFE12083-F9FE-4807-8E39-809E0391BAF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFE12083-F9FE-4807-8E39-809E0391BAF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECF79CD3-789E-476D-8512-CE0FAF71ADF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECF79CD3-789E-476D-8512-CE0FAF71ADF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECF79CD3-789E-476D-8512-CE0FAF71ADF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECF79CD3-789E-476D-8512-CE0FAF71ADF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56D7545A-6DCF-4996-A1A5-40180CE9DE10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56D7545A-6DCF-4996-A1A5-40180CE9DE10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56D7545A-6DCF-4996-A1A5-40180CE9DE10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56D7545A-6DCF-4996-A1A5-40180CE9DE10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23A4778E-A65C-44B7-A82C-AE2A35103E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23A4778E-A65C-44B7-A82C-AE2A35103E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23A4778E-A65C-44B7-A82C-AE2A35103E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23A4778E-A65C-44B7-A82C-AE2A35103E8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A290C028-77C4-4D1D-AB43-DDFE6ABD9012} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E}
-		{449FA364-0B72-43FF-B3A3-806E2916200E} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E}
-		{E26C87A4-3DD6-4B58-B14B-C8E086B852F9} = {449FA364-0B72-43FF-B3A3-806E2916200E}
-		{B1B4976E-5112-4217-B57B-3A03C5207B6E} = {449FA364-0B72-43FF-B3A3-806E2916200E}
-		{EEC445DC-0C4B-43EA-8694-606BA0390B77} = {A290C028-77C4-4D1D-AB43-DDFE6ABD9012}
-		{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9} = {449FA364-0B72-43FF-B3A3-806E2916200E}
-		{954F2AA9-6624-4554-946D-0F17B84487C3} = {449FA364-0B72-43FF-B3A3-806E2916200E}
-		{727BBA0B-9114-4BC8-B9A8-3F461449A564} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E}
-		{24616F7E-E2E9-45A3-8A44-AB51FCD2D525} = {727BBA0B-9114-4BC8-B9A8-3F461449A564}
-		{8959C766-414D-4EF8-BC85-9928B30AAF0A} = {449FA364-0B72-43FF-B3A3-806E2916200E}
-		{EFE12083-F9FE-4807-8E39-809E0391BAF0} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E}
-		{ECF79CD3-789E-476D-8512-CE0FAF71ADF5} = {A290C028-77C4-4D1D-AB43-DDFE6ABD9012}
-		{56D7545A-6DCF-4996-A1A5-40180CE9DE10} = {A290C028-77C4-4D1D-AB43-DDFE6ABD9012}
-		{0B1FD8FA-35D3-4DC1-9D98-6178247B29CA} = {449FA364-0B72-43FF-B3A3-806E2916200E}
-		{23A4778E-A65C-44B7-A82C-AE2A35103E8D} = {0B1FD8FA-35D3-4DC1-9D98-6178247B29CA}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3FB3C5DE-ED21-4D2E-ABDD-3A00EE4A2FFF}
 	EndGlobalSection