Skip to content

Commit

Permalink
Merge PR #3 from nblockchain/wip/upgradeJsonRpcSharp
Browse files Browse the repository at this point in the history
Upgrade JsonRpcSharp to 0.99.x and Newtonsoft.Json to latest.
  • Loading branch information
knocte committed Mar 3, 2024
2 parents abe1e28 + dd042ba commit f0bc8be
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Nethereum.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="Portable.BouncyCastle" version="1.8.5.2" exclude="Build,Analyzers" />
<dependency id="JsonRpcSharp" version="0.94.0--date20201018-1119.git-05d4006" exclude="Build,Analyzers" />
<dependency id="JsonRpcSharp" version="0.99.0--date20240303-0338.git-d673848" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions buildConf/Frameworks.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup Condition=" '$(MSBuildProjectName)' != 'Nethereum.HdWallet'">
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3,12)" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(MSBuildProjectName)' == 'Nethereum.HdWallet'">
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Common.Logging" Version="3.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Nethereum.ABI" Version="2.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/Nethereum.Quorum.Tests/Nethereum.Quorum.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/Nethereum.RPC.UnitTests/Nethereum.RPC.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/Nethereum.RPC/Nethereum.RPC.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<None Include="..\..\NethereumKey.snk" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006">
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848">
</PackageReference>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3,12)" />
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.8" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3,12)" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Ledger.Net" Version="2.0.0" />
<PackageReference Include="Common.Logging" Version="3.4.1" />
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<ItemGroup>
<PackageReference Include="Trezor.Net" Version="2.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3,12)" />
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/Nethereum.Web3/Nethereum.Web3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<None Include="..\..\NethereumKey.snk" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006">
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848">
</PackageReference>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ProjectReference Include="..\Nethereum.Web3\Nethereum.Web3.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JsonRpcSharp" Version="0.94.0--date20201018-1119.git-05d4006" />
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3,12)" />
<PackageReference Include="JsonRpcSharp" Version="0.99.0--date20240303-0338.git-d673848" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="xunit" Version="2.3.1" />
</ItemGroup>
</Project>

0 comments on commit f0bc8be

Please sign in to comment.