Falled back to fetch the old tag format

Author: raych1

eng/scripts/Generate-Patch.ps1

@@ -108,8 +108,17 @@ function ResetSourcesToReleaseTag($ArtifactName, $ServiceDirectoryName, $Release
   Write-Information "Fetching all the tags from $RemoteName"
   $CmdOutput = git fetch $RemoteName $ReleaseTag
   if($LASTEXITCODE -ne 0) {
-    LogError "Could not restore the tags for release tag $ReleaseTag"
-    exit 1
+    # Fall back to old tag format: <artifactName>_<version>
+    $OldReleaseTag = "${ArtifactName}_${ReleaseVersion}"
+    Write-Information "Failed to fetch new tag format. Trying old tag format: $OldReleaseTag"
+    $CmdOutput = git fetch $RemoteName $OldReleaseTag
+    
+    if($LASTEXITCODE -ne 0) {
+      LogError "Could not restore the tags for release tag $ReleaseTag or $OldReleaseTag"
+      exit 1
+    }
+    
+    $ReleaseTag = $OldReleaseTag
   }
 
   $cmdOutput = git restore --source $ReleaseTag -W -S $ArtifactDirPath

eng/scripts/bomhelpers.ps1

@@ -323,8 +323,18 @@ function GeneratePatch($PatchInfo, [string]$BranchName, [string]$RemoteName, [st
     $cmdOutput = git fetch $RemoteName $releaseTag
 
     if ($LASTEXITCODE -ne 0) {
-      LogError "Could not restore the tags for release tag $releaseTag"
-      exit $LASTEXITCODE
+      # Fall back to old tag format: <artifactId>_<version>
+      $oldReleaseTag = "$($artifactId)_$($releaseVersion)"
+      Write-Output "Failed to fetch new tag format. Trying old tag format: $oldReleaseTag"
+      Write-Host "git fetch $RemoteName $oldReleaseTag"
+      $cmdOutput = git fetch $RemoteName $oldReleaseTag
+      
+      if ($LASTEXITCODE -ne 0) {
+        LogError "Could not restore the tags for release tag $releaseTag or $oldReleaseTag"
+        exit $LASTEXITCODE
+      }
+      
+      $releaseTag = $oldReleaseTag
     }
 
     Write-Host "git restore --source $releaseTag -W -S $artifactDirPath"