From c7e48da8abef17fb06bfc07d728615d647c2219c Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Sat, 25 May 2019 00:02:44 +0100
Subject: [PATCH] =?UTF-8?q?[Build]=C2=A0Fix=20release=20variable=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 azure-pipelines.yml         | 5 +----
 build/steps/build-nuget.yml | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a94bb5658..c4b0518e1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -127,12 +127,9 @@ jobs:
     dependsOn: nuget_pack
     pool:
       name: $(signVmImage)
-    variables:
-      signBuild: $(Sign)
-      displayName: Sign Phase
     steps:
       - template: build/steps/build-sign.yml
-    condition: and(succeeded(), or(eq(variables['Sign'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
+    condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))))
 
 
 
diff --git a/build/steps/build-nuget.yml b/build/steps/build-nuget.yml
index 1aec0447f..b146707b1 100644
--- a/build/steps/build-nuget.yml
+++ b/build/steps/build-nuget.yml
@@ -50,14 +50,13 @@ steps:
 
   - powershell: |
        $buildConfiguration = "Release"
-       $formsNugetVersion = "" + $env:XAMARINFORMSPACKAGEVERSION
+       $formsNugetVersion = "" + $env:nugetPackageVersion
 
        Write-Host("Update nuspecs")
        Get-ChildItem './.nuspec/*.nuspec' -Recurse | Foreach-Object {
             (Get-Content $_) | Foreach-Object  {
                 $_ -replace '\$version\$', $formsNugetVersion `
                    -replace '\$Configuration\$', $buildConfiguration `
-                   -replace '\$IdAppend\$', ''
            } | Set-Content $_
        }
     failOnStderr: true