Skip to content

Commit

Permalink
Frontend.XF.*: sync & resolve packages conflict
Browse files Browse the repository at this point in the history
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 nblockchain#229
Closes nblockchain#230
Closes nblockchain#231
Closes nblockchain#232

Co-authored-by: Afshin Arani <[email protected]>
  • Loading branch information
2 people authored and knocte committed Oct 20, 2023
1 parent c00f9e4 commit 2af7b5b
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -276,19 +276,19 @@
<HintPath>..\..\packages\HtmlAgilityPack.1.11.24\lib\netstandard2.0\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.Client">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.IpcClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.HttpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.TcpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.WebSocketClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
Expand Down Expand Up @@ -333,7 +333,7 @@
<HintPath>..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.Web3.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SharpRaven">
<HintPath>..\..\packages\SharpRaven.2.4.0\lib\netstandard2.0\SharpRaven.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/GWallet.Frontend.XF.Android/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<package id="FSharp.Core" version="4.7.0" targetFramework="monoandroid90" />
<package id="FSharp.Data" version="3.0.0" targetFramework="monoandroid90" />
<package id="HtmlAgilityPack" version="1.11.24" targetFramework="monoandroid90" />
<package id="JsonRpcSharp" version="0.94.0--date20201018-1119.git-05d4006" targetFramework="monoandroid90" />
<package id="JsonRpcSharp" version="0.98.0--date20230731-1252.git-6788e32" targetFramework="monoandroid90" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid90" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="monoandroid90" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid90" />
Expand All @@ -16,7 +16,7 @@
<package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="monoandroid90" />
<package id="Nethereum" version="0.95.0--date20210125-0551.git-05a29e9" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="monoandroid90" />
<package id="Portable.BouncyCastle" version="1.8.5.2" targetFramework="monoandroid90" />
<package id="SharpRaven" version="2.4.0" targetFramework="monoandroid90" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
Expand Down
12 changes: 6 additions & 6 deletions src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<HintPath>..\..\packages\Portable.BouncyCastle.1.8.5.2\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation">
<HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
Expand Down Expand Up @@ -146,19 +146,19 @@
<HintPath>..\..\packages\System.Net.WebSockets.Client.4.3.2\lib\net46\System.Net.WebSockets.Client.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.Client">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.IpcClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.HttpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.TcpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.WebSocketClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
</Reference>
<Reference Include="Nethereum.ABI">
<HintPath>..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.ABI.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/GWallet.Frontend.XF.Gtk/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<package id="FSharp.Core" version="4.7.0" targetFramework="net461" />
<package id="FSharp.Data" version="3.0.0" targetFramework="net461" />
<package id="HtmlAgilityPack" version="1.11.24" targetFramework="net471" />
<package id="JsonRpcSharp" version="0.94.0--date20201018-1119.git-05d4006" targetFramework="net471" />
<package id="JsonRpcSharp" version="0.98.0--date20230731-1252.git-6788e32" targetFramework="net471" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="net471" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net461" />
<package id="NBitcoin" version="6.0.17" targetFramework="net471" />
<package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="net471" />
<package id="Nethereum" version="0.95.0--date20210125-0551.git-05a29e9" targetFramework="net471" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net461" />
<package id="OpenTK" version="3.0.1" targetFramework="net461" />
<package id="Portable.BouncyCastle" version="1.8.5.2" targetFramework="net461" />
<package id="SharpRaven" version="2.4.0" targetFramework="net461" />
Expand Down
12 changes: 6 additions & 6 deletions src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<HintPath>..\..\packages\Zlib.Portable.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\..\packages\Portable.BouncyCastle.1.8.5.2\lib\netstandard2.0\BouncyCastle.Crypto.dll</HintPath>
Expand Down Expand Up @@ -121,19 +121,19 @@
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.Client">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.IpcClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.HttpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.TcpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.WebSocketClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
</Reference>
<Reference Include="Nethereum.ABI">
<HintPath>..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.ABI.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/GWallet.Frontend.XF.Mac/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="FSharp.Core" version="4.7.0" targetFramework="xamarinmac20" />
<package id="FSharp.Data" version="3.0.0" targetFramework="xamarinmac20" />
<package id="HtmlAgilityPack" version="1.11.24" targetFramework="xamarinmac20" />
<package id="JsonRpcSharp" version="0.94.0--date20201018-1119.git-05d4006" targetFramework="xamarinmac20" />
<package id="JsonRpcSharp" version="0.98.0--date20230731-1252.git-6788e32" targetFramework="xamarinmac20" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinmac20" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="xamarinmac20" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinmac20" />
Expand All @@ -15,7 +15,7 @@
<package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="xamarinmac20" />
<package id="Nethereum" version="0.95.0--date20210125-0551.git-05a29e9" targetFramework="xamarinmac20" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinmac20" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="xamarinmac20" />
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="xamarinmac20" />
<package id="Portable.BouncyCastle" version="1.8.5.2" targetFramework="xamarinmac20" />
<package id="SharpRaven" version="2.4.0" targetFramework="xamarinmac20" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinmac20" />
Expand Down
12 changes: 6 additions & 6 deletions src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<HintPath>..\..\packages\Common.Logging.Core.3.4.1\lib\netstandard1.0\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto">
<HintPath>..\..\packages\Portable.BouncyCastle.1.8.5.2\lib\netstandard2.0\BouncyCastle.Crypto.dll</HintPath>
Expand Down Expand Up @@ -230,19 +230,19 @@
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.Client">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.Client.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.IpcClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.IpcClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.HttpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.HttpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.TcpClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.TcpClient.dll</HintPath>
</Reference>
<Reference Include="JsonRpcSharp.WebSocketClient">
<HintPath>..\..\packages\JsonRpcSharp.0.94.0--date20201018-1119.git-05d4006\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
<HintPath>..\..\packages\JsonRpcSharp.0.98.0--date20230731-1252.git-6788e32\lib\netstandard2.0\JsonRpcSharp.WebSocketClient.dll</HintPath>
</Reference>
<Reference Include="Nethereum.ABI">
<HintPath>..\..\packages\Nethereum.0.95.0--date20210125-0551.git-05a29e9\lib\netstandard2.0\Nethereum.ABI.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/GWallet.Frontend.XF.iOS/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="FSharp.Core" version="4.7.0" targetFramework="xamarinios10" />
<package id="FSharp.Data" version="3.0.0" targetFramework="xamarinios10" />
<package id="HtmlAgilityPack" version="1.11.24" targetFramework="xamarinios10" />
<package id="JsonRpcSharp" version="0.94.0--date20201018-1119.git-05d4006" targetFramework="xamarinios10" />
<package id="JsonRpcSharp" version="0.98.0--date20230731-1252.git-6788e32" targetFramework="xamarinios10" />
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinios10" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="xamarinios10" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinios10" />
Expand All @@ -15,7 +15,7 @@
<package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="xamarinios10" />
<package id="Nethereum" version="0.95.0--date20210125-0551.git-05a29e9" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="xamarinios10" />
<package id="Portable.BouncyCastle" version="1.8.5.2" targetFramework="xamarinios10" />
<package id="SharpRaven" version="2.4.0" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
Expand Down

0 comments on commit 2af7b5b

Please sign in to comment.