From a2d7afc55b84b2969a0b96dbdcf19b0881f4eb7d Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 28 Jan 2020 12:08:28 -0800 Subject: [PATCH 01/17] add nuget pack --- .travis.yml | 23 ++++++++++++++++++----- Makefile | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec6edc8..0e3a201 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,25 @@ language: csharp +dotnet: 2.1.803 solution: CSharpHTTPClient/CSharpHTTPClient.sln -env: - matrix: - secure: KJrQ+NfmzlgCSXRyqeAMDGZUG6GO4/+xk1T0wGy1BgVz8seo/fDWL8osWEljB4Sj05sfFj7CM+rociwL6sdVyqCiHbCAM7XuHs58D+4Tlh5pGHL+G1qOl65/pDl0ulq+M7PwDxHPZ60/oyH2a16t5jtD9e4W31y2fXzEbHGLHXg= +os: linux +dist: bionic +mono: latest +sudo: required + +before_install: + - mkdir -p .nuget + - wget -O .nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe + + before_script: + # https://github.com/dotnet/sdk/issues/335 + - if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi + script: - make test + +after_success: + - bash <(curl -s https://codecov.io/bash) + deploy: skip_cleanup: true provider: script @@ -12,5 +27,3 @@ deploy: on: branch: master tags: true -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/Makefile b/Makefile index b1e9484..5a7c693 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ install: test: install xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None + nuget pack CSharpHTTPClient/CSharpHTTPClient.csproj -Properties Configuration=Release curl -s https://codecov.io/bash > .codecov chmod +x .codecov ./.codecov - From d37965c9de310730cebdf04e91254095a2bb65f9 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 28 Jan 2020 13:26:51 -0800 Subject: [PATCH 02/17] fix formatting --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e3a201..6e03615 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ before_install: - mkdir -p .nuget - wget -O .nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - before_script: - # https://github.com/dotnet/sdk/issues/335 - - if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi +before_script: + # https://github.com/dotnet/sdk/issues/335 + - if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi script: - make test From 6ea57b7dc3e7a0abd5615e575a259b56f8847eda Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 28 Jan 2020 13:49:58 -0800 Subject: [PATCH 03/17] try dotnet pack --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5a7c693..250894d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ install: test: install xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None - nuget pack CSharpHTTPClient/CSharpHTTPClient.csproj -Properties Configuration=Release + dotnet pack ./CSharpHTTPClient/CSharpHTTPClient.csproj -c Release curl -s https://codecov.io/bash > .codecov chmod +x .codecov ./.codecov From bc59f7a37cb3581fa9c4b0070b19ebc0ebbf41c3 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 28 Jan 2020 14:22:30 -0800 Subject: [PATCH 04/17] update metadata, back to nuget pack --- CSharpHTTPClient/CSharpHTTPClient.csproj | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CSharpHTTPClient/CSharpHTTPClient.csproj b/CSharpHTTPClient/CSharpHTTPClient.csproj index 178bd57..c0f0c27 100644 --- a/CSharpHTTPClient/CSharpHTTPClient.csproj +++ b/CSharpHTTPClient/CSharpHTTPClient.csproj @@ -2,9 +2,9 @@ - 3.4.2 + 3.4.2 SendGrid.CSharp.HTTP.Client - Elmer Thomas;Twilio DX Team + Elmer Thomas;Twilio DX Team Twilio SendGrid Twilio SendGrid MIT @@ -12,7 +12,7 @@ https://github.com/sendgrid/csharp-http-client.git git https://sendgrid.com/wp-content/themes/sgdotcom/pages/resource/brand//2016/SendGrid-Logomark.png - Quickly and easily access any REST or REST-like API using a fluent interface via method chaining and reflection. + Quickly and easily access any REST or REST-like API using a fluent interface via method chaining and reflection. Please see: https://github.com/sendgrid/csharp-http-client/releases Twilio;SendGrid;Email;Mail;Microsoft;Azure;Transactional;.NET Core Twilio SendGrid, Inc. 2020 diff --git a/Makefile b/Makefile index 250894d..5a7c693 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ install: test: install xbuild /p:Configuration=Release CSharpHTTPClient/CSharpHTTPClient.sln mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe UnitTest/bin/Release/UnitTest.dll -domain:None - dotnet pack ./CSharpHTTPClient/CSharpHTTPClient.csproj -c Release + nuget pack CSharpHTTPClient/CSharpHTTPClient.csproj -Properties Configuration=Release curl -s https://codecov.io/bash > .codecov chmod +x .codecov ./.codecov From be1c8ff7cccbc3d55aa8797da42b929d17886540 Mon Sep 17 00:00:00 2001 From: Elmer Thomas Date: Tue, 28 Jan 2020 18:48:30 -0800 Subject: [PATCH 05/17] add nuspec --- CSharpHTTPClient/CSharpHTTPClient.csproj | 4 +--- CSharpHTTPClient/Properties/AssemblyInfo.cs | 16 ---------------- SendGridCSharpHTTPClient.nuspec | 11 +++++++++++ 3 files changed, 12 insertions(+), 19 deletions(-) create mode 100644 SendGridCSharpHTTPClient.nuspec diff --git a/CSharpHTTPClient/CSharpHTTPClient.csproj b/CSharpHTTPClient/CSharpHTTPClient.csproj index c0f0c27..5ffcf5c 100644 --- a/CSharpHTTPClient/CSharpHTTPClient.csproj +++ b/CSharpHTTPClient/CSharpHTTPClient.csproj @@ -4,15 +4,12 @@ 3.4.2 SendGrid.CSharp.HTTP.Client - Elmer Thomas;Twilio DX Team Twilio SendGrid Twilio SendGrid MIT - https://sendgrid.com/ https://github.com/sendgrid/csharp-http-client.git git https://sendgrid.com/wp-content/themes/sgdotcom/pages/resource/brand//2016/SendGrid-Logomark.png - Quickly and easily access any REST or REST-like API using a fluent interface via method chaining and reflection. Please see: https://github.com/sendgrid/csharp-http-client/releases Twilio;SendGrid;Email;Mail;Microsoft;Azure;Transactional;.NET Core Twilio SendGrid, Inc. 2020 @@ -77,6 +74,7 @@ +