Bump NBitcoin for the library

MetacoSA · Aug 30, 2021 · cfb626d · cfb626d
1 parent a4f195c
commit cfb626d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/QBitNinja.Client/PushNuget.ps1 b/QBitNinja.Client/PushNuget.ps1
@@ -1,5 +1,5 @@
 rm "bin\release\" -Recurse -Force
-dotnet build /p:Configuration=Release
+dotnet build /p:Configuration=Release /p:LIB_ONLY=true
 dotnet pack --no-build --no-restore --configuration Release
 dotnet nuget push "bin\Release\*.nupkg" --source "https://api.nuget.org/v3/index.json"
 $ver = ((ls .\bin\release\*.nupkg -File)[0].Name -replace '([^\.\d]*\.)+(\d+(\.\d+){1,3}).nupkg', '$2')

diff --git a/QBitNinja.Client/QBitNinja.Client.csproj b/QBitNinja.Client/QBitNinja.Client.csproj
@@ -25,8 +25,13 @@
 	<ItemGroup>
 		<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'net472'"></Reference>
 	</ItemGroup>
+  <PropertyGroup>
+    <LIB_ONLY Condition="'$(LIB_ONLY)' == ''">false</LIB_ONLY>
+		<DefineConstants Condition="'$(LIB_ONLY)' == 'true'">$(DefineConstants);LIB_ONLY</DefineConstants>
+  </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="NBitcoin" Version="5.0.27" />
+		<PackageReference Include="NBitcoin" Version="5.0.27"  Condition="'$(LIB_ONLY)' == 'false'" />
+    <PackageReference Include="NBitcoin" Version="6.0.8"  Condition="'$(LIB_ONLY)' == 'true'" />
 		<PackageReference Include="System.Net.Http">
 		  <Version>4.3.3</Version>
 		  <ExcludeAssets Condition=" '$(TargetFramework)' == 'net472' ">All</ExcludeAssets>

diff --git a/QBitNinja/Models/WhatIsItModels.cs b/QBitNinja/Models/WhatIsItModels.cs
@@ -16,6 +16,7 @@ public WhatIsScript()
 		{
 
 		}
+#if !LIB_ONLY
 		public WhatIsScript(Script script, Network network)
 		{
 			Raw = script;
@@ -26,6 +27,7 @@ public WhatIsScript(Script script, Network network)
 			if(address != null)
 				Address = address.ToString();
 		}
+#endif
 
 		public uint160 Hash160
 		{
@@ -64,6 +66,7 @@ public WhatIsPublicKey()
 		{
 
 		}
+#if !LIB_ONLY
 		public WhatIsPublicKey(PubKey pubkey, Network network)
 		{
 			Hex = pubkey.ToHex();
@@ -75,7 +78,7 @@ public WhatIsPublicKey(PubKey pubkey, Network network)
 			ScriptPubKey = new WhatIsScript(pubkey.ScriptPubKey, network);
 			IsCompressed = pubkey.IsCompressed;
 		}
-
+#endif
 		public string Hex
 		{
 			get;
@@ -133,12 +136,13 @@ public WhatIsPrivateKey()
 		{
 
 		}
+#if !LIB_ONLY
 		public WhatIsPrivateKey(BitcoinSecret secret)
 			: base(secret)
 		{
 			PublicKey = new WhatIsPublicKey(secret.PrivateKey.PubKey, secret.Network);
 		}
-
+#endif
 		public WhatIsPublicKey PublicKey
 		{
 			get;
@@ -320,6 +324,7 @@ public WhatIsAddress()
 		{
 
 		}
+#if !LIB_ONLY
 		public WhatIsAddress(BitcoinAddress address)
 			: base(address)
 		{
@@ -330,7 +335,7 @@ public WhatIsAddress(BitcoinAddress address)
 			if(address is IBase58Data)
 				ColoredAddress = address.ToColoredAddress().ToString();
 		}
-
+#endif
 		private string GetHash(BitcoinAddress address)
 		{
 			BitcoinPubKeyAddress pubkey = address as BitcoinPubKeyAddress;
@@ -432,7 +437,7 @@ public Network Network
 			get;
 			set;
 		}
-
+#if !LIB_ONLY
 		public static WhatIsBase58 GetFromBitcoinString(string data)
 		{
 			try
@@ -479,5 +484,6 @@ public static WhatIsBase58 GetFromBitcoinString(string data)
 			catch(FormatException) { }
 			throw new FormatException("Not a base58 or bech32");
 		}
+#endif
 	}
 }