From 84df3b9c5b1aac4abb54e79986bac79b1ca2111d Mon Sep 17 00:00:00 2001
From: CloudTheWolf <ukkmmichael@gmail.com>
Date: Sat, 9 Dec 2023 21:52:39 +0000
Subject: [PATCH] #1 Shared\Packages - Update to DSharpPlus 5 Nightly

---
 .../BotTests.cs                               | 76 -------------------
 ...DSharpPlus.Scaffolding.Shared.Tests.csproj | 38 ----------
 .../ShardBotTests.cs                          | 76 -------------------
 .../Usings.cs                                 | 10 ---
 ...dTheWolf.DSharpPlus.Scaffolding.Shared.sln |  6 --
 ...eWolf.DSharpPlus.Scaffolding.Shared.csproj | 18 ++---
 6 files changed, 9 insertions(+), 215 deletions(-)
 delete mode 100644 CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/BotTests.cs
 delete mode 100644 CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests.csproj
 delete mode 100644 CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/ShardBotTests.cs
 delete mode 100644 CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/Usings.cs

diff --git a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/BotTests.cs b/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/BotTests.cs
deleted file mode 100644
index 1801609..0000000
--- a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/BotTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests
-{
-    using global::DSharpPlus;
-    using Microsoft.Extensions.Logging;
-
-    public class Bot : IBot
-    {
-        public DiscordClient Client { get; set; }
-
-        public DiscordRestClient Rest { get; set; }
-
-        public CommandsNextExtension Commands { get; set; }
-
-        public InteractivityExtension Interactivity { get; set; }
-
-        public VoiceNextExtension Voice { get; set; }
-
-        public LavalinkConfiguration LavalinkConfig { get; set; }
-
-        public SlashCommandsExtension SlashCommandsExt { get; set; }
-
-        public static DiscordConfiguration DiscordConfig = new ()
-                                                               {
-                                                                   Token = "super-secret-token-owo",
-                                                                   TokenType = TokenType.Bot,
-                                                                   AutoReconnect = true,
-                                                                   MinimumLogLevel = LogLevel.Debug,
-                                                               };
-    }
-
-    [TestFixture]
-    public class BotTests
-    {
-        [Test]
-        public void Test_ValidateBot()
-        {
-            // Arrange
-            var client = new DiscordShardedClient(ShardBot.DiscordConfig);
-            var rest = new DiscordRestClient(ShardBot.DiscordConfig);
-            var commands = new Dictionary<int, CommandsNextExtension>();
-            var interactivity = new Dictionary<int, InteractivityExtension>();
-            var voice = new Dictionary<int, VoiceNextExtension>();
-            var lavalink = new Dictionary<int, LavalinkConfiguration>();
-            var slashCommands = new Dictionary<int, SlashCommandsExtension>();
-
-            var bot = new ShardBot
-                          {
-                              Client = client,
-                              Rest = rest,
-                              Commands = commands,
-                              Interactivity = interactivity,
-                              Voice = voice,
-                              LavalinkConfig = lavalink,
-                              SlashCommandsExt = slashCommands
-                          };
-
-            // Act
-            var actualClient = bot.Client;
-            var actualRest = bot.Rest;
-            var actualCommands = bot.Commands;
-            var actualInteractivity = bot.Interactivity;
-            var actualVoice = bot.Voice;
-            var actualLavalink = bot.LavalinkConfig;
-            var actualSlashCommands = bot.SlashCommandsExt;
-
-            // Assert
-            Assert.Equals(client, actualClient);
-            Assert.Equals(rest, actualRest);
-            Assert.Equals(commands, actualCommands);
-            Assert.Equals(interactivity, actualInteractivity);
-            Assert.Equals(voice, actualVoice);
-            Assert.Equals(lavalink, actualLavalink);
-            Assert.Equals(slashCommands, actualSlashCommands);
-        }
-    }
-}
\ No newline at end of file
diff --git a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests.csproj b/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests.csproj
deleted file mode 100644
index b57e7f2..0000000
--- a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.Lavalink" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.Rest" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.VoiceNext" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.VoiceNext.Natives" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="NUnit" Version="4.0.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CloudTheWolf.DSharpPlus.Scaffolding.Shared\CloudTheWolf.DSharpPlus.Scaffolding.Shared.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/ShardBotTests.cs b/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/ShardBotTests.cs
deleted file mode 100644
index 96a6371..0000000
--- a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/ShardBotTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-namespace CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests
-{
-    using global::DSharpPlus;
-    using Microsoft.Extensions.Logging;
-
-    public class ShardBot : IShardBot
-    {
-        public DiscordShardedClient Client { get; set; }
-
-        public DiscordRestClient Rest { get; set; }
-
-        public IReadOnlyDictionary<int, CommandsNextExtension> Commands { get; set; }
-
-        public IReadOnlyDictionary<int, InteractivityExtension> Interactivity { get; set; }
-
-        public IReadOnlyDictionary<int, VoiceNextExtension> Voice { get; set; }
-
-        public IReadOnlyDictionary<int, LavalinkConfiguration> LavalinkConfig { get; set; }
-
-        public IReadOnlyDictionary<int, SlashCommandsExtension> SlashCommandsExt { get; set; }
-
-        public static DiscordConfiguration DiscordConfig = new ()
-                                                               {
-                                                                   Token = "super-secret-token-owo",
-                                                                   TokenType = TokenType.Bot,
-                                                                   AutoReconnect = true,
-                                                                   MinimumLogLevel = LogLevel.Debug,
-                                                               };
-    }
-
-    [TestFixture]
-    public class ShardBotTests
-    {
-        [Test]
-        public void Test_ValidateSharedBot()
-        {
-            // Arrange
-            var client = new DiscordShardedClient(ShardBot.DiscordConfig);
-            var rest = new DiscordRestClient(ShardBot.DiscordConfig);
-            var commands = new Dictionary<int, CommandsNextExtension>();
-            var interactivity = new Dictionary<int, InteractivityExtension>();
-            var voice = new Dictionary<int, VoiceNextExtension>();
-            var lavalink = new Dictionary<int, LavalinkConfiguration>();
-            var slashCommands = new Dictionary<int, SlashCommandsExtension>();
-
-            var bot = new ShardBot
-                          {
-                              Client = client,
-                              Rest = rest,
-                              Commands = commands,
-                              Interactivity = interactivity,
-                              Voice = voice,
-                              LavalinkConfig = lavalink,
-                              SlashCommandsExt = slashCommands
-                          };
-
-            // Act
-            var actualClient = bot.Client;
-            var actualRest = bot.Rest;
-            var actualCommands = bot.Commands;
-            var actualInteractivity = bot.Interactivity;
-            var actualVoice = bot.Voice;
-            var actualLavalink = bot.LavalinkConfig;
-            var actualSlashCommands = bot.SlashCommandsExt;
-
-            // Assert
-            Assert.Equals(client, actualClient);
-            Assert.Equals(rest, actualRest);
-            Assert.Equals(commands, actualCommands);
-            Assert.Equals(interactivity, actualInteractivity);
-            Assert.Equals(voice, actualVoice);
-            Assert.Equals(lavalink, actualLavalink);
-            Assert.Equals(slashCommands, actualSlashCommands);
-        }
-    }
-}
\ No newline at end of file
diff --git a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/Usings.cs b/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/Usings.cs
deleted file mode 100644
index 2bafb7b..0000000
--- a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests/Usings.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-global using DSharpPlus;
-global using DSharpPlus.Interactivity;
-global using DSharpPlus.Lavalink;
-global using DSharpPlus.SlashCommands;
-global using Moq;
-global using NUnit.Framework;
-global using DSharpPlus.CommandsNext;
-global using DSharpPlus.VoiceNext;
-global using CloudTheWolf.DSharpPlus.Scaffolding.Shared.Interfaces;
\ No newline at end of file
diff --git a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.sln b/CloudTheWolf.DSharpPlus.Scaffolding.Shared.sln
index 5dd74df..26949e3 100644
--- a/CloudTheWolf.DSharpPlus.Scaffolding.Shared.sln
+++ b/CloudTheWolf.DSharpPlus.Scaffolding.Shared.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31606.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudTheWolf.DSharpPlus.Scaffolding.Shared", "CloudTheWolf.DSharpPlus.Scaffolding.Shared\CloudTheWolf.DSharpPlus.Scaffolding.Shared.csproj", "{FA98CAD9-B490-4C4E-AAA8-B755A6DDD3F6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests", "CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests\CloudTheWolf.DSharpPlus.Scaffolding.Shared.Tests.csproj", "{0E3D2790-DB28-4BF5-BBB0-843B73A35457}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{FA98CAD9-B490-4C4E-AAA8-B755A6DDD3F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA98CAD9-B490-4C4E-AAA8-B755A6DDD3F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA98CAD9-B490-4C4E-AAA8-B755A6DDD3F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E3D2790-DB28-4BF5-BBB0-843B73A35457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E3D2790-DB28-4BF5-BBB0-843B73A35457}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E3D2790-DB28-4BF5-BBB0-843B73A35457}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E3D2790-DB28-4BF5-BBB0-843B73A35457}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CloudTheWolf.DSharpPlus.Scaffolding.Shared/CloudTheWolf.DSharpPlus.Scaffolding.Shared.csproj b/CloudTheWolf.DSharpPlus.Scaffolding.Shared/CloudTheWolf.DSharpPlus.Scaffolding.Shared.csproj
index 37c0ffa..5c1b829 100644
--- a/CloudTheWolf.DSharpPlus.Scaffolding.Shared/CloudTheWolf.DSharpPlus.Scaffolding.Shared.csproj
+++ b/CloudTheWolf.DSharpPlus.Scaffolding.Shared/CloudTheWolf.DSharpPlus.Scaffolding.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <DebugType>embedded</DebugType>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -10,7 +10,7 @@
     <Copyright>© 2021 CloudTheWolf Ltd</Copyright>
     <Description>Shared Interfaces for CloudTheWolf.DSharpPlus.Scaffolding</Description>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <AssemblyVersion>2.1.1.2</AssemblyVersion>
+    <AssemblyVersion>3.0.0.1</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <Version>$(AssemblyVersion)-beta</Version>
     <PackageIcon>logo.png</PackageIcon>
@@ -21,13 +21,13 @@
 
   <ItemGroup>
     <PackageReference Include="CloudTheWolf.DSharpPlus.Scaffolding.Logging" Version="2.1.0.1" />
-    <PackageReference Include="DSharpPlus" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.Lavalink" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.Rest" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.3" />
-    <PackageReference Include="DSharpPlus.VoiceNext" Version="4.4.3" />
+    <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-01907" />
+    <PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-01907" />
+    <PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-nightly-01907" />
+    <PackageReference Include="DSharpPlus.Lavalink" Version="5.0.0-nightly-01907" />
+    <PackageReference Include="DSharpPlus.Rest" Version="5.0.0-nightly-01907" />
+    <PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-01907" />
+    <PackageReference Include="DSharpPlus.VoiceNext" Version="5.0.0-nightly-01907" />
     <PackageReference Include="DSharpPlus.VoiceNext.Natives" Version="1.0.0" />
   </ItemGroup>