Skip to content

Commit 02564ea

Browse files
knocteknocte
committed
Fix CI
By updating FSharp.Core version, and cherry-picking these commits from upstream: joemphilips@eb6bc28 joemphilips@b894589 joemphilips@762652a CI was failing with: /Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/tests/DotNetLightning.Client.Tests/DotNetLightning.Client.Tests.fsproj : warning NU1605: DotNetLightning.Client.Tests -> FSharp.Core (>= 4.7.0) [/Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/DotNetLightning.sln] /Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/src/DotNetLightning.Server/DotNetLightning.Server.fsproj : warning NU1605: Detected package downgrade: FSharp.Core from 4.7.2 to 4.7.1. Reference the package directly from the project to select a different version. [/Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/DotNetLightning.sln] /Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/src/DotNetLightning.Server/DotNetLightning.Server.fsproj : warning NU1605: DotNetLightning.Server -> DotNetLightning.Infrastructure -> FSharp.Core (>= 4.7.2) [/Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/DotNetLightning.sln] /Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/src/DotNetLightning.Server/DotNetLightning.Server.fsproj : warning NU1605: DotNetLightning.Server -> FSharp.Core (>= 4.7.1) [/Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/DotNetLightning.sln] /Users/runner/work/DotNetLightning.Kiss/DotNetLightning.Kiss/tests/DotNetLightning.Integration.Tests/DotNetLightning.Integration.Tests.csproj : error NU1605: Detected package downgrade: FSharp.Core from 4.7.2 to 4.7.1. Reference the package directly from the project to select a di https://github.com/nblockchain/DotNetLightning.Kiss/runs/1285679289
1 parent 1e5cc39 commit 02564ea

File tree

92 files changed

+3
-4582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+3
-4582
lines changed

‎DotNetLightning.sln‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,20 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EventAggregator", "src\Even
1515
EndProject
1616
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EventAggregator.Tests", "tests\EventAggregator.Tests\EventAggregator.Tests.fsproj", "{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}"
1717
EndProject
18-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Infrastructure", "src\DotNetLightning.Infrastructure\DotNetLightning.Infrastructure.fsproj", "{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}"
19-
EndProject
20-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Server", "src\DotNetLightning.Server\DotNetLightning.Server.fsproj", "{721CE279-93C3-4015-8288-9B6FE847B321}"
21-
EndProject
2218
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.SystemTextJson", "src\FSharp.SystemTextJson\FSharp.SystemTextJson.fsproj", "{2F74B619-3635-4407-88AC-3804A22D9C95}"
2319
EndProject
24-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Infrastructure.Tests", "tests\DotNetLightning.Infrastructure.Tests\DotNetLightning.Infrastructure.Tests.fsproj", "{B69A385C-D742-4432-9D1E-065FD79F2640}"
25-
EndProject
2620
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NSec", "NSec", "{94CC1725-6CBC-4AB1-B496-0152C69C9709}"
2721
EndProject
2822
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSec.Cryptography", "src\NSec\Cryptography\NSec.Cryptography.csproj", "{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}"
2923
EndProject
3024
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSec.Experimental", "src\NSec\Experimental\NSec.Experimental.csproj", "{50FEBC5F-8664-4BF7-8F75-9381B6981BAF}"
3125
EndProject
32-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Client", "src\DotNetLightning.Client\DotNetLightning.Client.fsproj", "{07862556-0436-4B07-A23B-496CAEFEDCE7}"
33-
EndProject
3426
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ResultUtils", "src\ResultUtils\ResultUtils.fsproj", "{21ECBAC8-A75F-4103-81F0-A8E135BE5AC6}"
3527
EndProject
3628
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TaskUtils", "src\TaskUtils\TaskUtils.fsproj", "{C21C0204-736B-4A66-A3E4-608002C91505}"
3729
EndProject
3830
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InternalBech32Encoder", "src\InternalBech32Encoder\InternalBech32Encoder.csproj", "{C7881917-9F0B-485B-9F33-8A58E1084B3F}"
3931
EndProject
40-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Client.Tests", "tests\DotNetLightning.Client.Tests\DotNetLightning.Client.Tests.fsproj", "{3070F200-DDF7-4969-9967-9F33E1729361}"
41-
EndProject
42-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetLightning.Integration.Tests", "tests\DotNetLightning.Integration.Tests\DotNetLightning.Integration.Tests.csproj", "{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}"
43-
EndProject
4432
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Macaroons", "src\Macaroons\Macaroons.csproj", "{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A}"
4533
EndProject
4634
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Macaroons.Tests", "tests\Macaroons.Tests\Macaroons.Tests.csproj", "{C34D4C62-BEBE-4333-8EB8-9CDDEF331E1B}"
@@ -106,30 +94,6 @@ Global
10694
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}.Release|x64.Build.0 = Release|Any CPU
10795
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}.Release|x86.ActiveCfg = Release|Any CPU
10896
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}.Release|x86.Build.0 = Release|Any CPU
109-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
111-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x64.ActiveCfg = Debug|Any CPU
112-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x64.Build.0 = Debug|Any CPU
113-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x86.ActiveCfg = Debug|Any CPU
114-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x86.Build.0 = Debug|Any CPU
115-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
116-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|Any CPU.Build.0 = Release|Any CPU
117-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x64.ActiveCfg = Release|Any CPU
118-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x64.Build.0 = Release|Any CPU
119-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x86.ActiveCfg = Release|Any CPU
120-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x86.Build.0 = Release|Any CPU
121-
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
122-
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|Any CPU.Build.0 = Debug|Any CPU
123-
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x64.ActiveCfg = Debug|Any CPU
124-
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x64.Build.0 = Debug|Any CPU
125-
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x86.ActiveCfg = Debug|Any CPU
126-
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x86.Build.0 = Debug|Any CPU
127-
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|Any CPU.ActiveCfg = Release|Any CPU
128-
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|Any CPU.Build.0 = Release|Any CPU
129-
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x64.ActiveCfg = Release|Any CPU
130-
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x64.Build.0 = Release|Any CPU
131-
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x86.ActiveCfg = Release|Any CPU
132-
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x86.Build.0 = Release|Any CPU
13397
{2F74B619-3635-4407-88AC-3804A22D9C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13498
{2F74B619-3635-4407-88AC-3804A22D9C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
13599
{2F74B619-3635-4407-88AC-3804A22D9C95}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -142,18 +106,6 @@ Global
142106
{2F74B619-3635-4407-88AC-3804A22D9C95}.Release|x64.Build.0 = Release|Any CPU
143107
{2F74B619-3635-4407-88AC-3804A22D9C95}.Release|x86.ActiveCfg = Release|Any CPU
144108
{2F74B619-3635-4407-88AC-3804A22D9C95}.Release|x86.Build.0 = Release|Any CPU
145-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|Any CPU.Build.0 = Debug|Any CPU
147-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x64.ActiveCfg = Debug|Any CPU
148-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x64.Build.0 = Debug|Any CPU
149-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x86.ActiveCfg = Debug|Any CPU
150-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x86.Build.0 = Debug|Any CPU
151-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|Any CPU.ActiveCfg = Release|Any CPU
152-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|Any CPU.Build.0 = Release|Any CPU
153-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x64.ActiveCfg = Release|Any CPU
154-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x64.Build.0 = Release|Any CPU
155-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x86.ActiveCfg = Release|Any CPU
156-
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x86.Build.0 = Release|Any CPU
157109
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158110
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}.Debug|Any CPU.Build.0 = Debug|Any CPU
159111
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -214,42 +166,6 @@ Global
214166
{C7881917-9F0B-485B-9F33-8A58E1084B3F}.Release|x64.Build.0 = Release|Any CPU
215167
{C7881917-9F0B-485B-9F33-8A58E1084B3F}.Release|x86.ActiveCfg = Release|Any CPU
216168
{C7881917-9F0B-485B-9F33-8A58E1084B3F}.Release|x86.Build.0 = Release|Any CPU
217-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
218-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
219-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x64.ActiveCfg = Debug|Any CPU
220-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x64.Build.0 = Debug|Any CPU
221-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x86.ActiveCfg = Debug|Any CPU
222-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x86.Build.0 = Debug|Any CPU
223-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
224-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|Any CPU.Build.0 = Release|Any CPU
225-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x64.ActiveCfg = Release|Any CPU
226-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x64.Build.0 = Release|Any CPU
227-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x86.ActiveCfg = Release|Any CPU
228-
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x86.Build.0 = Release|Any CPU
229-
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
230-
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|Any CPU.Build.0 = Debug|Any CPU
231-
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x64.ActiveCfg = Debug|Any CPU
232-
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x64.Build.0 = Debug|Any CPU
233-
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x86.ActiveCfg = Debug|Any CPU
234-
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x86.Build.0 = Debug|Any CPU
235-
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|Any CPU.ActiveCfg = Release|Any CPU
236-
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|Any CPU.Build.0 = Release|Any CPU
237-
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x64.ActiveCfg = Release|Any CPU
238-
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x64.Build.0 = Release|Any CPU
239-
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x86.ActiveCfg = Release|Any CPU
240-
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x86.Build.0 = Release|Any CPU
241-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
242-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
243-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|x64.ActiveCfg = Debug|Any CPU
244-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|x64.Build.0 = Debug|Any CPU
245-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|x86.ActiveCfg = Debug|Any CPU
246-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|x86.Build.0 = Debug|Any CPU
247-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
248-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Release|Any CPU.Build.0 = Release|Any CPU
249-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Release|x64.ActiveCfg = Release|Any CPU
250-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Release|x64.Build.0 = Release|Any CPU
251-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Release|x86.ActiveCfg = Release|Any CPU
252-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Release|x86.Build.0 = Release|Any CPU
253169
{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
254170
{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
255171
{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -280,19 +196,13 @@ Global
280196
{690894CA-BD95-48D5-8C0A-4D2CC6D0C8B9} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
281197
{3320DB6F-655A-4909-97A5-4706E951048D} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
282198
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
283-
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
284-
{721CE279-93C3-4015-8288-9B6FE847B321} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
285199
{2F74B619-3635-4407-88AC-3804A22D9C95} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
286-
{B69A385C-D742-4432-9D1E-065FD79F2640} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
287200
{94CC1725-6CBC-4AB1-B496-0152C69C9709} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
288201
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965} = {94CC1725-6CBC-4AB1-B496-0152C69C9709}
289202
{50FEBC5F-8664-4BF7-8F75-9381B6981BAF} = {94CC1725-6CBC-4AB1-B496-0152C69C9709}
290203
{21ECBAC8-A75F-4103-81F0-A8E135BE5AC6} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
291204
{C21C0204-736B-4A66-A3E4-608002C91505} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
292205
{C7881917-9F0B-485B-9F33-8A58E1084B3F} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
293-
{07862556-0436-4B07-A23B-496CAEFEDCE7} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
294-
{3070F200-DDF7-4969-9967-9F33E1729361} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
295-
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
296206
{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
297207
{C34D4C62-BEBE-4333-8EB8-9CDDEF331E1B} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
298208
EndGlobalSection

‎src/DotNetLightning.Client/CLightning/Client.fs‎

Lines changed: 0 additions & 130 deletions
This file was deleted.

‎src/DotNetLightning.Client/CLightning/DTO.fs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/DotNetLightning.Client/CLightning/Error.fs‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)