From c2cd006e12f85fc43701cedbe32766a9524fc31c Mon Sep 17 00:00:00 2001
From: "joe.miyamoto" <joe.miyamoto@bitcoinbank.co.jp>
Date: Wed, 10 Jun 2020 13:05:16 +0900
Subject: [PATCH 1/2] Specify PrivateAssets="all" to Macaroon.

* It seems that when dependendent project tries to restore
  DNL, program tries to search a nuget for package Macaroons.
  Which does not exist for netcoreapp, so it fails to restore.
  By including everything into DNL by specifying `PrivateAssets="all"`,
  hopefully it will succeed.
---
 src/DotNetLightning.Core/DotNetLightning.Core.fsproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DotNetLightning.Core/DotNetLightning.Core.fsproj b/src/DotNetLightning.Core/DotNetLightning.Core.fsproj
index a4b75c443..cc23af415 100644
--- a/src/DotNetLightning.Core/DotNetLightning.Core.fsproj
+++ b/src/DotNetLightning.Core/DotNetLightning.Core.fsproj
@@ -22,7 +22,7 @@
     <ProjectReference Condition="'$(BouncyCastle)'!='true'" Include="..\NSec\Experimental\NSec.Experimental.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\ResultUtils\ResultUtils.fsproj" PrivateAssets="all" />
     <ProjectReference Include="..\InternalBech32Encoder\InternalBech32Encoder.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Macaroons\Macaroons.csproj" />
+    <ProjectReference Include="..\Macaroons\Macaroons.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

From c63b16879302b798c2a245eb3ab7a026f22d26a1 Mon Sep 17 00:00:00 2001
From: "joe.miyamoto" <joe.miyamoto@bitcoinbank.co.jp>
Date: Wed, 10 Jun 2020 13:21:30 +0900
Subject: [PATCH 2/2] Add reference from Core tests to macaroon.

* Don't know why, but compiler complains that
  tests can not access Macaroons in BouncyCastleBuild
  when I specify PrivateAssets="all" for DNL.Core to
  Macaroons ProjectReference. this fixes test.
---
 .../DotNetLightning.Core.Tests/DotNetLightning.Core.Tests.fsproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/DotNetLightning.Core.Tests/DotNetLightning.Core.Tests.fsproj b/tests/DotNetLightning.Core.Tests/DotNetLightning.Core.Tests.fsproj
index 221c117e2..b39faf0a3 100644
--- a/tests/DotNetLightning.Core.Tests/DotNetLightning.Core.Tests.fsproj
+++ b/tests/DotNetLightning.Core.Tests/DotNetLightning.Core.Tests.fsproj
@@ -46,5 +46,6 @@
     <ProjectReference Condition="'$(BouncyCastle)'!='true'" Include="..\..\src\Secp256k1.Net\Secp256k1.Net.csproj" />
     <ProjectReference Condition="'$(BouncyCastle)'!='true'" Include="..\..\src\NSec\Experimental\NSec.Experimental.csproj" />
     <ProjectReference Include="..\..\src\ResultUtils\ResultUtils.fsproj" />
+    <ProjectReference Include="..\..\src\Macaroons\Macaroons.csproj" />
   </ItemGroup>
 </Project>