From 3a5b476b53153a96f4f4e27de8340b60ae4892e5 Mon Sep 17 00:00:00 2001
From: Noikoio <noikoio1@gmail.com>
Date: Tue, 5 May 2020 01:07:53 -0700
Subject: [PATCH] Update target framework, dependencies

---
 RegexBot/Module/AutoMod/Responses/Report.cs         |  4 ++--
 .../Module/ModCommands/Commands/_CommandBase.cs     |  2 +-
 RegexBot/Module/ModLogs/MessageCache.cs             |  2 +-
 RegexBot/Module/VoteTempChannel/VoteTempChannel.cs  |  4 ++--
 .../Properties/PublishProfiles/DebugProfile.pubxml  | 13 -------------
 .../Properties/PublishProfiles/StableProfile.pubxml | 13 -------------
 RegexBot/RegexBot.csproj                            |  8 ++++----
 7 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 RegexBot/Properties/PublishProfiles/DebugProfile.pubxml
 delete mode 100644 RegexBot/Properties/PublishProfiles/StableProfile.pubxml

diff --git a/RegexBot/Module/AutoMod/Responses/Report.cs b/RegexBot/Module/AutoMod/Responses/Report.cs
index 6cad530..fc5d938 100644
--- a/RegexBot/Module/AutoMod/Responses/Report.cs
+++ b/RegexBot/Module/AutoMod/Responses/Report.cs
@@ -33,7 +33,7 @@ namespace Noikoio.RegexBot.Module.AutoMod.Responses
             await target.SendMessageAsync("", embed: BuildReportEmbed(msg));
         }
 
-        private EmbedBuilder BuildReportEmbed(SocketMessage msg)
+        private Embed BuildReportEmbed(SocketMessage msg)
         {
             string invokeLine = msg.Content;
 
@@ -104,7 +104,7 @@ namespace Noikoio.RegexBot.Module.AutoMod.Responses
                 });
             }
             
-            return finalem;
+            return finalem.Build();
         }
     }
 }
diff --git a/RegexBot/Module/ModCommands/Commands/_CommandBase.cs b/RegexBot/Module/ModCommands/Commands/_CommandBase.cs
index 23bf62e..53a0671 100644
--- a/RegexBot/Module/ModCommands/Commands/_CommandBase.cs
+++ b/RegexBot/Module/ModCommands/Commands/_CommandBase.cs
@@ -118,7 +118,7 @@ namespace Noikoio.RegexBot.Module.ModCommands.Commands
                 Title = "Usage",
                 Description = DefaultUsageMsg
             };
-            await target.SendMessageAsync(message ?? "", embed: usageEmbed);
+            await target.SendMessageAsync(message ?? "", embed: usageEmbed.Build());
         }
 
         /// <summary>
diff --git a/RegexBot/Module/ModLogs/MessageCache.cs b/RegexBot/Module/ModLogs/MessageCache.cs
index 3419d5c..fd1d7d0 100644
--- a/RegexBot/Module/ModLogs/MessageCache.cs
+++ b/RegexBot/Module/ModLogs/MessageCache.cs
@@ -139,7 +139,7 @@ namespace Noikoio.RegexBot.Module.ModLogs
 
             // Prepare and send out message
             var em = CreateReportEmbed(isDelete, ucd, messageId, ch, (msgContent, editMsg), msgCreateTime, msgEditTime);
-            await cfg.RptTarget.SendMessageAsync("", embeds: new Embed[] { em });
+            await cfg.RptTarget.SendMessageAsync("", embeds: new Embed[] { em.Build() });
         }
 
         const int ReportCutoffLength = 500;
diff --git a/RegexBot/Module/VoteTempChannel/VoteTempChannel.cs b/RegexBot/Module/VoteTempChannel/VoteTempChannel.cs
index f4b375d..68da8d1 100644
--- a/RegexBot/Module/VoteTempChannel/VoteTempChannel.cs
+++ b/RegexBot/Module/VoteTempChannel/VoteTempChannel.cs
@@ -178,7 +178,7 @@ namespace Noikoio.RegexBot.Module.VoteTempChannel
                         manageChannel: PermValue.Allow,
                         sendMessages: PermValue.Allow,
                         manageMessages: PermValue.Allow,
-                        managePermissions: PermValue.Allow));
+                        manageRoles: PermValue.Allow));
                 }
                 catch (Discord.Net.HttpException ex)
                 {
@@ -208,7 +208,7 @@ namespace Noikoio.RegexBot.Module.VoteTempChannel
                         manageChannel: PermValue.Allow,
                         sendMessages: PermValue.Allow,
                         manageMessages: PermValue.Allow,
-                        managePermissions: PermValue.Allow));
+                        manageRoles: PermValue.Allow));
                 }
                 catch (Discord.Net.HttpException ex)
                 {
diff --git a/RegexBot/Properties/PublishProfiles/DebugProfile.pubxml b/RegexBot/Properties/PublishProfiles/DebugProfile.pubxml
deleted file mode 100644
index a6217fd..0000000
--- a/RegexBot/Properties/PublishProfiles/DebugProfile.pubxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Debug</Configuration>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <PublishDir>bin\Debug\PublishOutput</PublishDir>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/RegexBot/Properties/PublishProfiles/StableProfile.pubxml b/RegexBot/Properties/PublishProfiles/StableProfile.pubxml
deleted file mode 100644
index 548b9af..0000000
--- a/RegexBot/Properties/PublishProfiles/StableProfile.pubxml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <PublishDir>bin\Release\PublishOutput</PublishDir>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/RegexBot/RegexBot.csproj b/RegexBot/RegexBot.csproj
index c9a60e8..7a464c3 100644
--- a/RegexBot/RegexBot.csproj
+++ b/RegexBot/RegexBot.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>Noikoio.RegexBot</RootNamespace>
     <Description>Highly configurable Discord moderation bot</Description>
     <Authors>Noikoio</Authors>
     <Company />
-    <Version>2.6.4</Version>
+    <Version>2.6.5</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -15,8 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="1.0.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Discord.Net" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Npgsql" Version="3.2.7" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>