From b907ffad64daabb0e4196e124e759f3d48ca5a75 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:43:11 +0100 Subject: [PATCH 01/11] tests run in multiple versions --- tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj | 2 +- tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj | 2 +- tests/tests.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj b/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj index a7c29c94..2af711b9 100644 --- a/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj +++ b/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp2.0 + netcoreapp1.0;netcoreapp2.0 diff --git a/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj b/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj index bfd8fe87..1c0dcb68 100644 --- a/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj +++ b/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp2.0 + netcoreapp1.0;netcoreapp2.0 diff --git a/tests/tests.props b/tests/tests.props index 822f6b90..ee36ceac 100644 --- a/tests/tests.props +++ b/tests/tests.props @@ -5,7 +5,7 @@ false - CS1591 + CS1591;CS1701 From 3ca6c20d52d52c80117edbc37667d11068999c25 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:43:23 +0100 Subject: [PATCH 02/11] added workflows --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48388d6a..53e8915d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,3 +39,9 @@ jobs: dotnet nuget push ./src/GraphQL.Common/bin/Release/GraphQL.Common.1.0.0-beta2.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE dotnet nuget push ./src/GraphQL.Client/bin/Release/GraphQL.Client.1.0.0-beta2.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE fi + +workflows: + version: 2 + build-test-and-deploy: + jobs: + - build From 9dfde2aad7959c28624e5f0a12339ca24b548459 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:47:22 +0100 Subject: [PATCH 03/11] netcore2.0 --- .circleci/config.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53e8915d..461c971a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,9 @@ version: 2 jobs: - build: + netcore2.0: working_directory: ~/GraphQL.Client/ docker: - image: microsoft/dotnet:2.0-sdk - environment: - MY_GET_SOURCE: https://www.myget.org/F/graphql-dotnet/api/v3/index.json steps: - checkout @@ -19,6 +17,15 @@ jobs: paths: - ~/.nuget/ + deploy: + working_directory: ~/GraphQL.Client/ + docker: + - image: microsoft/dotnet:2.0-sdk + environment: + MY_GET_SOURCE: https://www.myget.org/F/graphql-dotnet/api/v3/index.json + steps: + - checkout + # Pack - run: dotnet build --configuration Release ./src/GraphQL.Common/GraphQL.Common.csproj - run: dotnet pack --configuration Release ./src/GraphQL.Common/GraphQL.Common.csproj @@ -44,4 +51,7 @@ workflows: version: 2 build-test-and-deploy: jobs: - - build + - netcore2.0 + - deploy: + requires: + - netcore2.0 From 18b7d93f9d221e696b4dcdda1d72aaaf421dd6e7 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:48:26 +0100 Subject: [PATCH 04/11] --framework netcoreapp2.0 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 461c971a..eaa8dbd6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,8 +10,8 @@ jobs: # Test - restore_cache: key: NUGET - - run: dotnet test ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj - - run: dotnet test ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj + - run: dotnet test --framework netcoreapp2.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj + - run: dotnet test --framework netcoreapp2.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj - save_cache: key: NUGET paths: From 389812abc026c60b211820c1a77bf84f66485bd4 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:51:00 +0100 Subject: [PATCH 05/11] netcore1.0 tests --- .circleci/config.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index eaa8dbd6..fda9320e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,22 @@ version: 2 jobs: + netcore1.0: + working_directory: ~/GraphQL.Client/ + docker: + - image: microsoft/dotnet:1.0-sdk + steps: + - checkout + + # Test + - restore_cache: + key: NUGET + - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj + - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj + - save_cache: + key: NUGET + paths: + - ~/.nuget/ + netcore2.0: working_directory: ~/GraphQL.Client/ docker: @@ -51,7 +68,9 @@ workflows: version: 2 build-test-and-deploy: jobs: + - netcore1.0 - netcore2.0 - deploy: requires: + - netcore1.0 - netcore2.0 From b99de52b56d7f1d1d47907c05c98365ae809f18b Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:54:37 +0100 Subject: [PATCH 06/11] changed docker image --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fda9320e..4cc57bee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: netcore1.0: working_directory: ~/GraphQL.Client/ docker: - - image: microsoft/dotnet:1.0-sdk + - image: microsoft/dotnet:1-sdk steps: - checkout @@ -20,7 +20,7 @@ jobs: netcore2.0: working_directory: ~/GraphQL.Client/ docker: - - image: microsoft/dotnet:2.0-sdk + - image: microsoft/dotnet:2-sdk steps: - checkout @@ -37,7 +37,7 @@ jobs: deploy: working_directory: ~/GraphQL.Client/ docker: - - image: microsoft/dotnet:2.0-sdk + - image: microsoft/dotnet:2-sdk environment: MY_GET_SOURCE: https://www.myget.org/F/graphql-dotnet/api/v3/index.json steps: From f048c6ff4397d6606ecab5df1dae8797f88b9fdb Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:58:24 +0100 Subject: [PATCH 07/11] netcoreapp1.1 --- .circleci/config.yml | 10 +++++----- tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj | 2 +- tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cc57bee..0842fab4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - netcore1.0: + netcore1.1: working_directory: ~/GraphQL.Client/ docker: - image: microsoft/dotnet:1-sdk @@ -10,8 +10,8 @@ jobs: # Test - restore_cache: key: NUGET - - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj - - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj + - run: dotnet test --framework netcoreapp1.1 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj + - run: dotnet test --framework netcoreapp1.1 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj - save_cache: key: NUGET paths: @@ -68,9 +68,9 @@ workflows: version: 2 build-test-and-deploy: jobs: - - netcore1.0 + - netcore1.1 - netcore2.0 - deploy: requires: - - netcore1.0 + - netcore1.1 - netcore2.0 diff --git a/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj b/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj index 2af711b9..7c597099 100644 --- a/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj +++ b/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp1.0;netcoreapp2.0 + netcoreapp1.1;netcoreapp2.0 diff --git a/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj b/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj index 1c0dcb68..fc70dc23 100644 --- a/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj +++ b/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp1.0;netcoreapp2.0 + netcoreapp1.1;netcoreapp2.0 From 1780f5bd0a630d513476542f3de061d13e96cc40 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 17:59:56 +0100 Subject: [PATCH 08/11] Revert "netcoreapp1.1" This reverts commit f048c6ff4397d6606ecab5df1dae8797f88b9fdb. --- .circleci/config.yml | 10 +++++----- tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj | 2 +- tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0842fab4..4cc57bee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 jobs: - netcore1.1: + netcore1.0: working_directory: ~/GraphQL.Client/ docker: - image: microsoft/dotnet:1-sdk @@ -10,8 +10,8 @@ jobs: # Test - restore_cache: key: NUGET - - run: dotnet test --framework netcoreapp1.1 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj - - run: dotnet test --framework netcoreapp1.1 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj + - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj + - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj - save_cache: key: NUGET paths: @@ -68,9 +68,9 @@ workflows: version: 2 build-test-and-deploy: jobs: - - netcore1.1 + - netcore1.0 - netcore2.0 - deploy: requires: - - netcore1.1 + - netcore1.0 - netcore2.0 diff --git a/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj b/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj index 7c597099..2af711b9 100644 --- a/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj +++ b/tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp1.1;netcoreapp2.0 + netcoreapp1.0;netcoreapp2.0 diff --git a/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj b/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj index fc70dc23..1c0dcb68 100644 --- a/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj +++ b/tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp1.1;netcoreapp2.0 + netcoreapp1.0;netcoreapp2.0 From 70453cd298da79d9ba948e3e1c3d08640a3e4305 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 18:01:10 +0100 Subject: [PATCH 09/11] dotnet restore is required in netcore1.0 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cc57bee..13200579 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ jobs: # Test - restore_cache: key: NUGET + - run: dotnet restore - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj - save_cache: From 9fb5d1b57f3f6a8a6fd2013617037d5ce7f69483 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 18:04:17 +0100 Subject: [PATCH 10/11] $VERSION --- .circleci/config.yml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13200579..e8b82abd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,17 +6,11 @@ jobs: - image: microsoft/dotnet:1-sdk steps: - checkout - + # Test - - restore_cache: - key: NUGET - run: dotnet restore - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj - run: dotnet test --framework netcoreapp1.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj - - save_cache: - key: NUGET - paths: - - ~/.nuget/ netcore2.0: working_directory: ~/GraphQL.Client/ @@ -24,16 +18,10 @@ jobs: - image: microsoft/dotnet:2-sdk steps: - checkout - + # Test - - restore_cache: - key: NUGET - run: dotnet test --framework netcoreapp2.0 ./tests/GraphQL.Common.Tests/GraphQL.Common.Tests.csproj - run: dotnet test --framework netcoreapp2.0 ./tests/GraphQL.Client.Tests/GraphQL.Client.Tests.csproj - - save_cache: - key: NUGET - paths: - - ~/.nuget/ deploy: working_directory: ~/GraphQL.Client/ @@ -41,6 +29,7 @@ jobs: - image: microsoft/dotnet:2-sdk environment: MY_GET_SOURCE: https://www.myget.org/F/graphql-dotnet/api/v3/index.json + VERSION: 1.0.0-beta2 steps: - checkout @@ -52,17 +41,17 @@ jobs: # Store Artifacts - store_artifacts: - path: ./src/GraphQL.Common/bin/Release/GraphQL.Common.1.0.0-beta2.nupkg + path: ./src/GraphQL.Common/bin/Release/GraphQL.Common.$VERSION.nupkg - store_artifacts: - path: ./src/GraphQL.Client/bin/Release/GraphQL.Client.1.0.0-beta2.nupkg + path: ./src/GraphQL.Client/bin/Release/GraphQL.Client.$VERSION.nupkg # Deploy - deploy: name: MyGet command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then - dotnet nuget push ./src/GraphQL.Common/bin/Release/GraphQL.Common.1.0.0-beta2.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE - dotnet nuget push ./src/GraphQL.Client/bin/Release/GraphQL.Client.1.0.0-beta2.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE + dotnet nuget push ./src/GraphQL.Common/bin/Release/GraphQL.Common.$VERSION.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE + dotnet nuget push ./src/GraphQL.Client/bin/Release/GraphQL.Client.$VERSION.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE fi workflows: From c1939241e82933a410f088ac27f0a974b88c6266 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 14 Dec 2017 18:07:19 +0100 Subject: [PATCH 11/11] NoVersion --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8b82abd..dda11487 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,6 @@ jobs: - image: microsoft/dotnet:2-sdk environment: MY_GET_SOURCE: https://www.myget.org/F/graphql-dotnet/api/v3/index.json - VERSION: 1.0.0-beta2 steps: - checkout @@ -41,17 +40,17 @@ jobs: # Store Artifacts - store_artifacts: - path: ./src/GraphQL.Common/bin/Release/GraphQL.Common.$VERSION.nupkg + path: ./src/GraphQL.Common/bin/Release/GraphQL.Common.1.0.0-beta2.nupkg - store_artifacts: - path: ./src/GraphQL.Client/bin/Release/GraphQL.Client.$VERSION.nupkg + path: ./src/GraphQL.Client/bin/Release/GraphQL.Client.1.0.0-beta2.nupkg # Deploy - deploy: name: MyGet command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then - dotnet nuget push ./src/GraphQL.Common/bin/Release/GraphQL.Common.$VERSION.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE - dotnet nuget push ./src/GraphQL.Client/bin/Release/GraphQL.Client.$VERSION.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE + dotnet nuget push ./src/GraphQL.Common/bin/Release/GraphQL.Common.1.0.0-beta2.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE + dotnet nuget push ./src/GraphQL.Client/bin/Release/GraphQL.Client.1.0.0-beta2.nupkg --api-key $MY_GET_API_KEY --source $MY_GET_SOURCE fi workflows: