Fix build definition (#71621)

Author: genlu

azure-pipelines-official.yml

@@ -101,20 +101,23 @@ stages:
       displayName: Setting SourceBranchName variable
       condition: succeeded()
 
-    - task: tagBuildOrRelease@0
+    - task: Powershell@2
       displayName: Tag official build
       inputs:
-        type: 'Build'
-        tags: 'OfficialBuild'
-      condition: and(succeeded(), endsWith(variables['SourceBranchName'], '-vs-deps'))
+        targetType: inline
+        script: |
+          Write-Host "##vso[build.addBuildTag]OfficialBuild"
+      condition: succeeded()
 
-    - task: tagBuildOrRelease@0
-      displayName: Tag main validation build
-      inputs:
-        type: 'Build'
-        tags: |
-          MainValidationBuild
-      condition: and(succeeded(), eq(variables['SourceBranchName'], 'main'))
+    # Don't run this while we don't have a main-vs-deps to merge. Should be uncommented when the branch comes back. Also need to change the condition of the tagging task above.
+    #
+    # - task: Powershell@2
+    #  displayName: Tag main validation build
+    #  inputs:
+    #    targetType: inline
+    #    script: |
+    #      Write-Host "##vso[build.addBuildTag]MainValidationBuild"
+    #  condition: and(succeeded(), eq(variables['SourceBranchName'], 'main'))
 
     - task: PowerShell@2
       displayName: Merge main-vs-deps into source branch

azure-pipelines-pr-validation.yml

@@ -61,14 +61,14 @@ stages:
       displayName: Setting SourceBranchName variable
       condition: succeeded()
 
-    - task: tagBuildOrRelease@0
+    - task: Powershell@2
       displayName: Tag PR validation build
       inputs:
-        type: 'Build'
-        tags: |
-          PRValidationBuild
-          PRNumber:${{ parameters.PRNumber }}
-          CommitSHA:${{ parameters.CommitSHA }}
+        targetType: inline
+        script: |
+          Write-Host "##vso[build.addBuildTag]OfficialBuild"
+          Write-Host "##vso[build.addBuildTag]${{ parameters.CommitSHA }}"
+          Write-Host "##vso[build.addBuildTag]PRNumber:${{ parameters.PRNumber }}"
       condition: succeeded()
 
     - task: PowerShell@2