Merge branch 'master' of https://github.com/microsoft/botframework-cli

Author: munozemilio

build/botframework-cli-daily.yml

@@ -20,20 +20,24 @@ schedules:
 
 jobs:
   - job: CLI
-
+  
     steps:
     - bash: |
         short_hash=`git rev-parse --short=7 HEAD`  ## At least 7 digits, more if needed for uniqueness
         echo "Full git hash:  $(Build.SourceVersion)"
         echo "Short git hash: $short_hash"
-        echo "##vso[task.setvariable variable=buildVersion]$short_hash"  ## Store variable for subsequent steps
+        echo "##vso[task.setvariable variable=short_hash]$short_hash"  ## Store variable for subsequent steps
       workingDirectory: $(Build.SourcesDirectory)
       displayName: Set Build Version
 
+    - powershell: |
+        $date = (Get-Date).ToString("yyyyMMdd")
+        echo "##vso[task.setvariable variable=buildDate]$date"  ## Store variable for subsequent steps
+
     - task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0
       displayName: 'Tag Build with version number'
       inputs:
-        tags: 'Version=4.10.0-dev.$(buildVersion)'
+        tags: 'Version=4.10.0-dev.$(buildDate).$(short_hash)'
       continueOnError: true
 
     - task: NodeTool@0
@@ -57,7 +61,7 @@ jobs:
     - script: 'rush test'
       displayName: 'rush test'
 
-    - script: 'node ./common/scripts/version-and-pack.js --version 4.10.0-dev.$(buildVersion)'
+    - script: 'node ./common/scripts/version-and-pack.js --version 4.10.0-dev.$(buildDate).$(short_hash)'
       displayName: 'Version and Pack'
 
     - task: CopyFiles@2