From 8e375d76ab6e2cb456e489e38577728da9a94415 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Wed, 21 Aug 2019 17:35:30 +0200 Subject: [PATCH 01/11] Updating to use .net core 3 --- .travis.yml | 29 +++++++++++++++---- MessageBird/MessageBird.csproj | 15 ++++++---- .../MessageBirdUnitTests.csproj | 10 +++++-- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c9d031..d7bc1d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,27 @@ language: csharp solution: csharp-rest-client.sln mono: none dotnet: 2.1.300 -script: - - cd Tests/UnitTests/MessageBirdUnitTests - - dotnet restore - - dotnet test - +env: + - VERSION=1.6.1.$TRAVIS_BUILD_NUMBER +stages: + - test + - name: deploy + if: branch = master +jobs: + include: + - stage: test + script: + - cd Tests/UnitTests/MessageBirdUnitTests + - dotnet restore + - dotnet test + - stage: deploy + script: + - cd MessageBird + - dotnet restore + - dotnet build + - dotnet pack -p:PackageID=MessageBirdStaging -c Release -p:PackageVersion=$VERSION + - dotnet nuget push MessageBirdStaging.{VERSION}.nupkg -k $STAGING_KEY -s https://apiint.nugettest.org/v3/index.json + - + - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION + - dotnet nuget push MessageBird.{VERSION}.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json + \ No newline at end of file diff --git a/MessageBird/MessageBird.csproj b/MessageBird/MessageBird.csproj index bf632ba..ca97f1a 100644 --- a/MessageBird/MessageBird.csproj +++ b/MessageBird/MessageBird.csproj @@ -1,6 +1,6 @@  - net40;netstandard2.0 + netcoreapp3.0 MessageBird MessageBird MessageBird @@ -10,13 +10,16 @@ 1.6.0.0 1.6.0.0 4 + netcoreapp3.0 - - - - + + 8.0 + + + 8.0 + - \ No newline at end of file + diff --git a/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj b/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj index a919ab2..f375680 100644 --- a/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj +++ b/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj @@ -1,9 +1,15 @@  - netcoreapp2.0 false + netcoreapp3.0 + + 8.0 + + + 8.0 + @@ -23,4 +29,4 @@ PreserveNewest - \ No newline at end of file + From a9096c16596dfcfd84f9dbe909844d2c855aedf2 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Wed, 21 Aug 2019 17:44:10 +0200 Subject: [PATCH 02/11] Using .net core 3 --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7bc1d3..86728fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: csharp solution: csharp-rest-client.sln mono: none -dotnet: 2.1.300 +dotnet: 3.0 env: - VERSION=1.6.1.$TRAVIS_BUILD_NUMBER stages: @@ -12,6 +12,7 @@ jobs: include: - stage: test script: + - echo $VERSION - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test @@ -22,7 +23,4 @@ jobs: - dotnet build - dotnet pack -p:PackageID=MessageBirdStaging -c Release -p:PackageVersion=$VERSION - dotnet nuget push MessageBirdStaging.{VERSION}.nupkg -k $STAGING_KEY -s https://apiint.nugettest.org/v3/index.json - - - - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - - dotnet nuget push MessageBird.{VERSION}.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json \ No newline at end of file From 787a8b51afe974a36c5da9bcb8a59dd459ed6ef8 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Thu, 22 Aug 2019 10:58:20 +0200 Subject: [PATCH 03/11] Using .net core 2.2 --- .travis.yml | 8 +++++++- MessageBird/MessageBird.csproj | 7 +++---- .../MessageBirdUnitTests/MessageBirdUnitTests.csproj | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86728fd..2b4b3d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: csharp solution: csharp-rest-client.sln mono: none -dotnet: 3.0 +sudo: required +dist: xenial +dotnet: 2.2 env: - VERSION=1.6.1.$TRAVIS_BUILD_NUMBER stages: @@ -16,6 +18,10 @@ jobs: - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test + - cd ../../../MessageBird + - dotnet restore + - dotnet build + - dotnet pack -p:PackageID=MessageBirdStaging -c Release -p:PackageVersion=$VERSION - stage: deploy script: - cd MessageBird diff --git a/MessageBird/MessageBird.csproj b/MessageBird/MessageBird.csproj index ca97f1a..4744bd5 100644 --- a/MessageBird/MessageBird.csproj +++ b/MessageBird/MessageBird.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 MessageBird MessageBird MessageBird @@ -10,14 +10,13 @@ 1.6.0.0 1.6.0.0 4 - netcoreapp3.0 - 8.0 + default - 8.0 + default diff --git a/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj b/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj index f375680..b973b79 100644 --- a/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj +++ b/Tests/UnitTests/MessageBirdUnitTests/MessageBirdUnitTests.csproj @@ -1,14 +1,14 @@  false - netcoreapp3.0 + netcoreapp2.2 - 8.0 + default - 8.0 + default From 909163b5654cc5e84ea017df1380d51fe3624584 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Thu, 22 Aug 2019 15:10:49 +0200 Subject: [PATCH 04/11] Testing package exist before packaging --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b4b3d7..f448925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required dist: xenial dotnet: 2.2 env: - - VERSION=1.6.1.$TRAVIS_BUILD_NUMBER + - VERSION=1.6.1 stages: - test - name: deploy @@ -18,12 +18,15 @@ jobs: - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test + - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." + - echo "CONTINUING" - cd ../../../MessageBird - dotnet restore - dotnet build - dotnet pack -p:PackageID=MessageBirdStaging -c Release -p:PackageVersion=$VERSION - stage: deploy script: + - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." - cd MessageBird - dotnet restore - dotnet build From ba9a4f1165b9c02195ef8bfbe915095e8642fb90 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Thu, 22 Aug 2019 15:18:13 +0200 Subject: [PATCH 05/11] Testing with non existing version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f448925..9885d50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required dist: xenial dotnet: 2.2 env: - - VERSION=1.6.1 + - VERSION=1.6.2 stages: - test - name: deploy From 5ab85b679cf2d3e3b014ca477a5d0e8d988f395e Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Thu, 22 Aug 2019 16:38:04 +0200 Subject: [PATCH 06/11] Trying tagging --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9885d50..182c0ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ jobs: - stage: test script: - echo $VERSION + - git config --list + - git tag - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test @@ -23,13 +25,13 @@ jobs: - cd ../../../MessageBird - dotnet restore - dotnet build - - dotnet pack -p:PackageID=MessageBirdStaging -c Release -p:PackageVersion=$VERSION + - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - stage: deploy script: - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." - cd MessageBird - dotnet restore - dotnet build - - dotnet pack -p:PackageID=MessageBirdStaging -c Release -p:PackageVersion=$VERSION - - dotnet nuget push MessageBirdStaging.{VERSION}.nupkg -k $STAGING_KEY -s https://apiint.nugettest.org/v3/index.json + - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION + - dotnet nuget push bin/Release/MessageBird.{VERSION}.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json \ No newline at end of file From 0b49463a1648badd9697f8577a71d8f15334fc47 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Thu, 22 Aug 2019 17:14:50 +0200 Subject: [PATCH 07/11] Fixing deploy for only merge to master --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 182c0ea..0c20151 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,13 @@ env: stages: - test - name: deploy - if: branch = master + if: (branch = master) AND (NOT (type IN (push, pull_request))) jobs: include: - stage: test script: - echo $VERSION + - echo "$TRAVIS_BRANCH" - git config --list - git tag - cd Tests/UnitTests/MessageBirdUnitTests @@ -27,11 +28,12 @@ jobs: - dotnet build - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - stage: deploy + if: branch = master script: - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." - cd MessageBird - dotnet restore - dotnet build - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - - dotnet nuget push bin/Release/MessageBird.{VERSION}.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json + - dotnet nuget push bin/Release/MessageBird.$VERSION.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json \ No newline at end of file From 09df2324fb4e75645643f7829fd4728870af0efc Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Thu, 22 Aug 2019 17:21:53 +0200 Subject: [PATCH 08/11] Test tag --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c20151..d810bf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ jobs: - echo $VERSION - echo "$TRAVIS_BRANCH" - git config --list - - git tag + - git tag test-tag - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test @@ -28,7 +28,6 @@ jobs: - dotnet build - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - stage: deploy - if: branch = master script: - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." - cd MessageBird From afae2a9a1f4a971220aacaed2150f793510969a8 Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Fri, 23 Aug 2019 13:43:07 +0200 Subject: [PATCH 09/11] Pack and tag on merged PR --- .travis.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d810bf3..4b97fc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,28 +5,19 @@ sudo: required dist: xenial dotnet: 2.2 env: - - VERSION=1.6.2 + - VERSION=1.6.1 + - LIVE_KEY=NUGET_KEY stages: - - test + - name: test - name: deploy if: (branch = master) AND (NOT (type IN (push, pull_request))) jobs: include: - stage: test script: - - echo $VERSION - - echo "$TRAVIS_BRANCH" - - git config --list - - git tag test-tag - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test - - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." - - echo "CONTINUING" - - cd ../../../MessageBird - - dotnet restore - - dotnet build - - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - stage: deploy script: - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." @@ -35,4 +26,6 @@ jobs: - dotnet build - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - dotnet nuget push bin/Release/MessageBird.$VERSION.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json + - git tag $VERSION + - git push origin $VERSION --tags \ No newline at end of file From 7b2f93dc83b00664a72fac1a3117f993deebf3ad Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Mon, 26 Aug 2019 11:24:15 +0200 Subject: [PATCH 10/11] Used live key variable already existing in repo --- .travis.yml | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b97fc9..0d5e334 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,27 +5,28 @@ sudo: required dist: xenial dotnet: 2.2 env: + matrix: - VERSION=1.6.1 - - LIVE_KEY=NUGET_KEY stages: - - name: test - - name: deploy - if: (branch = master) AND (NOT (type IN (push, pull_request))) +- name: test +- name: deploy + if: "(branch = master) AND (NOT (type IN (push, pull_request)))" jobs: include: - - stage: test - script: - - cd Tests/UnitTests/MessageBirdUnitTests - - dotnet restore - - dotnet test - - stage: deploy - script: - - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION already exists" && exit 0 || echo "Packing and uploading ..." - - cd MessageBird - - dotnet restore - - dotnet build - - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION - - dotnet nuget push bin/Release/MessageBird.$VERSION.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json - - git tag $VERSION - - git push origin $VERSION --tags - \ No newline at end of file + - stage: test + script: + - cd Tests/UnitTests/MessageBirdUnitTests + - dotnet restore + - dotnet test + - stage: deploy + script: + - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg + | head -n1 | awk '{print $2}')" -eq 200 && echo "package with version $VERSION + already exists" && exit 0 || echo "Packing and uploading ..." + - cd MessageBird + - dotnet restore + - dotnet build + - dotnet pack -p:PackageID=MessageBird -c Release -p:PackageVersion=$VERSION + - dotnet nuget push bin/Release/MessageBird.$VERSION.nupkg -k $LIVE_KEY -s https://api.nuget.org/v3/index.json + - git tag $VERSION + - git push origin $VERSION --tags From 1c172bc024699d6dff0085ecc640338d7e92dc9c Mon Sep 17 00:00:00 2001 From: Ali Ben Zarrouk Date: Mon, 26 Aug 2019 16:04:21 +0200 Subject: [PATCH 11/11] Trying for folder check --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 212f551..7846e2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: secure: dW4i1leTDXh38v7756n1XCC/l9FokZDmOlwjSdYD89BcgGsJzHh/g/K/9IISUhNw9ZXqs2GRGsHGUd4BnZ/dkju+9eyR9VvYBB6h9UfFxKk3+lLbIiWnIUpKzlqrmErpyoEr7tGtqk1JR4+rgRy/CP7giS9uCV2SlX+kntGz60bkrX2308n5PMidCjg9o6DeLnmpDO8+joAUBi2+v3/648+6pk9OIiFJqrYjj90fH+YlF+3vPYugS6arbSiRQ5lfn8lHWqfIuCzikHcjA3/MVeVqrXuYINtWz0xF03/n107Wrl00FtrRnXcp2ssixXZ1u6is9zJFvRewoKjxTSN3VjQIev9h+HTSBoua5KQdcbZ6Of2+f8SiC6lXvAz436OxOqyO7z11urHLBk/ZL+1iX5Qkh+9Aq+ZhdHsbufnZMzfgzx3MLRhrsgK0aJk+gnAOSqci7a/bZlkuGUlru4cN0jR/aP2+tIAM+beRwo0e0eTEHxy4wnKDs00sJnY0nOpq/K7zRqRuq/3DXkGq9+/8TzyiCp9mJ+z4lXzZfJWybmcaTnXKJqzcN1GmVV1UaGfEz0SZWRiJ28XTLyZkxpXRUN+n+zYJNGlonzFub92y0Q0v4td2NVuzIi2WNcC1G1MJJUr3DZ16/0D5QU6589O6JoVjhD31Diw7oK0ig+YedgY= stages: - name: test +- name: check - name: deploy if: "(branch = master) AND (NOT (type IN (push, pull_request)))" jobs: @@ -19,6 +20,10 @@ jobs: - cd Tests/UnitTests/MessageBirdUnitTests - dotnet restore - dotnet test + - stage: check + script: + - pwd + - ls - stage: deploy script: - test "$(curl -I https://globalcdn.nuget.org/packages/messagebird.$VERSION.nupkg