Updated packages, hopefully fixes some issues with new .net sdk

ScarletKuro · Jul 5, 2018 · 1d89b3d · 1d89b3d
1 parent 5083651
commit 1d89b3d
Show file tree

Hide file tree

Showing 102 changed files with 252 additions and 374 deletions.
diff --git a/NadekoBot.Core/Common/Collections/PoopyRingBuffer.cs b/NadekoBot.Core/Common/Collections/PoopyRingBuffer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 
 namespace NadekoBot.Common.Collections
 {

diff --git a/NadekoBot.Core/Common/ShardCom/ShardComServer.cs b/NadekoBot.Core/Common/ShardCom/ShardComServer.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NadekoBot.Core.Services;

diff --git a/NadekoBot.Core/Common/TypeReaders/Rgba32TypeReader.cs b/NadekoBot.Core/Common/TypeReaders/Rgba32TypeReader.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Discord.Commands;
 using Discord.WebSocket;
-using ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace NadekoBot.Core.Common.TypeReaders
 {

diff --git a/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.cs b/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

diff --git a/NadekoBot.Core/Migrations/20170722074959_cr-ca.cs b/NadekoBot.Core/Migrations/20170722074959_cr-ca.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20170814044636_waifu-items.cs b/NadekoBot.Core/Migrations/20170814044636_waifu-items.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

diff --git a/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.cs b/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.cs b/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

diff --git a/NadekoBot.Core/Migrations/20170911200031_lastXpGain.cs b/NadekoBot.Core/Migrations/20170911200031_lastXpGain.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations

diff --git a/NadekoBot.Core/Migrations/20170913022654_total-xp.cs b/NadekoBot.Core/Migrations/20170913022654_total-xp.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20170915034808_club-admins.cs b/NadekoBot.Core/Migrations/20170915034808_club-admins.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20170921185313_feeds.cs b/NadekoBot.Core/Migrations/20170921185313_feeds.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20170923002439_xprr-fix.cs b/NadekoBot.Core/Migrations/20170923002439_xprr-fix.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171013055008_clear-and-loadedpackage.cs b/NadekoBot.Core/Migrations/20171013055008_clear-and-loadedpackage.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171016091343_remove-convertunits.cs b/NadekoBot.Core/Migrations/20171016091343_remove-convertunits.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171021092614_tesar-grouping.cs b/NadekoBot.Core/Migrations/20171021092614_tesar-grouping.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171022144733_vc-auto-dc.cs b/NadekoBot.Core/Migrations/20171022144733_vc-auto-dc.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171026090236_timely.cs b/NadekoBot.Core/Migrations/20171026090236_timely.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171027155001_poll-rewrite.cs b/NadekoBot.Core/Migrations/20171027155001_poll-rewrite.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171107131810_sar-level-req.cs b/NadekoBot.Core/Migrations/20171107131810_sar-level-req.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171115040313_currency level up reward.cs b/NadekoBot.Core/Migrations/20171115040313_currency level up reward.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.cs b/NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171203174321_waifureset-multiplier.cs b/NadekoBot.Core/Migrations/20171203174321_waifureset-multiplier.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171207085015_patreon-currency-percent.cs b/NadekoBot.Core/Migrations/20171207085015_patreon-currency-percent.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171208093213_ropl-game-type.cs b/NadekoBot.Core/Migrations/20171208093213_ropl-game-type.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171220071403_reactionroles.cs b/NadekoBot.Core/Migrations/20171220071403_reactionroles.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171225193342_currency-moved.cs b/NadekoBot.Core/Migrations/20171225193342_currency-moved.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20171226065724_club-description.cs b/NadekoBot.Core/Migrations/20171226065724_club-description.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180108201829_stakes.cs b/NadekoBot.Core/Migrations/20180108201829_stakes.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180130161016_min-waifu-price.cs b/NadekoBot.Core/Migrations/20180130161016_min-waifu-price.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180204181501_waifu-gift-multiplier.cs b/NadekoBot.Core/Migrations/20180204181501_waifu-gift-multiplier.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180208141713_trivia-min-winreq.cs b/NadekoBot.Core/Migrations/20180208141713_trivia-min-winreq.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180208151629_min-max-bets.cs b/NadekoBot.Core/Migrations/20180208151629_min-max-bets.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180208201041_ok-error-defaults.cs b/NadekoBot.Core/Migrations/20180208201041_ok-error-defaults.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180209202506_indexes.cs b/NadekoBot.Core/Migrations/20180209202506_indexes.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180218112315_console-output-type.cs b/NadekoBot.Core/Migrations/20180218112315_console-output-type.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180227041527_donators-remove.cs b/NadekoBot.Core/Migrations/20180227041527_donators-remove.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180411212225_stream-offline-and-message.cs b/NadekoBot.Core/Migrations/20180411212225_stream-offline-and-message.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180419015916_no-redundant.cs b/NadekoBot.Core/Migrations/20180419015916_no-redundant.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180425075742_timed-ban.cs b/NadekoBot.Core/Migrations/20180425075742_timed-ban.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180429082653_currency-decay.cs b/NadekoBot.Core/Migrations/20180429082653_currency-decay.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/20180609115534_permissions-is-custom-cmd.cs b/NadekoBot.Core/Migrations/20180609115534_permissions-is-custom-cmd.cs
@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs b/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs
@@ -1,14 +1,9 @@
 // <auto-generated />
-using Discord;
+using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.EntityFrameworkCore.Storage.Internal;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using NadekoBot.Core.Services.Database;
-using NadekoBot.Core.Services.Database.Models;
-using System;
 
 namespace NadekoBot.Migrations
 {

diff --git a/NadekoBot.Core/Modules/Administration/MuteCommands.cs b/NadekoBot.Core/Modules/Administration/MuteCommands.cs
@@ -1,6 +1,5 @@
 using Discord;
 using Discord.Commands;
-using NadekoBot.Core.Services;
 using System;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;

diff --git a/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs b/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs
@@ -1,11 +1,9 @@
 using Discord.Commands;
 using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Administration.Services;
-using Microsoft.EntityFrameworkCore;
 using Discord;
 
 namespace NadekoBot.Modules.Administration

diff --git a/NadekoBot.Core/Modules/Administration/RoleCommands.cs b/NadekoBot.Core/Modules/Administration/RoleCommands.cs
@@ -1,12 +1,12 @@
 using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
-using ImageSharp;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
+using SixLabors.ImageSharp.PixelFormats;
 using System;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs b/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs
@@ -5,7 +5,6 @@
 using Discord.WebSocket;
 using NadekoBot.Core.Services;
 using NLog;
-using Discord;
 using System.Collections.Generic;
 
 namespace NadekoBot.Modules.Administration.Services

diff --git a/NadekoBot.Core/Modules/Administration/TimeZoneCommands.cs b/NadekoBot.Core/Modules/Administration/TimeZoneCommands.cs
@@ -1,6 +1,5 @@
 using Discord;
 using Discord.Commands;
-using Discord.WebSocket;
 using NadekoBot.Extensions;
 using System;
 using System.Linq;

diff --git a/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs b/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs
@@ -533,7 +533,7 @@ public async Task MassKill([Remainder] string people)
                             Type = BlacklistType.User,
                         }));
                     //clear their currencies
-                    uow.DiscordUsers.RemoveFromMany(found.Select(x => (long)x).ToList());
+                    uow.DiscordUsers.RemoveFromMany(found.Select(x => x).ToList());
                     uow.Complete();
                 }
 

diff --git a/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs b/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs
@@ -83,7 +83,7 @@ public CustomReactionsService(PermissionService perms, DbService db, NadekoStrin
                 }
             }, StackExchange.Redis.CommandFlags.FireAndForget);
 
-            var items = uow.CustomReactions.GetGlobalAndFor(bot.AllGuildConfigs.Select(x => (long)x.GuildId));
+            var items = uow.CustomReactions.GetGlobalAndFor(bot.AllGuildConfigs.Select(x => x.GuildId));
 
             GuildReactions = new ConcurrentDictionary<ulong, CustomReaction[]>(items
                 .Where(g => g.GuildId != null && g.GuildId != 0)

diff --git a/NadekoBot.Core/Modules/Gambling/Common/CurrencyEvents/SneakyEvent.cs b/NadekoBot.Core/Modules/Gambling/Common/CurrencyEvents/SneakyEvent.cs
@@ -1,14 +1,4 @@
-using Discord;
-using Discord.Commands;
-using Discord.WebSocket;
-using NadekoBot.Common;
-using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace NadekoBot.Modules.Gambling.Common.CurrencyEvents
+namespace NadekoBot.Modules.Gambling.Common.CurrencyEvents
 {
     //public class SneakyEvent : ICurrencyEvent
     //{