From cf7aba56f1855a47771f0f2709553c3d6ce7118f Mon Sep 17 00:00:00 2001
From: MrMelon <github@onpointcoding.net>
Date: Wed, 23 Sep 2020 20:25:28 +0100
Subject: [PATCH] stuff for msbuild

---
 MelonVPNClient/MelonVPNClient.csproj | 14 ++++++++++++--
 MelonVPNCore/MelonVPNCore.csproj     |  6 ++----
 MelonVPNCore/packages.config         |  4 ----
 3 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 MelonVPNCore/packages.config

diff --git a/MelonVPNClient/MelonVPNClient.csproj b/MelonVPNClient/MelonVPNClient.csproj
index 44b6e83..738c40d 100644
--- a/MelonVPNClient/MelonVPNClient.csproj
+++ b/MelonVPNClient/MelonVPNClient.csproj
@@ -57,6 +57,9 @@
     <Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Package>gio-sharp-3.0</Package>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\..\net-libs\Newtonsoft.Json.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -80,11 +83,18 @@
     <None Include="melonvpnclient">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="melonvpn.desktop">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="MiniMelonVPNOnline.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="MiniMelonVPNIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="MelonVPNDesktopIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/MelonVPNCore/MelonVPNCore.csproj b/MelonVPNCore/MelonVPNCore.csproj
index 0fe0ee3..eb1f537 100644
--- a/MelonVPNCore/MelonVPNCore.csproj
+++ b/MelonVPNCore/MelonVPNCore.csproj
@@ -39,11 +39,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\net-libs\Newtonsoft.Json.dll</HintPath>
+      <IncludeInPackage>true</IncludeInPackage>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/MelonVPNCore/packages.config b/MelonVPNCore/packages.config
deleted file mode 100644
index 281c145..0000000
--- a/MelonVPNCore/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
-</packages>
\ No newline at end of file