diff --git a/.vsts/ci-myget-update.yml b/.vsts/ci-myget-update.yml
index d67e52f48..2fe804eff 100644
--- a/.vsts/ci-myget-update.yml
+++ b/.vsts/ci-myget-update.yml
@@ -8,6 +8,8 @@ trigger:
   branches:
     include:
     - master
+  tags:
+    '*'
 
 # no PR builds
 pr: none
diff --git a/build/Common.prod.props b/build/Common.prod.props
index 2e13a5cf2..ad83098d4 100644
--- a/build/Common.prod.props
+++ b/build/Common.prod.props
@@ -23,9 +23,10 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <Target Name="AssemblyVersionTarget" AfterTargets="MinVer" Condition="'$(Configuration)'=='Release' and '$(MinVerVersion)'!=''">
+  <Target Name="AssemblyVersionTarget" AfterTargets="MinVer" Condition="'$(MinVerVersion)'!=''">
     <PropertyGroup>
-      <RevisionNumber>$(MinVerVersion.Split(`.`)[3])</RevisionNumber>
+      <RevisionNumber>0</RevisionNumber>
+      <RevisionNumber Condition="$(MinVerVersion.Split(`.`).Length) == 4">$(MinVerVersion.Split(`.`)[3])</RevisionNumber>
       <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(RevisionNumber)</AssemblyVersion>
       <Version>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(RevisionNumber)</Version>
       <FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(RevisionNumber)</FileVersion>