From 7688e2b2aedfc2c11b2c75c2cd13b17670b17a68 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Wed, 22 Jun 2022 00:21:18 +1000
Subject: [PATCH] Nuget package updates

- System.Threading.Tasks.Dataflow
---
 src/ARKServerManager/ARKServerManager.csproj         | 4 ++--
 src/ARKServerManager/packages.config                 | 2 +-
 src/ConanServerManager/ConanServerManager.csproj     | 4 ++--
 src/ConanServerManager/Lib/ServerStatusWatcher.cs    | 1 -
 src/ConanServerManager/packages.config               | 2 +-
 src/ServerManager.Common/ServerManager.Common.csproj | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj
index ea1750af..acf4b982 100644
--- a/src/ARKServerManager/ARKServerManager.csproj
+++ b/src/ARKServerManager/ARKServerManager.csproj
@@ -185,8 +185,8 @@
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.6.0.0\lib\net461\System.Threading.Tasks.Dataflow.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
diff --git a/src/ARKServerManager/packages.config b/src/ARKServerManager/packages.config
index aedfb2f8..6be679a7 100644
--- a/src/ARKServerManager/packages.config
+++ b/src/ARKServerManager/packages.config
@@ -4,9 +4,9 @@
   <package id="EO.Wpf" version="4.0.12" targetFramework="net462" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net462" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.1.0" targetFramework="net462" />
-  <package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="NLog" version="5.0.1" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Dataflow" version="6.0.0" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="TaskScheduler" version="2.10.1" targetFramework="net462" />
   <package id="TinyCsvParser" version="2.7.0" targetFramework="net462" />
diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj
index affeb78c..98f50373 100644
--- a/src/ConanServerManager/ConanServerManager.csproj
+++ b/src/ConanServerManager/ConanServerManager.csproj
@@ -173,8 +173,8 @@
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Dataflow, Version=4.5.24.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Dataflow, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.6.0.0\lib\net461\System.Threading.Tasks.Dataflow.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
diff --git a/src/ConanServerManager/Lib/ServerStatusWatcher.cs b/src/ConanServerManager/Lib/ServerStatusWatcher.cs
index 2e32d5ea..d785a173 100644
--- a/src/ConanServerManager/Lib/ServerStatusWatcher.cs
+++ b/src/ConanServerManager/Lib/ServerStatusWatcher.cs
@@ -7,7 +7,6 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
-using ConanData;
 using NLog;
 using ServerManagerTool.Common.Interfaces;
 using ServerManagerTool.Common.Utils;
diff --git a/src/ConanServerManager/packages.config b/src/ConanServerManager/packages.config
index 61b0af2f..4062d481 100644
--- a/src/ConanServerManager/packages.config
+++ b/src/ConanServerManager/packages.config
@@ -4,11 +4,11 @@
   <package id="EO.Wpf" version="4.0.12" targetFramework="net462" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net462" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.1.0" targetFramework="net462" />
-  <package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="NLog" version="5.0.1" targetFramework="net462" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net462" />
   <package id="System.Data.SQLite.Core" version="1.0.116.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Dataflow" version="6.0.0" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="TaskScheduler" version="2.10.1" targetFramework="net462" />
   <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net462" />
diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj
index cf0c75fa..91f45be4 100644
--- a/src/ServerManager.Common/ServerManager.Common.csproj
+++ b/src/ServerManager.Common/ServerManager.Common.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetZip" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Tpl.Dataflow" Version="4.5.24" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog" Version="5.0.1" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="TaskScheduler" Version="2.10.1" />
     <PackageReference Include="WindowsFirewallHelper" Version="2.2.0.86" />