From e2789623cd2977993bca4178947786eac7e01a49 Mon Sep 17 00:00:00 2001
From: alterNERDtive <nerd@alternerd.tv>
Date: Tue, 12 Jul 2022 00:40:55 +0200
Subject: [PATCH] cleaned up dependency mess

---
 .../VoiceAttack-base/VoiceAttack-base.csproj  | 21 ++++++++++---------
 plugins/VoiceAttack-base/packages.config      |  5 -----
 2 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 plugins/VoiceAttack-base/packages.config

diff --git a/plugins/VoiceAttack-base/VoiceAttack-base.csproj b/plugins/VoiceAttack-base/VoiceAttack-base.csproj
index df39c70..c1b8c7e 100644
--- a/plugins/VoiceAttack-base/VoiceAttack-base.csproj
+++ b/plugins/VoiceAttack-base/VoiceAttack-base.csproj
@@ -36,23 +36,16 @@
     <DocumentationFile>..\build\alterNERDtive\base.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -68,14 +61,22 @@
     </Compile>
     <Compile Include="util.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Page Include="SettingsDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client">
+      <Version>5.2.9</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Http">
+      <Version>4.3.4</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/plugins/VoiceAttack-base/packages.config b/plugins/VoiceAttack-base/packages.config
deleted file mode 100644
index 3de716e..0000000
--- a/plugins/VoiceAttack-base/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
-</packages>
\ No newline at end of file