From 502cfe6605873bd6f654abfa765ecfd4976f928b Mon Sep 17 00:00:00 2001
From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com>
Date: Sat, 19 Nov 2022 15:23:24 +0000
Subject: [PATCH] Add NuGet reference for DiscordRPC

NuGet package for DiscordRPC has finally been updated, submodule isn't needed anymore.
---
 .gitmodules                                           | 3 ---
 Bloxstrap.sln                                         | 6 ------
 Bloxstrap/Bloxstrap.csproj                            | 5 +----
 Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs | 3 +--
 Bloxstrap/Helpers/Updater.cs                          | 4 ----
 DiscordRPC                                            | 1 -
 6 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 DiscordRPC

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index dc74b79..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "DiscordRPC"]
-	path = DiscordRPC
-	url = https://github.com/Lachee/discord-rpc-csharp.git
diff --git a/Bloxstrap.sln b/Bloxstrap.sln
index ec42cc7..62d830d 100644
--- a/Bloxstrap.sln
+++ b/Bloxstrap.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bloxstrap", "Bloxstrap\Bloxstrap.csproj", "{646D1D58-C9CA-48C9-BBCD-30585A1DAAF1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordRPC", "DiscordRPC\DiscordRPC\DiscordRPC.csproj", "{BDB66971-35FA-45BD-ABD6-70B814D2E55C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{646D1D58-C9CA-48C9-BBCD-30585A1DAAF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{646D1D58-C9CA-48C9-BBCD-30585A1DAAF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{646D1D58-C9CA-48C9-BBCD-30585A1DAAF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDB66971-35FA-45BD-ABD6-70B814D2E55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDB66971-35FA-45BD-ABD6-70B814D2E55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDB66971-35FA-45BD-ABD6-70B814D2E55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDB66971-35FA-45BD-ABD6-70B814D2E55C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
index 6eb15f9..1c9091f 100644
--- a/Bloxstrap/Bloxstrap.csproj
+++ b/Bloxstrap/Bloxstrap.csproj
@@ -19,13 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DiscordRichPresence" Version="1.1.1.14" />
     <PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DiscordRPC\DiscordRPC\DiscordRPC.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Dialogs\BootstrapperDialogs\LegacyDialog2009.cs" />
     <Compile Update="Properties\Resources.Designer.cs">
diff --git a/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs b/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs
index 5dd97e1..b3b59fd 100644
--- a/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs
+++ b/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Text.RegularExpressions;
 
diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs
index 942376a..1a6870a 100644
--- a/Bloxstrap/Helpers/Updater.cs
+++ b/Bloxstrap/Helpers/Updater.cs
@@ -1,9 +1,5 @@
 using System.Diagnostics;
 using System.IO;
-using System.Net.Http;
-using System.Text.Json;
-
-using Newtonsoft.Json.Linq;
 
 using Bloxstrap.Models;
 using Bloxstrap.Dialogs;
diff --git a/DiscordRPC b/DiscordRPC
deleted file mode 160000
index a9fcc8d..0000000
--- a/DiscordRPC
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9fcc8d1e85738bc6493474a62a961842fa8dbc3