Browse Source

Retarget .NET 4.6

Stuart Johnson 1 year ago
parent
commit
c6d3082f8f
3 changed files with 35 additions and 43 deletions
  1. 4 6
      .vs/TFA-Bot/xs/UserPrefs.xml
  2. 21 27
      TFA-Bot/TFA-Bot.csproj
  3. 10 10
      TFA-Bot/packages.config

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

@@ -2,10 +2,10 @@
   <MonoDevelop.Ide.ItemProperties.TFA-Bot PreferredExecutionTarget="MonoDevelop.Default" />
   <MonoDevelop.Ide.Workbench ActiveDocument="TFA-Bot Status">
     <Files>
-      <File FileName="TFA-Bot/Program.cs" Line="11" Column="7" />
+      <File FileName="TFA-Bot/Program.cs" Line="110" Column="24" />
       <File FileName="Dockerfile" Line="33" Column="42" />
       <File FileName="TFA-Bot/DiscordBot/clsCommands.cs" Line="9" Column="28" />
-      <File FileName="TFA-Bot/DiscordBot/clsBotClient.cs" Line="67" Column="59" />
+      <File FileName="TFA-Bot/DiscordBot/clsBotClient.cs" Line="44" Column="23" />
       <File FileName="TFA-Bot/DataClasses/clsSSLCerts.cs" Line="24" Column="83" />
       <File FileName="TFA-Bot/Git/clsGitBranchInfo.cs" Line="1" Column="1" />
       <File FileName="TFA-Bot/clsSSLCertMonitor.cs" Line="104" Column="76" />
@@ -16,10 +16,8 @@
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="TFA-Bot" expanded="True">
-            <Node name="Solution Items" expanded="True">
-              <Node name="/HOME/Projects/TFA-Bot/.gitignore" selected="True" />
-            </Node>
-            <Node name="TFA-Bot" expanded="True">
+            <Node name="Solution Items" 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" />

+ 21 - 27
TFA-Bot/TFA-Bot.csproj

@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>TFABot</RootNamespace>
     <AssemblyName>TFA-Bot</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,15 +33,6 @@
     <Reference Include="mscorlib" />
     <Reference Include="System.Web" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="websocket-sharp">
-      <HintPath>..\packages\WebSocketSharp-NonPreRelease.1.0.0\lib\net35\websocket-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="websocket-sharp">
-      <HintPath>..\packages\WebSocketSharp-NonPreRelease.1.0.0\lib\net35\websocket-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="DSharpPlus.CommandsNext">
-      <HintPath>bin\Debug\DSharpPlus.CommandsNext.dll</HintPath>
-    </Reference>
     <Reference Include="websocket-sharp">
       <HintPath>bin\Debug\websocket-sharp.dll</HintPath>
     </Reference>
@@ -51,35 +42,38 @@
     <Reference Include="BouncyCastle.Crypto">
       <HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <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>
     <Reference Include="DSharpPlus">
-      <HintPath>..\packages\DSharpPlus.3.2.3\lib\net47\DSharpPlus.dll</HintPath>
+      <HintPath>..\packages\DSharpPlus.3.2.3\lib\net46\DSharpPlus.dll</HintPath>
     </Reference>
     <Reference Include="DSharpPlus.CommandsNext">
-      <HintPath>..\packages\DSharpPlus.CommandsNext.3.2.3\lib\net47\DSharpPlus.CommandsNext.dll</HintPath>
+      <HintPath>..\packages\DSharpPlus.CommandsNext.3.2.3\lib\net46\DSharpPlus.CommandsNext.dll</HintPath>
     </Reference>
     <Reference Include="DSharpPlus.Interactivity">
-      <HintPath>..\packages\DSharpPlus.Interactivity.3.2.3\lib\net47\DSharpPlus.Interactivity.dll</HintPath>
+      <HintPath>..\packages\DSharpPlus.Interactivity.3.2.3\lib\net46\DSharpPlus.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="DSharpPlus.WebSocket.WebSocketSharp">
+      <HintPath>..\packages\DSharpPlus.WebSocket.WebSocketSharp.3.2.3\lib\net46\DSharpPlus.WebSocket.WebSocketSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="LibGit2Sharp">
+      <HintPath>..\packages\LibGit2Sharp.0.26.1\lib\net46\LibGit2Sharp.dll</HintPath>
     </Reference>
     <Reference Include="MailKit">
-      <HintPath>..\packages\MailKit.2.4.1\lib\net47\MailKit.dll</HintPath>
+      <HintPath>..\packages\MailKit.2.4.1\lib\net46\MailKit.dll</HintPath>
     </Reference>
     <Reference Include="MimeKit">
-      <HintPath>..\packages\MimeKit.2.4.1\lib\net47\MimeKit.dll</HintPath>
+      <HintPath>..\packages\MimeKit.2.4.1\lib\net46\MimeKit.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp">
+      <HintPath>..\packages\RestSharp.106.6.10\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
-    <Reference Include="DSharpPlus.WebSocket.WebSocketSharp">
-      <HintPath>..\packages\DSharpPlus.WebSocket.WebSocketSharp.3.2.3\lib\net47\DSharpPlus.WebSocket.WebSocketSharp.dll</HintPath>
+    <Reference Include="websocket-sharp">
+      <HintPath>..\packages\WebSocketSharp-NonPreRelease.1.0.0\lib\net35\websocket-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

+ 10 - 10
TFA-Bot/packages.config

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net462" />
-  <package id="DSharpPlus" version="3.2.3" targetFramework="net471" />
-  <package id="DSharpPlus.CommandsNext" version="3.2.3" targetFramework="net471" />
-  <package id="DSharpPlus.Interactivity" version="3.2.3" targetFramework="net471" />
-  <package id="DSharpPlus.WebSocket.WebSocketSharp" version="3.2.3" targetFramework="net471" />
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net46" />
+  <package id="DSharpPlus" version="3.2.3" targetFramework="net46" />
+  <package id="DSharpPlus.CommandsNext" version="3.2.3" targetFramework="net46" />
+  <package id="DSharpPlus.Interactivity" version="3.2.3" targetFramework="net46" />
+  <package id="DSharpPlus.WebSocket.WebSocketSharp" version="3.2.3" targetFramework="net46" />
   <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.1" targetFramework="net471" />
-  <package id="MimeKit" version="2.4.1" targetFramework="net471" />
+  <package id="MailKit" version="2.4.1" targetFramework="net46" />
+  <package id="MimeKit" version="2.4.1" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
-  <package id="RestSharp" version="106.6.10" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
-  <package id="WebSocketSharp-NonPreRelease" version="1.0.0" targetFramework="net462" />
+  <package id="RestSharp" version="106.6.10" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net46" />
+  <package id="WebSocketSharp-NonPreRelease" version="1.0.0" targetFramework="net46" />
 </packages>