From 1ea7e745e1680520b1c21e51571608f2001d75e7 Mon Sep 17 00:00:00 2001
From: Martin Smith <martinsmith1968@gmail.com>
Date: Tue, 31 Dec 2019 14:12:12 +0000
Subject: [PATCH] Restore git work to git release stage and dont allow version
 tag builds

---
 .travis.yml                    | 24 +++++++++---------------
 DNX.Helpers/DNX.Helpers.csproj |  4 ++--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3672382..dbcda9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,10 @@ solution: $APPNAME.sln
 language: csharp
 mono: none
 
+branches:
+  except:
+  - v*
+
 stages:
   - name: build
   - name: deploy
@@ -49,14 +53,6 @@ jobs:
       dotnet: 2.2.102
       install: dotnet restore
       script: dotnet build
-      before_deploy:
-      - FILE=$(ls $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg)
-      - echo $FILE
-      - VERSION=$(echo $FILE | sed -e "s/$APPNAME\/bin\/$CONFIGURATION\/$APPNAME.//g" -e 's/.nupkg//g')
-      - echo $VERSION
-      - export TRAVIS_TAG=v$VERSION
-      - echo $TRAVIS_TAG
-      - git tag -f "$TRAVIS_TAG"
       deploy:
         provider: script
         skip_cleanup: true
@@ -70,11 +66,11 @@ jobs:
       install: dotnet restore
       script: dotnet build
       before_deploy:
-      - #FILE=$(ls $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg)
-      - #echo $FILE
-      - #VERSION=$(echo $FILE | sed -e "s/$APPNAME\/bin\/$CONFIGURATION\/$APPNAME.//g" -e 's/.nupkg//g')
-      - #echo $VERSION
-      - #export TRAVIS_TAG=v$VERSION
+      - FILE=$(ls $APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg)
+      - echo $FILE
+      - VERSION=$(echo $FILE | sed -e "s/$APPNAME\/bin\/$CONFIGURATION\/$APPNAME.//g" -e 's/.nupkg//g')
+      - echo $VERSION
+      - export TRAVIS_TAG=v$VERSION
       - echo $TRAVIS_TAG
       - git tag -f "$TRAVIS_TAG"
       deploy:
@@ -84,5 +80,3 @@ jobs:
         file_glob: true
         file:
           - "$APPNAME/bin/$CONFIGURATION/$APPNAME.*.nupkg"
-        on:
-          tags: true
diff --git a/DNX.Helpers/DNX.Helpers.csproj b/DNX.Helpers/DNX.Helpers.csproj
index 53f7e0f..daed8fb 100644
--- a/DNX.Helpers/DNX.Helpers.csproj
+++ b/DNX.Helpers/DNX.Helpers.csproj
@@ -12,8 +12,8 @@
     <PackageIconUrl>https://raw.githubusercontent.com/martinsmith1968/DNX.Helpers/master/images/favicon-32x32.png</PackageIconUrl>
     <PackageTags>DNX helpers extensions string array linq</PackageTags>
     <PackageReleaseNotes>Interpolation to a working version and some preparation for moving to .NET Standard</PackageReleaseNotes>
-    <Version>2.0.6</Version>
-    <AssemblyVersion>2.0.6</AssemblyVersion>
+    <Version>2.0.7</Version>
+    <AssemblyVersion>2.0.7</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Converters\BuiltInTypes\Build.cmd" />