Skip to content

Commit e072d70

Browse files
ysangkokknocte
authored andcommitted
Upgrade to NBitcoin 4.2.8, remove Http workaround
- 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 The new NBitcoin version is the first version that has System.Net.Http removed. See https://github.com/dotnet/corefx/issues/19914#issuecomment-529113925
1 parent 377e972 commit e072d70

File tree

5 files changed

+9
-20
lines changed

5 files changed

+9
-20
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: 3 additions & 5 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>

src/GWallet.Backend/packages.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
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" />
13+
<package id="NBitcoin" version="4.2.8" targetFramework="net461" />
14+
<package id="NBitcoin.Altcoins" version="1.0.3" targetFramework="net452" />
1515
<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" />
@@ -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>

0 commit comments

Comments
 (0)