From dfc73ead8eb9fa65a72c0ec38573c7c996294647 Mon Sep 17 00:00:00 2001 From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com> Date: Sun, 20 Nov 2022 10:30:41 +0000 Subject: [PATCH] Revert "Add NuGet reference for DiscordRPC" This reverts commit 502cfe6605873bd6f654abfa765ecfd4976f928b. --- .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, 20 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 DiscordRPC diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..dc74b79 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "DiscordRPC"] + path = DiscordRPC + url = https://github.com/Lachee/discord-rpc-csharp.git diff --git a/Bloxstrap.sln b/Bloxstrap.sln index 62d830d..ec42cc7 100644 --- a/Bloxstrap.sln +++ b/Bloxstrap.sln @@ -5,6 +5,8 @@ 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 @@ -15,6 +17,10 @@ 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 1c9091f..6eb15f9 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -19,10 +19,13 @@ - + + + + diff --git a/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs b/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs index b3b59fd..5dd97e1 100644 --- a/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs +++ b/Bloxstrap/Helpers/Integrations/DiscordRichPresence.cs @@ -1,4 +1,5 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; diff --git a/Bloxstrap/Helpers/Updater.cs b/Bloxstrap/Helpers/Updater.cs index 1a6870a..942376a 100644 --- a/Bloxstrap/Helpers/Updater.cs +++ b/Bloxstrap/Helpers/Updater.cs @@ -1,5 +1,9 @@ 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 new file mode 160000 index 0000000..a9fcc8d --- /dev/null +++ b/DiscordRPC @@ -0,0 +1 @@ +Subproject commit a9fcc8d1e85738bc6493474a62a961842fa8dbc3