From 7945d128fb3b9d72bff6845b6eef8da0e52f8a1e Mon Sep 17 00:00:00 2001 From: Eric Malamisura Date: Sat, 16 Nov 2019 11:08:00 -0500 Subject: [PATCH 1/9] Update appveyor.yml --- appveyor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0fe4a6ed3..56236d1d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,11 +21,13 @@ build: verbosity: minimal test_script: - cmd: dotnet test -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:ExcludeByFile=\"../stellar-dotnet-sdk/chaos.nacl/**/*.cs\" -p:ExcludeByFile=\"../stellar-dotnet-sdk-xdr/generated/*.cs\" ./stellar-dotnet-sdk-test --test-adapter-path:. --logger:Appveyor +environment: + COVERALLS_REPO_TOKEN: + secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz + after_test: - - ps: | - $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH - Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh - bash codecov.sh -f "./stellar-dotnet-sdk-test/coverage.opencover.xml" -t 3d1827ed-854c-484b-a639-02544eb921b8 + - cmd: packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% + deploy: on: branch: master From 0db13c402a6a723ed2c8686da22ac257a62f9dbc Mon Sep 17 00:00:00 2001 From: Eric Malamisura Date: Sat, 16 Nov 2019 11:11:51 -0500 Subject: [PATCH 2/9] Update stellar-dotnet-sdk-test.csproj --- stellar-dotnet-sdk-test/stellar-dotnet-sdk-test.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stellar-dotnet-sdk-test/stellar-dotnet-sdk-test.csproj b/stellar-dotnet-sdk-test/stellar-dotnet-sdk-test.csproj index c7aec58f1..1cb44f96e 100644 --- a/stellar-dotnet-sdk-test/stellar-dotnet-sdk-test.csproj +++ b/stellar-dotnet-sdk-test/stellar-dotnet-sdk-test.csproj @@ -15,6 +15,7 @@ all runtime; build; native; contentfiles; analyzers + @@ -242,4 +243,4 @@ PreserveNewest - \ No newline at end of file + From 2359c756321820b7bb7b4abc69ee05a60342d14b Mon Sep 17 00:00:00 2001 From: Eric Malamisura Date: Sat, 16 Nov 2019 11:17:00 -0500 Subject: [PATCH 3/9] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 56236d1d6..544f590c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ environment: secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz after_test: - - cmd: packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% + - cmd: stellar-dotnet-sdk-test\packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% deploy: on: From 3edbb9776becf7000c4e7a945a715a2156b86e64 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Nov 2019 11:51:04 -0500 Subject: [PATCH 4/9] appveyor fixes --- .gitignore | 9 +++++---- appveyor.yml | 2 +- nuget.config | 6 ++++++ packages-microsoft-prod.deb | Bin 0 -> 3120 bytes 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 nuget.config create mode 100644 packages-microsoft-prod.deb diff --git a/.gitignore b/.gitignore index 2de4ef46b..1e65569fb 100644 --- a/.gitignore +++ b/.gitignore @@ -32,10 +32,11 @@ msbuild.err msbuild.wrn package/lib/ +packages/ # Visual Studio 2015 -.vs/ -*.DotSettings -.idea/.idea.stellar-dotnetcore-sdk/.idea/workspace.xml -stellar-dotnet-sdk-test/coverage.opencover.xml +.vs/ +*.DotSettings +.idea/.idea.stellar-dotnetcore-sdk/.idea/workspace.xml +stellar-dotnet-sdk-test/coverage.opencover.xml diff --git a/appveyor.yml b/appveyor.yml index 544f590c2..56236d1d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ environment: secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz after_test: - - cmd: stellar-dotnet-sdk-test\packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% + - cmd: packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% deploy: on: diff --git a/nuget.config b/nuget.config new file mode 100644 index 000000000..2c0d0bcff --- /dev/null +++ b/nuget.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages-microsoft-prod.deb b/packages-microsoft-prod.deb new file mode 100644 index 0000000000000000000000000000000000000000..a9114940be156b9c453b205f820596ee1ff271a9 GIT binary patch literal 3120 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 t4wdSlxN4}X;G1{WLV0BZ Date: Sat, 16 Nov 2019 11:54:39 -0500 Subject: [PATCH 5/9] wrong path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 56236d1d6..66b99086a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ environment: secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz after_test: - - cmd: packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% + - cmd: packages\coveralls.io\1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% deploy: on: From 79d8e9a02ecb3f94a6bcc671f3677ccde9e824d8 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Nov 2019 11:59:20 -0500 Subject: [PATCH 6/9] need to exclude other nupkg's now... --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 66b99086a..3743932d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ dotnet_csproj: file_version: '{version}' informational_version: '{version}' artifacts: - - path: '**\*.nupkg' + - path: 'stellar-dotnet-sdk\**\*.nupkg' name: nuget build: project: stellar-dotnet-sdk.sln @@ -22,12 +22,12 @@ build: test_script: - cmd: dotnet test -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:ExcludeByFile=\"../stellar-dotnet-sdk/chaos.nacl/**/*.cs\" -p:ExcludeByFile=\"../stellar-dotnet-sdk-xdr/generated/*.cs\" ./stellar-dotnet-sdk-test --test-adapter-path:. --logger:Appveyor environment: - COVERALLS_REPO_TOKEN: + COVERALLS_REPO_TOKEN: secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz after_test: - cmd: packages\coveralls.io\1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% - + deploy: on: branch: master From 7e364ff6b6feb185ce4d3a676b743a87958b482d Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Nov 2019 12:09:18 -0500 Subject: [PATCH 7/9] environment variable --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3743932d2..a302d6516 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,12 +21,12 @@ build: verbosity: minimal test_script: - cmd: dotnet test -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:ExcludeByFile=\"../stellar-dotnet-sdk/chaos.nacl/**/*.cs\" -p:ExcludeByFile=\"../stellar-dotnet-sdk-xdr/generated/*.cs\" ./stellar-dotnet-sdk-test --test-adapter-path:. --logger:Appveyor -environment: - COVERALLS_REPO_TOKEN: - secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz after_test: - cmd: packages\coveralls.io\1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% + environment: + COVERALLS_REPO_TOKEN: + secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz deploy: on: From 98a0d9fb35cf51651b6f70071d11d767cf3e62af Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Nov 2019 12:10:05 -0500 Subject: [PATCH 8/9] environment variable --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a302d6516..f59bfcfba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,9 +24,9 @@ test_script: after_test: - cmd: packages\coveralls.io\1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% - environment: - COVERALLS_REPO_TOKEN: - secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz +environment: + COVERALLS_REPO_TOKEN: + secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz deploy: on: From fb3a52a359c2da493807fd69cd654c21c55a1ca5 Mon Sep 17 00:00:00 2001 From: Eric Date: Sat, 16 Nov 2019 12:16:20 -0500 Subject: [PATCH 9/9] README --- README.md | 2 +- appveyor.yml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2e50cad26..6c1bfb465 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dotnet-stellar-sdk [![Build status](https://ci.appveyor.com/api/projects/status/n34q6l3wyar2rq5l/branch/master?svg=true)](https://ci.appveyor.com/project/elucidsoft/dotnet-stellar-sdk/branch/master) -[![codecov](https://codecov.io/gh/elucidsoft/dotnet-stellar-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/elucidsoft/dotnet-stellar-sdk) +[![Coverage Status](https://coveralls.io/repos/github/elucidsoft/dotnet-stellar-sdk/badge.svg?branch=coveralls)](https://coveralls.io/github/elucidsoft/dotnet-stellar-sdk?branch=coveralls) [![CodeFactor](https://www.codefactor.io/repository/github/elucidsoft/dotnet-stellar-sdk/badge)](https://www.codefactor.io/repository/github/elucidsoft/dotnet-stellar-sdk) [![NuGet Badge](https://buildstats.info/nuget/stellar-dotnet-sdk)](https://www.nuget.org/packages/stellar-dotnet-sdk) diff --git a/appveyor.yml b/appveyor.yml index f59bfcfba..95f0e8cc2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,15 +3,15 @@ pull_requests: do_not_increment_build_number: true os: Visual Studio 2017 before_build: -- cmd: dotnet restore stellar-dotnet-sdk.sln + - cmd: dotnet restore stellar-dotnet-sdk.sln dotnet_csproj: patch: true file: '**\*.csproj' - version: '{version}' - package_version: '{version}' - assembly_version: '{version}' - file_version: '{version}' - informational_version: '{version}' + version: "{version}" + package_version: "{version}" + assembly_version: "{version}" + file_version: "{version}" + informational_version: "{version}" artifacts: - path: 'stellar-dotnet-sdk\**\*.nupkg' name: nuget @@ -20,18 +20,18 @@ build: parallel: true verbosity: minimal test_script: - - cmd: dotnet test -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:ExcludeByFile=\"../stellar-dotnet-sdk/chaos.nacl/**/*.cs\" -p:ExcludeByFile=\"../stellar-dotnet-sdk-xdr/generated/*.cs\" ./stellar-dotnet-sdk-test --test-adapter-path:. --logger:Appveyor - + - cmd: dotnet test -p:CollectCoverage=true -p:CoverletOutputFormat=opencover -p:ExcludeByFile=\"../stellar-dotnet-sdk/chaos.nacl/**/*.cs\" -p:ExcludeByFile=\"../stellar-dotnet-sdk-xdr/generated/*.cs\" ./stellar-dotnet-sdk-test --test-adapter-path:. --logger:Appveyor after_test: - cmd: packages\coveralls.io\1.4.2\tools\coveralls.net.exe --opencover "./stellar-dotnet-sdk-test/coverage.opencover.xml" -r %COVERALLS_REPO_TOKEN% + environment: COVERALLS_REPO_TOKEN: secure: Oo/jr37r3k/ZwDMKK/varxVllvTUUX8aGd/lpZ0eB0+i4Gxno6WsExeLNYNLD2hz deploy: on: - branch: master - APPVEYOR_REPO_TAG: true + branch: master + APPVEYOR_REPO_TAG: true provider: NuGet api_key: secure: vm+rrsWiV8YUExTehIEf2ACt0R0xDzYJ0OoHvNlu7hGZfvnop/tpbuamDm16uArT