From bd045044d0bc4dccf5f90bc424c6f04dbada8a75 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 18:18:39 +1000 Subject: [PATCH 1/7] Some packages updated --- src/ARKServerManager/ARKServerManager.csproj | 14 +++++++------- src/ARKServerManager/packages.config | 8 ++++---- src/ConanServerManager/ConanServerManager.csproj | 10 +++++----- src/ConanServerManager/packages.config | 6 +++--- .../Plugin.Common.UnitTests.csproj | 4 ++-- .../Plugin.Discord.UnitTests.csproj | 4 ++-- src/QueryMaster/QueryMaster.csproj | 2 +- .../ServerManager.Common.csproj | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 9ceb9148..015b44b3 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -107,15 +107,15 @@ prompt - - ..\packages\DotNetZip.1.13.8\lib\net40\DotNetZip.dll + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll ..\packages\EO.Wpf.4.0.12\lib\EO.Wpf.dll True - - ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll + + ..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net462\Hardcodet.NotifyIcon.Wpf.dll ..\packages\TaskScheduler.2.8.19\lib\net452\Microsoft.Win32.TaskScheduler.dll @@ -132,7 +132,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.2\lib\net45\NLog.dll + ..\packages\NLog.4.7.13\lib\net45\NLog.dll @@ -161,8 +161,8 @@ 4.0 - - ..\packages\TinyCsvParser.2.5.2\lib\net45\TinyCsvParser.dll + + ..\packages\TinyCsvParser.2.6.1\lib\net45\TinyCsvParser.dll diff --git a/src/ARKServerManager/packages.config b/src/ARKServerManager/packages.config index b1670d1f..0cfc7c89 100644 --- a/src/ARKServerManager/packages.config +++ b/src/ARKServerManager/packages.config @@ -1,14 +1,14 @@  - + - + - + - + \ No newline at end of file diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index 8267eeff..7fbf6b59 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -97,14 +97,14 @@ prompt - - ..\packages\DotNetZip.1.13.8\lib\net40\DotNetZip.dll + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll ..\packages\EO.Wpf.4.0.12\lib\EO.Wpf.dll - - ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll + + ..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net462\Hardcodet.NotifyIcon.Wpf.dll ..\packages\TaskScheduler.2.8.19\lib\net452\Microsoft.Win32.TaskScheduler.dll @@ -119,7 +119,7 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.7.2\lib\net45\NLog.dll + ..\packages\NLog.4.7.13\lib\net45\NLog.dll diff --git a/src/ConanServerManager/packages.config b/src/ConanServerManager/packages.config index 4debf34e..3f580c16 100644 --- a/src/ConanServerManager/packages.config +++ b/src/ConanServerManager/packages.config @@ -1,12 +1,12 @@  - + - + - + diff --git a/src/Plugin.Common.UnitTests/Plugin.Common.UnitTests.csproj b/src/Plugin.Common.UnitTests/Plugin.Common.UnitTests.csproj index 8ecf1e0f..31554d85 100644 --- a/src/Plugin.Common.UnitTests/Plugin.Common.UnitTests.csproj +++ b/src/Plugin.Common.UnitTests/Plugin.Common.UnitTests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/src/Plugin.Discord.UnitTests/Plugin.Discord.UnitTests.csproj b/src/Plugin.Discord.UnitTests/Plugin.Discord.UnitTests.csproj index e5b324a3..1110ba6a 100644 --- a/src/Plugin.Discord.UnitTests/Plugin.Discord.UnitTests.csproj +++ b/src/Plugin.Discord.UnitTests/Plugin.Discord.UnitTests.csproj @@ -10,8 +10,8 @@ false - - + + diff --git a/src/QueryMaster/QueryMaster.csproj b/src/QueryMaster/QueryMaster.csproj index 2ead566c..8be64e93 100644 --- a/src/QueryMaster/QueryMaster.csproj +++ b/src/QueryMaster/QueryMaster.csproj @@ -11,7 +11,7 @@ false - + diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj index b76aa89e..a6323e2f 100644 --- a/src/ServerManager.Common/ServerManager.Common.csproj +++ b/src/ServerManager.Common/ServerManager.Common.csproj @@ -12,10 +12,10 @@ false - + - + From d64691e9e4c44f3315c6d257fd864f800134676a Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 18:22:57 +1000 Subject: [PATCH 2/7] task scheduler updater --- src/ARKServerManager/ARKServerManager.csproj | 4 ++-- src/ARKServerManager/packages.config | 2 +- src/ConanServerManager/ConanServerManager.csproj | 4 ++-- src/ConanServerManager/packages.config | 2 +- src/ServerManager.Common/ServerManager.Common.csproj | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 015b44b3..60147ec3 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -117,8 +117,8 @@ ..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net462\Hardcodet.NotifyIcon.Wpf.dll - - ..\packages\TaskScheduler.2.8.19\lib\net452\Microsoft.Win32.TaskScheduler.dll + + ..\packages\TaskScheduler.2.9.2\lib\net452\Microsoft.Win32.TaskScheduler.dll ..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll diff --git a/src/ARKServerManager/packages.config b/src/ARKServerManager/packages.config index 0cfc7c89..34d8a424 100644 --- a/src/ARKServerManager/packages.config +++ b/src/ARKServerManager/packages.config @@ -7,7 +7,7 @@ - + diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index 7fbf6b59..4e0787d3 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -106,8 +106,8 @@ ..\packages\Hardcodet.NotifyIcon.Wpf.1.1.0\lib\net462\Hardcodet.NotifyIcon.Wpf.dll - - ..\packages\TaskScheduler.2.8.19\lib\net452\Microsoft.Win32.TaskScheduler.dll + + ..\packages\TaskScheduler.2.9.2\lib\net452\Microsoft.Win32.TaskScheduler.dll ..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll diff --git a/src/ConanServerManager/packages.config b/src/ConanServerManager/packages.config index 3f580c16..522f51cb 100644 --- a/src/ConanServerManager/packages.config +++ b/src/ConanServerManager/packages.config @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj index a6323e2f..b84ecaec 100644 --- a/src/ServerManager.Common/ServerManager.Common.csproj +++ b/src/ServerManager.Common/ServerManager.Common.csproj @@ -16,7 +16,7 @@ - + From 459923777537d75ed18ef83c269ac262419a5bcb Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 19:28:52 +1000 Subject: [PATCH 3/7] Firewall package update --- src/ServerManager.Common/ServerManager.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj index b84ecaec..771af878 100644 --- a/src/ServerManager.Common/ServerManager.Common.csproj +++ b/src/ServerManager.Common/ServerManager.Common.csproj @@ -17,7 +17,7 @@ - + From 86c64ad3bcdab02c448459a6007830ccbec0ca4a Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 19:34:02 +1000 Subject: [PATCH 4/7] Microsoft Extensions Updated --- src/ServerManager.Discord/ServerManager.Discord.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ServerManager.Discord/ServerManager.Discord.csproj b/src/ServerManager.Discord/ServerManager.Discord.csproj index 3a28fd00..6b54102c 100644 --- a/src/ServerManager.Discord/ServerManager.Discord.csproj +++ b/src/ServerManager.Discord/ServerManager.Discord.csproj @@ -18,9 +18,9 @@ - - - + + + From 42e47006abd455ac8e6b21d5c8e713fa4a8f7b5a Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 19:55:51 +1000 Subject: [PATCH 5/7] 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 @@ - - ..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll + + ..\packages\System.Threading.Tasks.Dataflow.4.5.25\lib\dotnet\System.Threading.Tasks.Dataflow.dll + True 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 @@ - + + + + + + + + + + + + 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 @@ - - ..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll + + ..\packages\System.Threading.Tasks.Dataflow.4.5.25\lib\dotnet\System.Threading.Tasks.Dataflow.dll + True 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 @@ - + + + + + + + + + + + + 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 @@ - + From ece15bf76ec90f3ec396701a4a411efa0100f451 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 20:01:52 +1000 Subject: [PATCH 6/7] System.Threading.Tasks.Dataflow updated --- src/ARKServerManager/ARKServerManager.csproj | 5 ++--- src/ARKServerManager/packages.config | 2 +- src/ConanServerManager/ConanServerManager.csproj | 5 ++--- src/ConanServerManager/packages.config | 2 +- src/ServerManager.Common/ServerManager.Common.csproj | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index f031e245..cf8beab6 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -146,9 +146,8 @@ - - ..\packages\System.Threading.Tasks.Dataflow.4.5.25\lib\dotnet\System.Threading.Tasks.Dataflow.dll - True + + ..\packages\System.Threading.Tasks.Dataflow.4.11.1\lib\net461\System.Threading.Tasks.Dataflow.dll diff --git a/src/ARKServerManager/packages.config b/src/ARKServerManager/packages.config index 17eb3c24..0f57ed29 100644 --- a/src/ARKServerManager/packages.config +++ b/src/ARKServerManager/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index 3606f347..27c7c884 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -135,9 +135,8 @@ - - ..\packages\System.Threading.Tasks.Dataflow.4.5.25\lib\dotnet\System.Threading.Tasks.Dataflow.dll - True + + ..\packages\System.Threading.Tasks.Dataflow.4.11.1\lib\net461\System.Threading.Tasks.Dataflow.dll diff --git a/src/ConanServerManager/packages.config b/src/ConanServerManager/packages.config index a631d460..e5175411 100644 --- a/src/ConanServerManager/packages.config +++ b/src/ConanServerManager/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj index 576da198..3b391dfd 100644 --- a/src/ServerManager.Common/ServerManager.Common.csproj +++ b/src/ServerManager.Common/ServerManager.Common.csproj @@ -15,7 +15,7 @@ - + From e1fd5f4944a598f6c25ea51110428a890b8bc289 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Thu, 9 Dec 2021 20:08:31 +1000 Subject: [PATCH 7/7] package updates --- src/ARKServerManager/ARKServerManager.csproj | 10 +++++++++ src/ARKServerManager/packages.config | 22 +++++++++---------- .../ConanServerManager.csproj | 10 +++++++++ src/ConanServerManager/packages.config | 22 +++++++++---------- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index cf8beab6..367de88c 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -135,15 +135,25 @@ ..\packages\NLog.4.7.13\lib\net45\NLog.dll + + + ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll + + + ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll + + + ..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll + diff --git a/src/ARKServerManager/packages.config b/src/ARKServerManager/packages.config index 0f57ed29..e8def065 100644 --- a/src/ARKServerManager/packages.config +++ b/src/ARKServerManager/packages.config @@ -6,17 +6,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index 27c7c884..fac45acb 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -122,17 +122,27 @@ ..\packages\NLog.4.7.13\lib\net45\NLog.dll + ..\packages\System.Data.SQLite.Core.1.0.112.1\lib\net40\System.Data.SQLite.dll + + ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll + + + ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll + + + ..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll + diff --git a/src/ConanServerManager/packages.config b/src/ConanServerManager/packages.config index e5175411..69759e68 100644 --- a/src/ConanServerManager/packages.config +++ b/src/ConanServerManager/packages.config @@ -6,18 +6,18 @@ - - + + - - - - - - - - - + + + + + + + + +