Allow PR val build insertion step to be re-run

Author: dibarbet

azure-pipelines-pr-validation.yml

@@ -159,7 +159,7 @@ extends:
             targetType: inline
             script: |
               $originalBuildNumber = "$(Build.BuildNumber)".Split(' - ')[0]
-              Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isreadonly=true]$originalBuildNumber"
+              Write-Host "##vso[task.setvariable variable=OriginalBuildNumber;isoutput=true;isreadonly=true]$originalBuildNumber"
 
         - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName;isreadonly=true]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))"
           displayName: Setting SourceBranchName variable
@@ -326,12 +326,20 @@ extends:
       - job: insert
         variables:
           FancyBuildNumber: $[stageDependencies.build.PRValidationBuild.outputs['FancyBuild.BuildNumber']]
+          OriginalBuildNumber: $[stageDependencies.build.PRValidationBuild.outputs['FancyBuild.OriginalBuildNumber']]
         displayName: Insert to VS
         pool:
           name: VSEngSS-MicroBuild2022-1ES
         steps:
         - download: current
           artifact: VSSetup
+
+        # RIT looks at the build number and cannot handle the fancy build version.
+        # While in normal scenarios this is already set to the original number, we reset it again here in case this is a re-run.
+        - powershell: Write-Host "##vso[build.updatebuildnumber]$(OriginalBuildNumber)"
+          displayName: Reset BuildNumber
+          condition: succeeded()
+
         - powershell: |
             $branchName = "$(Build.SourceBranch)".Substring("refs/heads/".Length)
             Write-Host "##vso[task.setvariable variable=ComponentBranchName]$branchName"