From cf8281650f9208d0175c84d0da5df5574f47981c Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Sun, 3 Mar 2024 18:04:21 +0100 Subject: [PATCH 1/2] Upgrade JsonRpcSharp to 0.99.x Inspired by: https://github.com/nblockchain/JsonRpcSharp/commit/d6738480b27802efffeddcaa44b4e6a1e289124a --- .github/workflows/CI.yml | 2 +- Nethereum.nuspec | 2 +- .../Nethereum.Accounts.IntegrationTests.csproj | 2 +- .../Nethereum.Contracts.UnitTests.csproj | 2 +- .../Nethereum.ENS.IntegrationTests.csproj | 2 +- .../Nethereum.Geth.IntegrationTests.csproj | 2 +- .../Nethereum.Parity.IntegrationTests.csproj | 2 +- src/Nethereum.Quorum.Tests/Nethereum.Quorum.Tests.csproj | 2 +- .../Nethereum.RPC.IntegrationTests.csproj | 2 +- src/Nethereum.RPC.UnitTests/Nethereum.RPC.UnitTests.csproj | 2 +- src/Nethereum.RPC/Nethereum.RPC.csproj | 2 +- .../Nethereum.Signer.AzureKeyVault.Console.csproj | 2 +- .../Nethereum.Signer.Ledger.IntegrationTests.csproj | 2 +- .../Nethereum.Signer.Trezor.Console.csproj | 2 +- .../Nethereum.Web3.IntegrationTests.csproj | 2 +- src/Nethereum.Web3/Nethereum.Web3.csproj | 2 +- .../Nethereum.XUnitEthereumClients.csproj | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a92adac28..1a11b2cd4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -13,7 +13,7 @@ on: jobs: build_and_deploy: env: - BASE_VERSION: 0.95.0 + BASE_VERSION: 0.99.0 runs-on: windows-latest steps: - uses: actions/checkout@v1 diff --git a/Nethereum.nuspec b/Nethereum.nuspec index b9582ebcb..58d5dea98 100644 --- a/Nethereum.nuspec +++ b/Nethereum.nuspec @@ -24,7 +24,7 @@ - + diff --git a/src/Nethereum.Accounts.IntegrationTests/Nethereum.Accounts.IntegrationTests.csproj b/src/Nethereum.Accounts.IntegrationTests/Nethereum.Accounts.IntegrationTests.csproj index adc0d1ddf..e8b22333e 100644 --- a/src/Nethereum.Accounts.IntegrationTests/Nethereum.Accounts.IntegrationTests.csproj +++ b/src/Nethereum.Accounts.IntegrationTests/Nethereum.Accounts.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Nethereum.Contracts.UnitTests/Nethereum.Contracts.UnitTests.csproj b/src/Nethereum.Contracts.UnitTests/Nethereum.Contracts.UnitTests.csproj index 932361d99..e434785bd 100644 --- a/src/Nethereum.Contracts.UnitTests/Nethereum.Contracts.UnitTests.csproj +++ b/src/Nethereum.Contracts.UnitTests/Nethereum.Contracts.UnitTests.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Nethereum.ENS.IntegrationTests/Nethereum.ENS.IntegrationTests.csproj b/src/Nethereum.ENS.IntegrationTests/Nethereum.ENS.IntegrationTests.csproj index ea138cb6d..b352dd8f6 100644 --- a/src/Nethereum.ENS.IntegrationTests/Nethereum.ENS.IntegrationTests.csproj +++ b/src/Nethereum.ENS.IntegrationTests/Nethereum.ENS.IntegrationTests.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Nethereum.Geth.IntegrationTests/Nethereum.Geth.IntegrationTests.csproj b/src/Nethereum.Geth.IntegrationTests/Nethereum.Geth.IntegrationTests.csproj index d1fbc13d6..ed12aa236 100644 --- a/src/Nethereum.Geth.IntegrationTests/Nethereum.Geth.IntegrationTests.csproj +++ b/src/Nethereum.Geth.IntegrationTests/Nethereum.Geth.IntegrationTests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Nethereum.Parity.IntegrationTests/Nethereum.Parity.IntegrationTests.csproj b/src/Nethereum.Parity.IntegrationTests/Nethereum.Parity.IntegrationTests.csproj index 160d633da..b37a6b27b 100644 --- a/src/Nethereum.Parity.IntegrationTests/Nethereum.Parity.IntegrationTests.csproj +++ b/src/Nethereum.Parity.IntegrationTests/Nethereum.Parity.IntegrationTests.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Nethereum.Quorum.Tests/Nethereum.Quorum.Tests.csproj b/src/Nethereum.Quorum.Tests/Nethereum.Quorum.Tests.csproj index 339436f65..bbb3c6dd5 100644 --- a/src/Nethereum.Quorum.Tests/Nethereum.Quorum.Tests.csproj +++ b/src/Nethereum.Quorum.Tests/Nethereum.Quorum.Tests.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Nethereum.RPC.IntegrationTests/Nethereum.RPC.IntegrationTests.csproj b/src/Nethereum.RPC.IntegrationTests/Nethereum.RPC.IntegrationTests.csproj index c2780876e..a008b505e 100644 --- a/src/Nethereum.RPC.IntegrationTests/Nethereum.RPC.IntegrationTests.csproj +++ b/src/Nethereum.RPC.IntegrationTests/Nethereum.RPC.IntegrationTests.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Nethereum.RPC.UnitTests/Nethereum.RPC.UnitTests.csproj b/src/Nethereum.RPC.UnitTests/Nethereum.RPC.UnitTests.csproj index 1c9443ee2..bd3241413 100644 --- a/src/Nethereum.RPC.UnitTests/Nethereum.RPC.UnitTests.csproj +++ b/src/Nethereum.RPC.UnitTests/Nethereum.RPC.UnitTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Nethereum.RPC/Nethereum.RPC.csproj b/src/Nethereum.RPC/Nethereum.RPC.csproj index 9e97c93a2..e22dcbeef 100644 --- a/src/Nethereum.RPC/Nethereum.RPC.csproj +++ b/src/Nethereum.RPC/Nethereum.RPC.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj b/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj index 4c0a1ae63..c9f408a2d 100644 --- a/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj +++ b/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj b/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj index fb7669f55..89fe95270 100644 --- a/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj +++ b/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj b/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj index 255a9f4ae..09fceaf63 100644 --- a/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj +++ b/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Nethereum.Web3.IntegrationTests/Nethereum.Web3.IntegrationTests.csproj b/src/Nethereum.Web3.IntegrationTests/Nethereum.Web3.IntegrationTests.csproj index 769976884..562b50aa2 100644 --- a/src/Nethereum.Web3.IntegrationTests/Nethereum.Web3.IntegrationTests.csproj +++ b/src/Nethereum.Web3.IntegrationTests/Nethereum.Web3.IntegrationTests.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Nethereum.Web3/Nethereum.Web3.csproj b/src/Nethereum.Web3/Nethereum.Web3.csproj index 45b5edf45..97baf59f6 100644 --- a/src/Nethereum.Web3/Nethereum.Web3.csproj +++ b/src/Nethereum.Web3/Nethereum.Web3.csproj @@ -45,7 +45,7 @@ - + diff --git a/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj b/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj index 9169c8ea2..9fdae7544 100644 --- a/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj +++ b/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj @@ -9,7 +9,7 @@ - + From dd042ba70434117cebfdd83965e777a06974108d Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Sun, 3 Mar 2024 18:20:27 +0100 Subject: [PATCH 2/2] Upgrade Newtonsoft.Json to fix build Somehow the update to JsonRpcSharp caused cascading updates and build was failing with errors like: ``` CSC : error CS1705: Assembly 'JsonRpcSharp.HttpClient' with identity 'JsonRpcSharp.HttpClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d51963060d6195e8' uses 'Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed' which has a higher version than referenced assembly 'Newtonsoft.Json' with identity 'Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed' [D:\a\Nethereum\Nethereum\src\Nethereum.Signer.AzureKeyVault.Console\Nethereum.Signer.AzureKeyVault.Console.csproj] ``` --- buildConf/Frameworks.props | 4 ++-- src/Nethereum.Generators.Net/Nethereum.Generators.Net.csproj | 2 +- .../Nethereum.Signer.AzureKeyVault.Console.csproj | 2 +- .../Nethereum.Signer.Ledger.IntegrationTests.csproj | 2 +- .../Nethereum.Signer.Trezor.Console.csproj | 2 +- .../Nethereum.XUnitEthereumClients.csproj | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildConf/Frameworks.props b/buildConf/Frameworks.props index 7cfd7f77d..4ccca4532 100644 --- a/buildConf/Frameworks.props +++ b/buildConf/Frameworks.props @@ -8,11 +8,11 @@ - + - + diff --git a/src/Nethereum.Generators.Net/Nethereum.Generators.Net.csproj b/src/Nethereum.Generators.Net/Nethereum.Generators.Net.csproj index d5527bc7f..3c9dc18c3 100644 --- a/src/Nethereum.Generators.Net/Nethereum.Generators.Net.csproj +++ b/src/Nethereum.Generators.Net/Nethereum.Generators.Net.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj b/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj index c9f408a2d..db08c3d34 100644 --- a/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj +++ b/src/Nethereum.Signer.AzureKeyVault.Console/Nethereum.Signer.AzureKeyVault.Console.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj b/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj index 89fe95270..90836c0dc 100644 --- a/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj +++ b/src/Nethereum.Signer.Ledger.IntegrationTests/Nethereum.Signer.Ledger.IntegrationTests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj b/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj index 09fceaf63..747f79a8f 100644 --- a/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj +++ b/src/Nethereum.Signer.Trezor.Console/Nethereum.Signer.Trezor.Console.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj b/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj index 9fdae7544..53798b16e 100644 --- a/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj +++ b/src/Nethereum.XUnitEthereumClients/Nethereum.XUnitEthereumClients.csproj @@ -10,7 +10,7 @@ - +