Merge remote-tracking branch 'origin/master' into dotnetCore

Author: AArnott

src/Nerdbank.GitVersioning.NuGet/build/Nerdbank.GitVersioning.targets

@@ -92,6 +92,7 @@
 
   <Target Name="SetCloudBuildVersionVars"
         DependsOnTargets="GetBuildVersion"
+        AfterTargets="GetBuildVersion"
         Condition=" '@(CloudBuildVersionVars)' != '' ">
     <Nerdbank.GitVersioning.Tasks.SetCloudBuildVariables
       CloudBuildVersionVars="@(CloudBuildVersionVars)">
@@ -104,6 +105,7 @@
 
   <Target Name="SetCloudBuildNumberWithVersion"
         DependsOnTargets="GetBuildVersion"
+        AfterTargets="GetBuildVersion"
         Condition=" '$(CloudBuildNumber)' != '' ">
     <Nerdbank.GitVersioning.Tasks.SetCloudBuildVariables
       CloudBuildNumber="$(CloudBuildNumber)">