diff --git a/TelegramBaseTest/Program.cs b/TelegramBaseTest/Program.cs deleted file mode 100644 index f79b7f2..0000000 --- a/TelegramBaseTest/Program.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using TelegramBotBase; -using TelegramBotBase.Form; -using TelegramBaseTest.Tests; - -namespace TelegramBaseTest -{ - class Program - { - static void Main(string[] args) - { - - String APIKey = "{YOUR API KEY}"; - - BotBase bb = new BotBase(APIKey); - - bb.SystemCalls.Add("/start"); - bb.SystemCalls.Add("/form1"); - bb.SystemCalls.Add("/form2"); - bb.SystemCalls.Add("/params"); - - bb.SystemCall += async (s, en) => - { - switch (en.Command) - { - case "/start": - - var start = new Start(); - - await en.Device.ActiveForm.NavigateTo(start); - - break; - case "/form1": - - var form1 = new TestForm(); - - await en.Device.ActiveForm.NavigateTo(form1); - - break; - - case "/form2": - - var form2 = new TestForm2(); - - await en.Device.ActiveForm.NavigateTo(form2); - - break; - - case "/params": - - String m = en.Parameters.DefaultIfEmpty("").Aggregate((a, b) => a + " and " + b); - - await en.Device.Send("Your parameters are: " + m, replyTo: en.Device.LastMessageId); - - en.Handled = true; - - break; - } - - }; - - bb.Start(); - - - - Console.WriteLine("Telegram Bot started..."); - - Console.WriteLine("Press q to quit application."); - - - Console.ReadLine(); - - bb.Stop(); - - } - } -} diff --git a/TelegramBotBase/TelegramBotBase.csproj b/TelegramBotBase/TelegramBotBase.csproj index 3aa90cd..a611ef2 100644 --- a/TelegramBotBase/TelegramBotBase.csproj +++ b/TelegramBotBase/TelegramBotBase.csproj @@ -3,12 +3,15 @@ netstandard2.0;net461 false - true + false false https://github.com/MajMcCloud/TelegramBotFramework https://github.com/MajMcCloud/TelegramBotFramework - moving from .Net Framework 4.7.2 to .Net Standard 2.1 for the Library and .Net Core 3.0 for the test project! Debug;Release; + MIT + false + false diff --git a/TelegramBaseTest/App.config b/TelegramBotBaseTest/App.config similarity index 75% rename from TelegramBaseTest/App.config rename to TelegramBotBaseTest/App.config index 776d315..fa1ddef 100644 --- a/TelegramBaseTest/App.config +++ b/TelegramBotBaseTest/App.config @@ -1,14 +1,14 @@ - + - + - - + + - \ No newline at end of file + diff --git a/TelegramBaseTest/Properties/AssemblyInfo.cs b/TelegramBotBaseTest/Properties/AssemblyInfo.cs similarity index 100% rename from TelegramBaseTest/Properties/AssemblyInfo.cs rename to TelegramBotBaseTest/Properties/AssemblyInfo.cs diff --git a/TelegramBaseTest/TelegramBaseTest.csproj b/TelegramBotBaseTest/TelegramBotBaseTest.csproj similarity index 100% rename from TelegramBaseTest/TelegramBaseTest.csproj rename to TelegramBotBaseTest/TelegramBotBaseTest.csproj diff --git a/TelegramBaseTest/Tests/ButtonTestForm.cs b/TelegramBotBaseTest/Tests/ButtonTestForm.cs similarity index 100% rename from TelegramBaseTest/Tests/ButtonTestForm.cs rename to TelegramBotBaseTest/Tests/ButtonTestForm.cs diff --git a/TelegramBaseTest/Tests/Controls/ButtonGridForm.cs b/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs similarity index 100% rename from TelegramBaseTest/Tests/Controls/ButtonGridForm.cs rename to TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs diff --git a/TelegramBaseTest/Tests/Controls/CalendarPickerForm.cs b/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs similarity index 100% rename from TelegramBaseTest/Tests/Controls/CalendarPickerForm.cs rename to TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs diff --git a/TelegramBaseTest/Tests/Controls/MonthPickerForm.cs b/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs similarity index 100% rename from TelegramBaseTest/Tests/Controls/MonthPickerForm.cs rename to TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs diff --git a/TelegramBaseTest/Tests/Controls/ToggleButtons.cs b/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs similarity index 100% rename from TelegramBaseTest/Tests/Controls/ToggleButtons.cs rename to TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs diff --git a/TelegramBaseTest/Tests/Controls/TreeViewForms.cs b/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs similarity index 100% rename from TelegramBaseTest/Tests/Controls/TreeViewForms.cs rename to TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs diff --git a/TelegramBaseTest/Tests/DataForm.cs b/TelegramBotBaseTest/Tests/DataForm.cs similarity index 100% rename from TelegramBaseTest/Tests/DataForm.cs rename to TelegramBotBaseTest/Tests/DataForm.cs diff --git a/TelegramBaseTest/Tests/ProgressTest.cs b/TelegramBotBaseTest/Tests/ProgressTest.cs similarity index 100% rename from TelegramBaseTest/Tests/ProgressTest.cs rename to TelegramBotBaseTest/Tests/ProgressTest.cs diff --git a/TelegramBaseTest/Tests/Register/PerForm.cs b/TelegramBotBaseTest/Tests/Register/PerForm.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/PerForm.cs rename to TelegramBotBaseTest/Tests/Register/PerForm.cs diff --git a/TelegramBaseTest/Tests/Register/PerStep.cs b/TelegramBotBaseTest/Tests/Register/PerStep.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/PerStep.cs rename to TelegramBotBaseTest/Tests/Register/PerStep.cs diff --git a/TelegramBaseTest/Tests/Register/Start.cs b/TelegramBotBaseTest/Tests/Register/Start.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/Start.cs rename to TelegramBotBaseTest/Tests/Register/Start.cs diff --git a/TelegramBaseTest/Tests/Register/Steps/Data.cs b/TelegramBotBaseTest/Tests/Register/Steps/Data.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/Steps/Data.cs rename to TelegramBotBaseTest/Tests/Register/Steps/Data.cs diff --git a/TelegramBaseTest/Tests/Register/Steps/Step1.cs b/TelegramBotBaseTest/Tests/Register/Steps/Step1.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/Steps/Step1.cs rename to TelegramBotBaseTest/Tests/Register/Steps/Step1.cs diff --git a/TelegramBaseTest/Tests/Register/Steps/Step2.cs b/TelegramBotBaseTest/Tests/Register/Steps/Step2.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/Steps/Step2.cs rename to TelegramBotBaseTest/Tests/Register/Steps/Step2.cs diff --git a/TelegramBaseTest/Tests/Register/Steps/Step3.cs b/TelegramBotBaseTest/Tests/Register/Steps/Step3.cs similarity index 100% rename from TelegramBaseTest/Tests/Register/Steps/Step3.cs rename to TelegramBotBaseTest/Tests/Register/Steps/Step3.cs diff --git a/TelegramBaseTest/Tests/SimpleForm.cs b/TelegramBotBaseTest/Tests/SimpleForm.cs similarity index 100% rename from TelegramBaseTest/Tests/SimpleForm.cs rename to TelegramBotBaseTest/Tests/SimpleForm.cs diff --git a/TelegramBaseTest/Tests/Start.cs b/TelegramBotBaseTest/Tests/Start.cs similarity index 100% rename from TelegramBaseTest/Tests/Start.cs rename to TelegramBotBaseTest/Tests/Start.cs diff --git a/TelegramBaseTest/Tests/TestForm.cs b/TelegramBotBaseTest/Tests/TestForm.cs similarity index 100% rename from TelegramBaseTest/Tests/TestForm.cs rename to TelegramBotBaseTest/Tests/TestForm.cs diff --git a/TelegramBaseTest/Tests/TestForm2.cs b/TelegramBotBaseTest/Tests/TestForm2.cs similarity index 100% rename from TelegramBaseTest/Tests/TestForm2.cs rename to TelegramBotBaseTest/Tests/TestForm2.cs diff --git a/TelegramBaseTest/packages.config b/TelegramBotBaseTest/packages.config similarity index 100% rename from TelegramBaseTest/packages.config rename to TelegramBotBaseTest/packages.config diff --git a/TelegramBotFramework.sln b/TelegramBotFramework.sln index fb23ff8..fceb90b 100644 --- a/TelegramBotFramework.sln +++ b/TelegramBotFramework.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29324.140 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase", "TelegramBotBase\TelegramBotBase.csproj", "{0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBaseTest", "TelegramBaseTest\TelegramBaseTest.csproj", "{9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBaseTest", "TelegramBotBaseTest\TelegramBotBaseTest.csproj", "{88EC0E02-583D-4B9D-956C-81D63C8CFCFA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU {0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU {0BD16FB9-7ED4-4CCB-83EB-5CEE538E1B6C}.Release|Any CPU.Build.0 = Release|Any CPU - {9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BBFA9F7-64A7-4D7D-86FC-812E6D7578B8}.Release|Any CPU.Build.0 = Release|Any CPU + {88EC0E02-583D-4B9D-956C-81D63C8CFCFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88EC0E02-583D-4B9D-956C-81D63C8CFCFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88EC0E02-583D-4B9D-956C-81D63C8CFCFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88EC0E02-583D-4B9D-956C-81D63C8CFCFA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE