Merge branch 'master' of https://github.com/sketch7/FluentlyHttpClient

.circleci/config.yml

@@ -28,18 +28,13 @@ jobs:
       - run:
           name: Check if branch is publishable
           command: |
-            if ! ([ $CIRCLE_BRANCH = "develop" ] || [ $CIRCLE_BRANCH = "master" ]); then
+            if ! ([ $CIRCLE_BRANCH = "master" ] || [[ "$CIRCLE_BRANCH" =~ ^(([0-9]+|\.)+x)$ ]]); then
               echo "Non-publishable branch; finishing build..."
               circleci step halt
             fi
       - deploy:
           name: Publish NuGet
           command: |
-            if [ "$CIRCLE_BRANCH" != "master" ]; then
-              echo -e "\e[33m Branch does not publish -- exit!"
-              exit
-            fi
-
             export SKETCH7_NUGET_API_KEY=$API_KEY
 
             npm run publish:dev

CHANGELOG.md

@@ -24,7 +24,7 @@
 
 ### Features
 
-- **headers:** add several utility methods 
+- **headers:** add several utility methods
   - `ctor IDictionary<string, StringValues>`
   - `Add(string, StringValues)`
   - `Remove(string)`

Directory.Build.props

@@ -11,23 +11,28 @@
     <Product>FluentlyHttpClient</Product>
     <Copyright>© sketch7. All rights reserved.</Copyright>
     <PackageProjectUrl>https://github.com/sketch7/FluentlyHttpClient</PackageProjectUrl>
-    <PackageIconUrl>https://avatars0.githubusercontent.com/u/16617196?v=3&amp;s=200</PackageIconUrl>
     <PackageTags>httpclient fluentapi fluenthttp graphql graphqlclient</PackageTags>
     <PackageReleaseNotes></PackageReleaseNotes>
     <RepositoryUrl>https://github.com/sketch7/FluentlyHttpClient.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <!-- Note: quite nice to have but since we dont really use, they will simply slow down CI
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>logo188x188.png</PackageIcon>
     <IncludeSymbols>true</IncludeSymbols>
-    <IncludeSource>true</IncludeSource> -->
+    <IncludeSource>true</IncludeSource>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+      <None Include="$(SourceRoot)assets/logo188x188.png" Pack="true" Visible="false" PackagePath="/" />
+  </ItemGroup>
+
   <!-- Common compile parameters -->
   <PropertyGroup>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1705;1591</NoWarn>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup>

docs/RELEASE-WORKFLOW.md

@@ -2,7 +2,10 @@
 In order to release follow the following procedure.
 
  - Create branch e.g. `feature/xyz`.. *onces changes are ready...*
+ - Create a PR from `feature/xyz` to `master`
+
+## Stable Versions
+ - Create PR to version branch `3.x`
  - Update version within `package.json`
  - Update `CHANGELOG.md`
- - Create a PR from `feature/xyz` to `master`
  - Once merged it will auto `publish` and `git tag`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sketch7/fluently-http-client",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "versionSuffix": "",
   "scripts": {
     "pack": "bash ./tools/pack.sh",

tools/publish.sh

@@ -6,7 +6,7 @@ DIR=`dirname "${THIS}"` # This directory path
 . "$DIR/version-builder.sh"
 
 err(){
-	echo -e "\e[31m $* \e[0m" >>/dev/stderr
+	echo -e "\e[31m $* \e[0m" >&2
 }
 
 echo -e "\e[36m ---- Publish ---- \e[39m"

tools/version-builder.sh

@@ -8,6 +8,10 @@ if [ -z "$PACKAGE_VERSION_SUFFIX" ] && [ -z "$CI" ]; then
 	PACKAGE_VERSION_SUFFIX=dev
 fi
 
+if [ $CIRCLE_BRANCH = "master" ] ; then
+	PACKAGE_VERSION_SUFFIX=dev$CIRCLE_BUILD_NUM
+fi
+
 if [ -n "$PACKAGE_VERSION_SUFFIX" ]; then
 	VERSION=$VERSION-$PACKAGE_VERSION_SUFFIX
 fi