From 42e47006abd455ac8e6b21d5c8e713fa4a8f7b5a Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Thu, 9 Dec 2021 19:55:51 +1000
Subject: [PATCH] System.Threading.Tasks.Dataflow updated

---
 src/ARKServerManager/ARKServerManager.csproj        |  5 +++--
 src/ARKServerManager/packages.config                | 13 ++++++++++++-
 src/ConanServerManager/ConanServerManager.csproj    |  5 +++--
 src/ConanServerManager/packages.config              | 13 ++++++++++++-
 .../ServerManager.Common.csproj                     |  2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj
index 60147ec3..f031e245 100644
--- a/src/ARKServerManager/ARKServerManager.csproj
+++ b/src/ARKServerManager/ARKServerManager.csproj
@@ -146,8 +146,9 @@
     <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=4.5.25.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.5.25\lib\dotnet\System.Threading.Tasks.Dataflow.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/ARKServerManager/packages.config b/src/ARKServerManager/packages.config
index 34d8a424..17eb3c24 100644
--- a/src/ARKServerManager/packages.config
+++ b/src/ARKServerManager/packages.config
@@ -4,9 +4,20 @@
   <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="12.0.3" targetFramework="net462" />
   <package id="NLog" version="4.7.13" targetFramework="net462" />
+  <package id="System.Collections" version="4.0.0" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.0.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Tracing" version="4.0.0" targetFramework="net462" />
+  <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net462" />
+  <package id="System.Linq" version="4.0.0" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net462" />
+  <package id="System.Runtime" version="4.0.0" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.0.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.0.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.5.25" targetFramework="net462" />
   <package id="TaskScheduler" version="2.9.2" targetFramework="net462" />
   <package id="TinyCsvParser" version="2.6.1" targetFramework="net462" />
   <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net462" />
diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj
index 4e0787d3..3606f347 100644
--- a/src/ConanServerManager/ConanServerManager.csproj
+++ b/src/ConanServerManager/ConanServerManager.csproj
@@ -135,8 +135,9 @@
     <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=4.5.25.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.5.25\lib\dotnet\System.Threading.Tasks.Dataflow.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/ConanServerManager/packages.config b/src/ConanServerManager/packages.config
index 522f51cb..a631d460 100644
--- a/src/ConanServerManager/packages.config
+++ b/src/ConanServerManager/packages.config
@@ -4,10 +4,21 @@
   <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="12.0.3" targetFramework="net462" />
   <package id="NLog" version="4.7.13" targetFramework="net462" />
+  <package id="System.Collections" version="4.0.0" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.0.0" targetFramework="net462" />
   <package id="System.Data.SQLite.Core" version="1.0.112.1" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.0.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Tracing" version="4.0.0" targetFramework="net462" />
+  <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net462" />
+  <package id="System.Linq" version="4.0.0" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.0.0" targetFramework="net462" />
+  <package id="System.Runtime" version="4.0.0" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.0.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.0.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.0.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Dataflow" version="4.5.25" targetFramework="net462" />
   <package id="TaskScheduler" version="2.9.2" targetFramework="net462" />
   <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net462" />
   <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net462" />
diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj
index 771af878..576da198 100644
--- a/src/ServerManager.Common/ServerManager.Common.csproj
+++ b/src/ServerManager.Common/ServerManager.Common.csproj
@@ -13,9 +13,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DotNetZip" Version="1.16.0" />
-    <PackageReference Include="Microsoft.Tpl.Dataflow" Version="4.5.24" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog" Version="4.7.13" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.5.25" />
     <PackageReference Include="TaskScheduler" Version="2.9.2" />
     <PackageReference Include="WindowsFirewallHelper" Version="1.6.3.46" />
   </ItemGroup>