Skip to content

Commit 2e07dc2

Browse files
ysangkokknocte
ysangkok
authored and
knocte
committed
Remove Http workaround (&upgrade NBitcoin&JsonRpcSharp&Nethereum)
- Upgrade NBitcoin&Nethereum&JsonRpcSharp to versions that don't depend on System.Net.Http - Update NBitcoin.Altcoins too (released with NBitcoin) - Remove Version attribute from PackageReferences of System.Net.Http - Remove package.config references of System.Net.Http - Remove binding redirect of System.Net.Http See https://github.com/dotnet/corefx/issues/19914#issuecomment-529113925
1 parent 0eb470b commit 2e07dc2

File tree

6 files changed

+27
-41
lines changed

6 files changed

+27
-41
lines changed

‎src/GWallet.Backend.Tests/GWallet.Backend.Tests.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@
114114
<HintPath>..\..\packages\FSharp.Core.4.7.0\lib\net45\FSharp.Core.dll</HintPath>
115115
</Reference>
116116
<Reference Include="NBitcoin.Altcoins">
117-
<HintPath>..\..\packages\NBitcoin.Altcoins.1.0.1.35\lib\net452\NBitcoin.Altcoins.dll</HintPath>
117+
<HintPath>..\..\packages\NBitcoin.Altcoins.1.0.3\lib\net452\NBitcoin.Altcoins.dll</HintPath>
118118
</Reference>
119119
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
120120
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
121121
</Reference>
122122
<Reference Include="NBitcoin">
123-
<HintPath>..\..\packages\NBitcoin.4.1.1.80\lib\net452\NBitcoin.dll</HintPath>
123+
<HintPath>..\..\packages\NBitcoin.4.2.8\lib\net461\NBitcoin.dll</HintPath>
124124
</Reference>
125125
</ItemGroup>
126126
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/GWallet.Backend.Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<package id="BouncyCastle" version="1.8.2" targetFramework="net46" />
44
<package id="FSharp.Core" version="4.7.0" targetFramework="net461" />
55
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net46" />
6-
<package id="NBitcoin" version="4.1.1.80" targetFramework="net46" />
7-
<package id="NBitcoin.Altcoins" version="1.0.1.35" targetFramework="net46" />
6+
<package id="NBitcoin" version="4.2.8" targetFramework="net461" />
7+
<package id="NBitcoin.Altcoins" version="1.0.3" targetFramework="net452" />
88
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
99
<package id="NUnit" version="2.6.4" targetFramework="net46" />
1010
<package id="NUnitTestAdapter" version="2.1.1" targetFramework="net46" />

‎src/GWallet.Backend/GWallet.Backend.fsproj

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,12 @@
140140
<Reference Include="System.Security.Cryptography.X509Certificates">
141141
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
142142
</Reference>
143-
<Reference Include="System.Net.Http">
144-
<HintPath>..\..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
145-
</Reference>
143+
<Reference Include="System.Net.Http" />
146144
<Reference Include="NBitcoin.Altcoins">
147-
<HintPath>..\..\packages\NBitcoin.Altcoins.1.0.1.35\lib\net452\NBitcoin.Altcoins.dll</HintPath>
145+
<HintPath>..\..\packages\NBitcoin.Altcoins.1.0.3\lib\net452\NBitcoin.Altcoins.dll</HintPath>
148146
</Reference>
149147
<Reference Include="NBitcoin">
150-
<HintPath>..\..\packages\NBitcoin.4.1.1.80\lib\net452\NBitcoin.dll</HintPath>
148+
<HintPath>..\..\packages\NBitcoin.4.2.8\lib\net461\NBitcoin.dll</HintPath>
151149
</Reference>
152150
<Reference Include="System.Threading.Tasks.Extensions">
153151
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -202,7 +200,7 @@
202200
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
203201
</Reference>
204202
<Reference Include="JsonRpcSharp.TcpClient">
205-
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191207-1103.git-7d79f5e\lib\net46\JsonRpcSharp.TcpClient.dll</HintPath>
203+
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191211-1221.git-469146b\lib\net46\JsonRpcSharp.TcpClient.dll</HintPath>
206204
</Reference>
207205
<Reference Include="System.IO.Pipes">
208206
<HintPath>..\..\packages\System.IO.Pipes.4.3.0\lib\net46\System.IO.Pipes.dll</HintPath>
@@ -214,49 +212,49 @@
214212
<HintPath>..\..\packages\System.Net.WebSockets.Client.4.3.2\lib\net46\System.Net.WebSockets.Client.dll</HintPath>
215213
</Reference>
216214
<Reference Include="JsonRpcSharp.Client">
217-
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191207-1103.git-7d79f5e\lib\net46\JsonRpcSharp.Client.dll</HintPath>
215+
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191211-1221.git-469146b\lib\net46\JsonRpcSharp.Client.dll</HintPath>
218216
</Reference>
219217
<Reference Include="JsonRpcSharp.IpcClient">
220-
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191207-1103.git-7d79f5e\lib\net46\JsonRpcSharp.IpcClient.dll</HintPath>
218+
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191211-1221.git-469146b\lib\net46\JsonRpcSharp.IpcClient.dll</HintPath>
221219
</Reference>
222220
<Reference Include="JsonRpcSharp.RpcClient">
223-
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191207-1103.git-7d79f5e\lib\net46\JsonRpcSharp.RpcClient.dll</HintPath>
221+
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191211-1221.git-469146b\lib\net46\JsonRpcSharp.RpcClient.dll</HintPath>
224222
</Reference>
225223
<Reference Include="JsonRpcSharp.WebSocketClient">
226-
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191207-1103.git-7d79f5e\lib\net46\JsonRpcSharp.WebSocketClient.dll</HintPath>
224+
<HintPath>..\..\packages\JsonRpcSharp.0.10.0-date20191211-1221.git-469146b\lib\net46\JsonRpcSharp.WebSocketClient.dll</HintPath>
227225
</Reference>
228226
<Reference Include="Nethereum.ABI">
229-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.ABI.dll</HintPath>
227+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.ABI.dll</HintPath>
230228
</Reference>
231229
<Reference Include="Nethereum.Accounts">
232-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.Accounts.dll</HintPath>
230+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.Accounts.dll</HintPath>
233231
</Reference>
234232
<Reference Include="Nethereum.Contracts">
235-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.Contracts.dll</HintPath>
233+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.Contracts.dll</HintPath>
236234
</Reference>
237235
<Reference Include="Nethereum.Hex">
238-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.Hex.dll</HintPath>
236+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.Hex.dll</HintPath>
239237
</Reference>
240238
<Reference Include="Nethereum.KeyStore">
241-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.KeyStore.dll</HintPath>
239+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.KeyStore.dll</HintPath>
242240
</Reference>
243241
<Reference Include="Nethereum.RLP">
244-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.RLP.dll</HintPath>
242+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.RLP.dll</HintPath>
245243
</Reference>
246244
<Reference Include="Nethereum.RPC">
247-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.RPC.dll</HintPath>
245+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.RPC.dll</HintPath>
248246
</Reference>
249247
<Reference Include="Nethereum.Signer">
250-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.Signer.dll</HintPath>
248+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.Signer.dll</HintPath>
251249
</Reference>
252250
<Reference Include="Nethereum.StandardTokenEIP20">
253-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.StandardTokenEIP20.dll</HintPath>
251+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.StandardTokenEIP20.dll</HintPath>
254252
</Reference>
255253
<Reference Include="Nethereum.Util">
256-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.Util.dll</HintPath>
254+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.Util.dll</HintPath>
257255
</Reference>
258256
<Reference Include="Nethereum.Web3">
259-
<HintPath>..\..\packages\Nethereum.0.10.0-date20191207-1125.git-9b84302\lib\net46\Nethereum.Web3.dll</HintPath>
257+
<HintPath>..\..\packages\Nethereum.0.10.0-date20191211-1241.git-be6d117\lib\net46\Nethereum.Web3.dll</HintPath>
260258
</Reference>
261259
<Reference Include="HtmlAgilityPack">
262260
<HintPath>..\..\packages\HtmlAgilityPack.1.11.9\lib\Net45\HtmlAgilityPack.dll</HintPath>

‎src/GWallet.Backend/packages.config

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<package id="FSharp.Core" version="4.7.0" targetFramework="net461" />
66
<package id="FSharp.Data" version="3.0.0" targetFramework="net46" />
77
<package id="HtmlAgilityPack" version="1.11.9" targetFramework="net46" />
8-
<package id="JsonRpcSharp" version="0.10.0-date20191207-1103.git-7d79f5e" targetFramework="net461" />
8+
<package id="JsonRpcSharp" version="0.10.0-date20191211-1221.git-469146b" targetFramework="net461" />
99
<package id="Microsoft.CSharp" version="4.0.1" targetFramework="net46" />
1010
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net46" />
1111
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net46" />
1212
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
13-
<package id="NBitcoin" version="4.1.1.80" targetFramework="net46" />
14-
<package id="NBitcoin.Altcoins" version="1.0.1.35" targetFramework="net46" />
15-
<package id="Nethereum" version="0.10.0-date20191207-1125.git-9b84302" targetFramework="net461" />
13+
<package id="NBitcoin" version="4.2.8" targetFramework="net461" />
14+
<package id="NBitcoin.Altcoins" version="1.0.3" targetFramework="net452" />
15+
<package id="Nethereum" version="0.10.0-date20191211-1241.git-be6d117" targetFramework="net461" />
1616
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
1717
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
1818
<package id="SharpRaven" version="2.4.0" targetFramework="net46" />
@@ -36,7 +36,6 @@
3636
<package id="System.Linq" version="4.3.0" targetFramework="net46" />
3737
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
3838
<package id="System.Memory" version="4.5.1" targetFramework="net46" />
39-
<package id="System.Net.Http" version="4.3.3" targetFramework="net46" />
4039
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net46" />
4140
<package id="System.Net.Requests" version="4.3.0" targetFramework="net46" />
4241
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net46" />

‎src/GWallet.Frontend.Console/App.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
1111
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.3.0"/>
1212
</dependentAssembly>
13-
14-
<!-- workaround to issue https://github.com/dotnet/corefx/issues/19914 ,
15-
along with the removal of System.Net.Http.dll in an AfterBuild step -->
16-
<dependentAssembly>
17-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-4.3.3.0" newVersion="4.0.0.0" />
19-
</dependentAssembly>
20-
2113
</assemblyBinding>
2214
</runtime>
2315
<startup>

‎src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@
5454
<Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
5555
</Target>
5656

57-
<!-- workaround to issue https://github.com/dotnet/corefx/issues/19914 ,
58-
along with the binding redirect in the App.config file -->
5957
<Target Name="AfterBuild">
60-
<Delete Files="bin\$(Configuration)\System.Net.Http.dll" />
6158
</Target>
6259

6360
<ItemGroup>

0 commit comments

Comments
 (0)