Skip to content

Commit 0681b88

Browse files
tmathuratmathura
authored
Merge pull request #14 from tmathura/dev
update nuget references
2 parents 7293211 + 5716c27 commit 0681b88

4 files changed

Lines changed: 18 additions & 22 deletions

File tree

‎WindowsServiceManagerService/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1515
<dependentAssembly>
1616
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
17-
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
17+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1818
</dependentAssembly>
1919
</assemblyBinding>
2020
</runtime>

‎WindowsServiceManagerService/WindowsServiceManagerService.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
using System.Collections.Generic;
33
using System.Configuration;
44
using System.Diagnostics;
5-
using System.IO;
65
using System.Linq;
7-
using System.Reflection;
86
using System.ServiceProcess;
97
using System.Threading.Tasks;
108
using System.Xml;
119
using Telegram.Bot;
1210
using Telegram.Bot.Args;
13-
using Telegram.Bot.Types;
1411
using Telegram.Bot.Types.Enums;
15-
using Telegram.Bot.Types.InlineKeyboardButtons;
1612
using Telegram.Bot.Types.ReplyMarkups;
1713

1814
namespace WindowsServiceManagerService
@@ -242,7 +238,7 @@ public async void BotOnMessageReceived(object sender, MessageEventArgs messageEv
242238
var text = message.Text;
243239
var chatId = messageEventArgs.Message.Chat.Id;
244240

245-
if (message == null || message.Type != MessageType.TextMessage) return;
241+
if (message == null || message.Type != MessageType.Text) return;
246242

247243
if (text == "/start")
248244
{
@@ -380,9 +376,7 @@ public static IReplyMarkup CreateInlineKeyboardButton(Dictionary<string, string>
380376
buttons[i] = buttonList
381377
.Skip(i * columns)
382378
.Take(columns)
383-
.Select(direction => new InlineKeyboardCallbackButton(
384-
direction.Value, direction.Key
385-
))
379+
.Select(direction => new InlineKeyboardButton { Text = direction.Value, CallbackData = direction.Key })
386380
.ToArray();
387381
return new InlineKeyboardMarkup(buttons);
388382
}
@@ -418,8 +412,8 @@ public static IReplyMarkup CreateInLineQueuedMarkup(List<ServiceClass> servicesL
418412
$"Already stopped: {service.DisplayName}");
419413
else
420414
buttonsList.Add(
421-
$"Start#{service.Service}",
422-
$"Start: {service.DisplayName}");
415+
$"Stop#{service.Service}",
416+
$"Stop: {service.DisplayName}");
423417
}
424418

425419
return CreateInlineKeyboardButton(buttonsList, 1);

‎WindowsServiceManagerService/WindowsServiceManagerService.csproj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@
7070
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
7171
</PropertyGroup>
7272
<ItemGroup>
73-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
73+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7575
</Reference>
7676
<Reference Include="System" />
7777
<Reference Include="System.Configuration" />
7878
<Reference Include="System.Configuration.Install" />
7979
<Reference Include="System.Core" />
8080
<Reference Include="System.Management" />
8181
<Reference Include="System.Net.Http" />
82-
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
83-
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
82+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
83+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
8484
</Reference>
8585
<Reference Include="System.Web" />
8686
<Reference Include="System.Web.Extensions" />
@@ -90,8 +90,8 @@
9090
<Reference Include="System.Data" />
9191
<Reference Include="System.ServiceProcess" />
9292
<Reference Include="System.Xml" />
93-
<Reference Include="Telegram.Bot, Version=13.4.0.0, Culture=neutral, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Telegram.Bot.13.4.0\lib\net45\Telegram.Bot.dll</HintPath>
93+
<Reference Include="Telegram.Bot, Version=14.10.0.0, Culture=neutral, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Telegram.Bot.14.10.0\lib\net45\Telegram.Bot.dll</HintPath>
9595
</Reference>
9696
</ItemGroup>
9797
<ItemGroup>
@@ -108,7 +108,9 @@
108108
<None Include="App.config">
109109
<SubType>Designer</SubType>
110110
</None>
111-
<None Include="packages.config" />
111+
<None Include="packages.config">
112+
<SubType>Designer</SubType>
113+
</None>
112114
<None Include="Properties\app.manifest" />
113115
</ItemGroup>
114116
<ItemGroup>

‎WindowsServiceManagerService/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<packages>
4-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
5-
<package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
6-
<package id="Telegram.Bot" version="13.4.0" targetFramework="net452" />
3+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
4+
<package id="System.Net.Requests" version="4.3.0" targetFramework="net452" />
5+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
6+
<package id="Telegram.Bot" version="14.10.0" targetFramework="net452" />
77
</packages>

0 commit comments

Comments
 (0)