Browse Source

Fix git-sharp

Stuart Johnson 1 year ago
parent
commit
d8b36939b1
4 changed files with 12 additions and 13 deletions
  1. 3 4
      .vs/TFA-Bot/xs/UserPrefs.xml
  2. 2 2
      TFA-Bot/Program.cs
  3. 4 4
      TFA-Bot/TFA-Bot.csproj
  4. 3 3
      TFA-Bot/packages.config

+ 3 - 4
.vs/TFA-Bot/xs/UserPrefs.xml

@@ -7,7 +7,7 @@
       <File FileName="TFA-Bot/DataClasses/clsNetwork.cs" Line="104" Column="38" />
       <File FileName="TFA-Bot/clsExtenstions.cs" Line="88" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsListNodes.cs" Line="21" Column="65" />
-      <File FileName="TFA-Bot/Program.cs" Line="132" Column="54" />
+      <File FileName="TFA-Bot/Program.cs" Line="73" Column="72" />
       <File FileName="TFA-Bot/DataClasses/clsNodeGroup.cs" Line="57" Column="44" />
       <File FileName="TFA-Bot/DataClasses/clsNode.cs" Line="177" Column="47" />
       <File FileName="TFA-Bot/DiscordBot/clsBotClient.cs" Line="169" Column="84" />
@@ -16,7 +16,7 @@
       <File FileName="TFA-Bot/DiscordBot/Commands/clsDiscord.cs" Line="31" Column="13" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsGoodnight.cs" Line="31" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsEmail.cs" Line="30" Column="1" />
-      <File FileName="TFA-Bot/DiscordBot/Commands/clsAlarm.cs" Line="1" Column="1" />
+      <File FileName="TFA-Bot/DiscordBot/Commands/clsAlarm.cs" Line="38" Column="31" />
       <File FileName="TFA-Bot/DiscordBot/Commands/IBotCommand.cs" Line="21" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/clsCommands.cs" Line="18" Column="53" />
       <File FileName="TFA-Bot/clsColumnDisplay.cs" Line="20" Column="50" />
@@ -40,13 +40,12 @@
         <State name="__root__">
           <Node name="TFA-Bot" expanded="True">
             <Node name="Solution Items" expanded="True" />
-            <Node name="TFA-Bot" expanded="True">
+            <Node name="TFA-Bot" expanded="True" selected="True">
               <Node name="Packages" expanded="True" />
               <Node name="DataClasses" expanded="True" />
               <Node name="Dialler" expanded="True" />
               <Node name="DiscordBot" expanded="True">
                 <Node name="Commands" expanded="True" />
-                <Node name="clsCommands.cs" selected="True" />
               </Node>
               <Node name="Git" expanded="True" />
               <Node name="Spreadsheet" expanded="True" />

+ 2 - 2
TFA-Bot/Program.cs

@@ -65,12 +65,12 @@ namespace TFABot
                 if (_alarmState != value)
                 {
                     _alarmState = value;
-                    if (value == EnumAlarmState.Off)
+                    if (value == EnumAlarmState.Off) //New state off
                     {
                         AlarmOffTime = DateTime.UtcNow;
                         AlarmOffWarningMultiplier=0;
                     }
-                    else if (value == EnumAlarmState.On)
+                    else if (value == EnumAlarmState.On) //New state on
                     {
                         AlarmStateTimeout = null;
                     }

+ 4 - 4
TFA-Bot/TFA-Bot.csproj

@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>TFABot</RootNamespace>
     <AssemblyName>TFA-Bot</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -78,9 +78,6 @@
     <Reference Include="BouncyCastle.Crypto">
       <HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="LibGit2Sharp">
-      <HintPath>..\packages\LibGit2Sharp.0.26.1\lib\net46\LibGit2Sharp.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -93,6 +90,9 @@
     <Reference Include="RestSharp">
       <HintPath>..\packages\RestSharp.106.6.10\lib\net452\RestSharp.dll</HintPath>
     </Reference>
+    <Reference Include="LibGit2Sharp">
+      <HintPath>..\packages\LibGit2Sharp.0.26.1\lib\net46\LibGit2Sharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

+ 3 - 3
TFA-Bot/packages.config

@@ -5,12 +5,12 @@
   <package id="DSharpPlus.CommandsNext" version="3.2.3" targetFramework="net462" />
   <package id="DSharpPlus.Interactivity" version="3.2.3" targetFramework="net462" />
   <package id="DSharpPlus.WebSocket.WebSocketSharp" version="3.2.3" targetFramework="net462" />
-  <package id="LibGit2Sharp" version="0.26.1" targetFramework="net462" />
-  <package id="LibGit2Sharp.NativeBinaries" version="2.0.289" targetFramework="net462" />
+  <package id="LibGit2Sharp" version="0.26.1" targetFramework="net46" />
+  <package id="LibGit2Sharp.NativeBinaries" version="2.0.289" targetFramework="net46" />
   <package id="MailKit" version="2.4.0.1" targetFramework="net462" />
   <package id="MimeKit" version="2.4.0.1" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
   <package id="RestSharp" version="106.6.10" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" requireReinstallation="true" />
   <package id="WebSocketSharp-NonPreRelease" version="1.0.0" targetFramework="net462" />
 </packages>