From 2af7b5b9f583b801bcf6ef395612b6089e8e73ed Mon Sep 17 00:00:00 2001 From: Mehrshad Date: Tue, 17 Oct 2023 16:27:19 +0330 Subject: [PATCH] Frontend.XF.*: sync & resolve packages conflict This commit upgrades packages in Frotend.XF.* projects to be in sync with versions used in Backend. Sanity check was also complaining before this commit with the following error: ``` 190 nuget packages found for solution gwallet.mac-legacy.sln Package found with more than one version: JsonRpcSharp. All occurrences: * Version: 0.98.0--date20230731-1252.git-6788e32. Dependency holder: GWallet.Backend/ * Version: 0.98.0--date20230731-1252.git-6788e32. Dependency holder: GWallet.Backend/ * Version: 0.94.0--date20201018-1119.git-05d4006. Dependency holder: GWallet.Frontend.XF.Android/ * Version: 0.94.0--date20201018-1119.git-05d4006. Dependency holder: GWallet.Frontend.XF.iOS/ Package found with more than one version: Newtonsoft.Json. All occurrences: * Version: 13.0.2. Dependency holder: GWallet.Backend.Tests/ * Version: 13.0.2. Dependency holder: GWallet.Backend/ * Version: 13.0.2. Dependency holder: GWallet.Backend/ * Version: 11.0.2. Dependency holder: GWallet.Frontend.XF.Android/ * Version: 11.0.2. Dependency holder: GWallet.Frontend.XF.iOS/ ``` Closes https://github.com/nblockchain/geewallet/pull/229 Closes https://github.com/nblockchain/geewallet/pull/230 Closes https://github.com/nblockchain/geewallet/pull/231 Closes https://github.com/nblockchain/geewallet/pull/232 Co-authored-by: Afshin Arani --- .../GWallet.Frontend.XF.Android.fsproj | 12 ++++++------ src/GWallet.Frontend.XF.Android/packages.config | 4 ++-- .../GWallet.Frontend.XF.Gtk.fsproj | 12 ++++++------ src/GWallet.Frontend.XF.Gtk/packages.config | 4 ++-- .../GWallet.Frontend.XF.Mac.fsproj | 12 ++++++------ src/GWallet.Frontend.XF.Mac/packages.config | 4 ++-- .../GWallet.Frontend.XF.iOS.fsproj | 12 ++++++------ src/GWallet.Frontend.XF.iOS/packages.config | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj b/src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj index e1e71b823..1b60db231 100644 --- a/src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj +++ b/src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj @@ -276,19 +276,19 @@ ..\..\packages\HtmlAgilityPack.1.11.24\lib\netstandard2.0\HtmlAgilityPack.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll @@ -333,7 +333,7 @@ ..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.Web3.dll - ..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll ..\..\packages\SharpRaven.2.4.0\lib\netstandard2.0\SharpRaven.dll diff --git a/src/GWallet.Frontend.XF.Android/packages.config b/src/GWallet.Frontend.XF.Android/packages.config index 94dd1271d..87848d06f 100644 --- a/src/GWallet.Frontend.XF.Android/packages.config +++ b/src/GWallet.Frontend.XF.Android/packages.config @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj b/src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj index 4cbbceac4..ce3686c54 100644 --- a/src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj +++ b/src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj @@ -67,7 +67,7 @@ ..\..\packages\Portable.BouncyCastle.1.8.5.2\lib\net40\BouncyCastle.Crypto.dll - ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -146,19 +146,19 @@ ..\..\packages\System.Net.WebSockets.Client.4.3.2\lib\net46\System.Net.WebSockets.Client.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll ..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.ABI.dll diff --git a/src/GWallet.Frontend.XF.Gtk/packages.config b/src/GWallet.Frontend.XF.Gtk/packages.config index 8ca40d5d6..a96baa6b8 100644 --- a/src/GWallet.Frontend.XF.Gtk/packages.config +++ b/src/GWallet.Frontend.XF.Gtk/packages.config @@ -7,13 +7,13 @@ - + - + diff --git a/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj b/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj index 1ffb1a64c..31032e2a0 100644 --- a/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj +++ b/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj @@ -63,7 +63,7 @@ ..\..\packages\Zlib.Portable.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll - ..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll ..\..\packages\Portable.BouncyCastle.1.8.5.2\lib\netstandard2.0\BouncyCastle.Crypto.dll @@ -121,19 +121,19 @@ ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll ..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.ABI.dll diff --git a/src/GWallet.Frontend.XF.Mac/packages.config b/src/GWallet.Frontend.XF.Mac/packages.config index 8a4523607..51a86c052 100644 --- a/src/GWallet.Frontend.XF.Mac/packages.config +++ b/src/GWallet.Frontend.XF.Mac/packages.config @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj b/src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj index b2124da90..3d8017712 100644 --- a/src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj +++ b/src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj @@ -178,7 +178,7 @@ ..\..\packages\Common.Logging.Core.3.4.1\lib\netstandard1.0\Common.Logging.Core.dll - ..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll ..\..\packages\Portable.BouncyCastle.1.8.5.2\lib\netstandard2.0\BouncyCastle.Crypto.dll @@ -230,19 +230,19 @@ ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll - ..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll + ..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll ..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.ABI.dll diff --git a/src/GWallet.Frontend.XF.iOS/packages.config b/src/GWallet.Frontend.XF.iOS/packages.config index 94471b643..a8e21708f 100644 --- a/src/GWallet.Frontend.XF.iOS/packages.config +++ b/src/GWallet.Frontend.XF.iOS/packages.config @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - +