Merge branch 'master'

Conflicts:
	.gitlab-ci.yml

Author: jaredcnance

.gitlab-ci.yml

@@ -8,13 +8,7 @@ before_script:
 build:
  stage: build
  script:
-  - 'dotnet pack ./src/JsonApiDotNetCore -c Release -o ./artifacts'
+  - dotnet pack ./src/JsonApiDotNetCore -c Release -o ./artifacts
+  - mono /bin/NuGet.exe push artifacts/**.nupkg -ApiKey $NUGET_KEY
  only:
    - master
-
-publish:
-  stage: deploy
-  script:
-   - 'mono /bin/NuGet.exe push ./artifacts/**.nupkg -ApiKey $NUGET_KEY'
-  only:
-   - tags

src/JsonApiDotNetCore/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.0",
+  "version": "0.2.1",
 
   "dependencies": {
     "Microsoft.NETCore.App": {