TFS 2017 build: Git flow with version branches

Question

Hello,

We've got a build which is failed on the branches strategy. I'm not sure if I'll be able to explain but, here we go:

{
....
      "inputs": {
        "wrapperScript": "$(Parameters.wrapperScript)",
        "options": "",
        "tasks": "clean test war preparedevelopmentoctpusfolder -Ppackageversion=$(Build.SourceBranchName).$(Build.BuildNumber)-dev",

     "inputs": {
        "PackageId": "Svea.Webpay.PaymentGateway",
        "PackageFormat": "NuPkg",
        "PackageVersion": "$(Build.SourceBranchName).$(Build.BuildNumber)-develop",
        "SourcePath": "$(Build.ArtifactStagingDirectory)\\build",
        "OutputPath": 
      "inputs": {
        "OctoConnectedServiceName": "xxx",
        "Package": "$(Build.ArtifactStagingDirectory)\\package\\Svea.Webpay.PaymentGateway.$(Build.SourceBranchName).$(Build.BuildNumber)-develop.nupkg",

The code above doesn't work and build fails:

2018-03-08T10:05:29.0015961Z System.ArgumentException: 'octopus-deploy.1803081-develop' is not a valid version string
2018-03-08T10:05:29.0015961Z Parameter name: value

Is it possible to pull out versioning and add <g class="gr_ gr_594 gr-alert gr_gramm gr_inline_cards gr_run_anim Grammar replaceWithoutSep" data-gr-id="594" id="594">as</g> a variable? If yes, can someone help?

Thank you in advance!