Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@knocte
knocte committed Oct 21, 2020
1 parent 1e5cc39 commit 135c9bb
Show file tree
Hide file tree
Showing 90 changed files with 3 additions and 4,521 deletions.
75 changes: 0 additions & 75 deletions DotNetLightning.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,20 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EventAggregator", "src\Even
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EventAggregator.Tests", "tests\EventAggregator.Tests\EventAggregator.Tests.fsproj", "{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Infrastructure", "src\DotNetLightning.Infrastructure\DotNetLightning.Infrastructure.fsproj", "{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Server", "src\DotNetLightning.Server\DotNetLightning.Server.fsproj", "{721CE279-93C3-4015-8288-9B6FE847B321}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.SystemTextJson", "src\FSharp.SystemTextJson\FSharp.SystemTextJson.fsproj", "{2F74B619-3635-4407-88AC-3804A22D9C95}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Infrastructure.Tests", "tests\DotNetLightning.Infrastructure.Tests\DotNetLightning.Infrastructure.Tests.fsproj", "{B69A385C-D742-4432-9D1E-065FD79F2640}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NSec", "NSec", "{94CC1725-6CBC-4AB1-B496-0152C69C9709}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSec.Cryptography", "src\NSec\Cryptography\NSec.Cryptography.csproj", "{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSec.Experimental", "src\NSec\Experimental\NSec.Experimental.csproj", "{50FEBC5F-8664-4BF7-8F75-9381B6981BAF}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Client", "src\DotNetLightning.Client\DotNetLightning.Client.fsproj", "{07862556-0436-4B07-A23B-496CAEFEDCE7}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ResultUtils", "src\ResultUtils\ResultUtils.fsproj", "{21ECBAC8-A75F-4103-81F0-A8E135BE5AC6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TaskUtils", "src\TaskUtils\TaskUtils.fsproj", "{C21C0204-736B-4A66-A3E4-608002C91505}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InternalBech32Encoder", "src\InternalBech32Encoder\InternalBech32Encoder.csproj", "{C7881917-9F0B-485B-9F33-8A58E1084B3F}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotNetLightning.Client.Tests", "tests\DotNetLightning.Client.Tests\DotNetLightning.Client.Tests.fsproj", "{3070F200-DDF7-4969-9967-9F33E1729361}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetLightning.Integration.Tests", "tests\DotNetLightning.Integration.Tests\DotNetLightning.Integration.Tests.csproj", "{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Macaroons", "src\Macaroons\Macaroons.csproj", "{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A}"
Expand Down Expand Up @@ -106,30 +96,6 @@ Global
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}.Release|x64.Build.0 = Release|Any CPU
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}.Release|x86.ActiveCfg = Release|Any CPU
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00}.Release|x86.Build.0 = Release|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x64.ActiveCfg = Debug|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x64.Build.0 = Debug|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x86.ActiveCfg = Debug|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Debug|x86.Build.0 = Debug|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|Any CPU.Build.0 = Release|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x64.ActiveCfg = Release|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x64.Build.0 = Release|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x86.ActiveCfg = Release|Any CPU
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA}.Release|x86.Build.0 = Release|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|Any CPU.Build.0 = Debug|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x64.ActiveCfg = Debug|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x64.Build.0 = Debug|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x86.ActiveCfg = Debug|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Debug|x86.Build.0 = Debug|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|Any CPU.ActiveCfg = Release|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|Any CPU.Build.0 = Release|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x64.ActiveCfg = Release|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x64.Build.0 = Release|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x86.ActiveCfg = Release|Any CPU
{721CE279-93C3-4015-8288-9B6FE847B321}.Release|x86.Build.0 = Release|Any CPU
{2F74B619-3635-4407-88AC-3804A22D9C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F74B619-3635-4407-88AC-3804A22D9C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F74B619-3635-4407-88AC-3804A22D9C95}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -142,18 +108,6 @@ Global
{2F74B619-3635-4407-88AC-3804A22D9C95}.Release|x64.Build.0 = Release|Any CPU
{2F74B619-3635-4407-88AC-3804A22D9C95}.Release|x86.ActiveCfg = Release|Any CPU
{2F74B619-3635-4407-88AC-3804A22D9C95}.Release|x86.Build.0 = Release|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x64.ActiveCfg = Debug|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x64.Build.0 = Debug|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x86.ActiveCfg = Debug|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Debug|x86.Build.0 = Debug|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|Any CPU.Build.0 = Release|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x64.ActiveCfg = Release|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x64.Build.0 = Release|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x86.ActiveCfg = Release|Any CPU
{B69A385C-D742-4432-9D1E-065FD79F2640}.Release|x86.Build.0 = Release|Any CPU
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -214,30 +168,6 @@ Global
{C7881917-9F0B-485B-9F33-8A58E1084B3F}.Release|x64.Build.0 = Release|Any CPU
{C7881917-9F0B-485B-9F33-8A58E1084B3F}.Release|x86.ActiveCfg = Release|Any CPU
{C7881917-9F0B-485B-9F33-8A58E1084B3F}.Release|x86.Build.0 = Release|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x64.Build.0 = Debug|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x86.ActiveCfg = Debug|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Debug|x86.Build.0 = Debug|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|Any CPU.Build.0 = Release|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x64.ActiveCfg = Release|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x64.Build.0 = Release|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x86.ActiveCfg = Release|Any CPU
{07862556-0436-4B07-A23B-496CAEFEDCE7}.Release|x86.Build.0 = Release|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x64.ActiveCfg = Debug|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x64.Build.0 = Debug|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x86.ActiveCfg = Debug|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Debug|x86.Build.0 = Debug|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|Any CPU.Build.0 = Release|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x64.ActiveCfg = Release|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x64.Build.0 = Release|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x86.ActiveCfg = Release|Any CPU
{3070F200-DDF7-4969-9967-9F33E1729361}.Release|x86.Build.0 = Release|Any CPU
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -280,18 +210,13 @@ Global
{690894CA-BD95-48D5-8C0A-4D2CC6D0C8B9} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
{3320DB6F-655A-4909-97A5-4706E951048D} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{F5AB8998-BDEF-4BD4-BE09-0D2237659B00} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
{2B5A983E-FC27-4992-9611-CE3C17B9ADCA} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{721CE279-93C3-4015-8288-9B6FE847B321} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{2F74B619-3635-4407-88AC-3804A22D9C95} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{B69A385C-D742-4432-9D1E-065FD79F2640} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
{94CC1725-6CBC-4AB1-B496-0152C69C9709} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{EDBE0B2D-EBAC-4413-9300-E19A4FA87965} = {94CC1725-6CBC-4AB1-B496-0152C69C9709}
{50FEBC5F-8664-4BF7-8F75-9381B6981BAF} = {94CC1725-6CBC-4AB1-B496-0152C69C9709}
{21ECBAC8-A75F-4103-81F0-A8E135BE5AC6} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{C21C0204-736B-4A66-A3E4-608002C91505} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{C7881917-9F0B-485B-9F33-8A58E1084B3F} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{07862556-0436-4B07-A23B-496CAEFEDCE7} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{3070F200-DDF7-4969-9967-9F33E1729361} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
{AA2DA4CA-FE39-431B-84C2-1C99E3B282D8} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
{00F7DD98-B3DB-4361-8F06-6F6F2E29A81A} = {84B95569-6BD8-48B4-A942-CBBC9462B6D4}
{C34D4C62-BEBE-4333-8EB8-9CDDEF331E1B} = {E6F1DC30-D346-4E86-8F58-20CFAAB19448}
Expand Down
130 changes: 0 additions & 130 deletions src/DotNetLightning.Client/CLightning/Client.fs
View file

This file was deleted.

15 changes: 0 additions & 15 deletions src/DotNetLightning.Client/CLightning/DTO.fs
View file

This file was deleted.

72 changes: 0 additions & 72 deletions src/DotNetLightning.Client/CLightning/Error.fs
View file

This file was deleted.

Loading

0 comments on commit 135c9bb

Please sign in to comment.