Merge pull request #23 from ZEXSM/release-rc/review-library

release-rc/review library

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "minicover": {
+      "version": "3.0.6",
+      "commands": [
+        "minicover"
+      ]
+    }
+  }
+}

.travis.yml

@@ -1,16 +1,18 @@
 language: csharp
-dist: trusty
-os: linux
+dotnet: 3.1
 mono: none
-dotnet: 2.1.502
+solution: OData.QueryBuilder.sln
+env:
+  global:
+    - secure: SuKoVIfbXNAQQAQ8FhoK/USbDAJld63DKsBkmqONvUyOm8rBzFPkAfIl0qACKMMVJec7aJ9PhfxBA8nJdh7zCuaw0xcGxnVfQaxtegKo8+yz18LtUDnwv7h2aDDpsL5IdtgNZabusoz0CG0RB2vZEUQCbx80oH41L0Ijcya93ngnVeD4u0PdoFXbqxoBTiadI6qh/Od+jD+6+B04fz2XSa16WSjobSwsYNr5M+CIpa9OmLdZAJkvgHFlshmrAD2oE8iddImB9YIjDqCvnH/jqAP3/Eqci/N5sW5qpgRAyhvRxcI3Gev0wFexN8qMBUB3Iim92hf18s30R9K0Bvbb/Q+HX/VgnIBY8Yy3F68YNQvmga5AoODyuLaqPBe6ptckFp6yPkPBqeQgp1Pu2mySL0tFkjvg6/WWsxLVpco7zCjymF1IDhjVgbeO+rAQ5vEs1Fp89o4mpIAOcP10uM2b3W71fFSWTbKvIyp8ozL8PaTkRq5NiS7NvQ85hE/lVJyCL62vZ1YYOeQb0ArdoCZVdHbZp9L3UAIPYGUW6mJ9PlQtm9RC3hsnBJEvpoBnQl1wx25hhnTt16oif6L8h5XAbgVpW0Bd46LXMQbMXHKFyeMTuH4l94N9HD+qiDh82L95EQk+yHeCmfZqoKE+pf7HuscvHiFLkOxNbtJdPXqF99k=
 branches:
     only:
         - master
 before_script:
   - dotnet restore
 script:
     - dotnet build
-    - dotnet test ./test/OData.QueryBuilder.Test -c $CONFIGURATION -f netcoreapp2.1
+    - dotnet test ./test/OData.QueryBuilder.Test -c $CONFIGURATION -f netcoreapp3.1
 after_success:
     - cd src/OData.QueryBuilder && dotnet minicover instrument --workdir ../../coverage --parentdir ../ --assemblies test/**/bin/$CONFIGURATION/**/*.dll --sources src/**/*.cs && dotnet minicover reset --workdir ../../coverage && cd ../../
     - dotnet test --no-build ./test/OData.QueryBuilder.Test
@@ -21,17 +23,18 @@ before_deploy:
     - LAST_TAG=$(echo $(git describe --tags $(git rev-list --tags --max-count=1)) | cut -d'v' -f 2)
     - CURRENT_MAJOR=$(echo $LAST_TAG | cut -d. -f 1)
     - CURRENT_MINOR=$(echo $LAST_TAG | cut -d. -f 2)
-    - CURRENT_PATCH=$(echo $LAST_TAG | cut -d. -f 3)
-    - MAJOR=$([ "$(echo $PR_TITLE | grep -oP 'release')" == "release" ] && echo $(($CURRENT_MAJOR+1)) || echo $CURRENT_MAJOR)
-    - MINOR=$(([ "$(echo $PR_TITLE | grep -oP 'release')" == "release" ] && echo 0) || ([ "$(echo $PR_TITLE | grep -oP 'feature')" == "feature" ] && echo $(($CURRENT_MINOR+1))) || echo $CURRENT_MINOR)
-    - PATCH=$(([ "$(echo $PR_TITLE | grep -oP 'release')" == "release" ] && echo 0) || ([ "$(echo $PR_TITLE | grep -oP 'feature')" == "feature" ] && echo 0) || echo $(($CURRENT_PATCH+1)))
+    - CURRENT_PATCH=$(echo $(echo $LAST_TAG | cut -d. -f 3) | cut -d- -f 1)
+    - RC=$(echo $(echo $LAST_TAG | cut -d. -f 3) | cut -d- -f 2)
+    - MAJOR=$(([ "$RC" == "rc" ] && echo $CURRENT_MAJOR) || ([ "$(echo $PR_TITLE | grep -oP 'release')" == "release" ] && echo $(($CURRENT_MAJOR+1))) || echo $CURRENT_MAJOR)
+    - MINOR=$(([ "$RC" == "rc" ] && echo $CURRENT_MINOR) || ([ "$(echo $PR_TITLE | grep -oP 'release')" == "release" ] && echo 0) || ([ "$(echo $PR_TITLE | grep -oP 'feature')" == "feature" ] && echo $(($CURRENT_MINOR+1))) || echo $CURRENT_MINOR)
+    - PATCH=$(([ "$RC" == "rc" ] && echo $CURRENT_PATCH) || ([ "$(echo $PR_TITLE | grep -oP 'release')" == "release" ] && echo 0) || ([ "$(echo $PR_TITLE | grep -oP 'feature')" == "feature" ] && echo 0) || echo $(($CURRENT_PATCH+1)))
     - NEW_TAG=$(echo $MAJOR.$MINOR.$PATCH)
     - PACKAGE_VERSION=${NEW_TAG:-$DEFAULT_PACKAGE_VERSION}
     - git tag v$PACKAGE_VERSION && git push origin v$PACKAGE_VERSION
     - dotnet pack -c $CONFIGURATION -p:PackageVersion=$PACKAGE_VERSION
 deploy:
     provider: releases
-    name: v$CURRENT_TAG
+    name: v$PACKAGE_VERSION
     token: $GITHUB_OAUTH_TOKEN
     cleanup: true
     repo: ZEXSM/OData.QueryBuilder

OData.QueryBuilder.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.705
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30204.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FA1582AB-A13D-44A4-A46D-2DAE1111A2BB}"
 EndProject
@@ -17,6 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{179F88B9
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{B8F31CF9-EDE2-4813-A9AC-EBF3514FFE82}"
+	ProjectSection(SolutionItems) = preProject
+		.config\dotnet-tools.json = .config\dotnet-tools.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +43,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{E4D8F027-2B79-4794-9B75-D08C2BA066B8} = {FA1582AB-A13D-44A4-A46D-2DAE1111A2BB}
 		{537E849E-5291-49F9-BD2A-9F4A01DB1561} = {26982440-340F-48A2-9D73-44DB6C52EBF1}
+		{B8F31CF9-EDE2-4813-A9AC-EBF3514FFE82} = {179F88B9-A06D-4505-9266-A5D66004601C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1D51B9A3-94B0-48DF-BFF5-110B13303535}