ChangeSet links created by the "Push Package Build Information to Octopus" steps in Azure and TFS are incorrect when using a non-default branch and TFVC

[danefalvo]

Prerequisites

• I have verified the problem exists in the latest version
• I have searched open and closed issues to make sure it isn't already reported
• I have written a descriptive issue title
• I have linked the original source of this report
• I have tagged the issue appropriately (area/*, kind/bug, tag/regression?)

The bug

In Azure DevOps or on TFS, if you

1. Setup a Project to use Team Foundation Version Control (TFVC)
2. Create a pipeline which uses "Push Package Build Information to Octopus"
3. In your connected Octopus Project, use a release notes template using the variable: #{commit.LinkUrl}
4. Submit a Change to a non-default branch

The correct ChangeSet should be in the format:
https://<RootURL>/<Project>/_versionControl/changeset/<changeSetID>/

The ChangeSet link that is created will be:
https://<RootURL>/<Branch>/_versionControl/changeset/<changeSetID>/

This results in a "404 - not found" when clicking on the link from the Release Notes

What I expected to happen

The ChangeSet Link should be identical to the ChangeSet URL on AzureDevops

Steps to reproduce

1. Create a Project in Azure Devops - choose TFVC as the versioning Control
2. Connect the Project to an Octopus Deploy Server
3. Create a Pipeline in Azure Devops

• Build Package
• Publish Package
• (Octopus) Package Application for Octopus
• (Octopus) Push Package Build Information to Octopus
• (Octopus) Create New Release

4. Create a Project on the Octopus Deploy Server - using a Release Template with the following Script:

#{each package in Octopus.Release.Package}
- #{package.PackageId} #{package.Version}
#{each workItem in package.WorkItems}
    - [#{workItem.Id}](#{workItem.LinkUrl}) - #{workItem.Description}
#{/each}
#{/each}

5. Create a Local Repository (using whatever method you prefer) and push a solution file to the Repo on the main Branch.
6. Create a new branch on the local development machine and push to the Repo.
7. Run the pipeline - Make sure it successfully pushes to Octopus Deploy (and the changeset is visible within the release)
8. Make a Change on the new branch and push
9. Run the pipeline again. View/click the Changeset link within the Releases section for that project in Octopus.

Screen capture

Affected versions

Latest Cloud Version of Octopus 2020.2.14
CLI version

Workarounds

Links

Originally raised here: https://secure.helpscout.net/conversation/1184928175/65705?folderId=557082

[octoreleasebot]

Release Note: Fixed changeset links generated for packages pushed from TFVC repos