From 5a8e33d756862fdcff43bacfacc76ad239c05239 Mon Sep 17 00:00:00 2001
From: "Raghu Shantha [MSFT]" <raghus@microsoft.com>
Date: Thu, 2 Jun 2016 12:54:04 -0700
Subject: [PATCH] Capture the final build version field from the complete
 version field

---
 build.psm1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index ff7ab14f5..015c58e40 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1053,10 +1053,11 @@ function New-AppxPackage
     )
     
     Write-Verbose "Extract the version in the form of a.b.c.d for $PackageVersion"
+    $PackageVersionTokens = $PackageVersion.Split('-')
     $PackageVersion = ([regex]::matches($PackageVersion, "\d+(\.\d+)+"))[0].value
 
     # Need to add the last version field for makeappx
-    $PackageVersion = $PackageVersion + '.0'
+    $PackageVersion = $PackageVersion + '.' + $PackageVersionTokens[1]
     Write-Verbose "Package Version is $PackageVersion"
 
     $win10sdkBinPath = "${env:ProgramFiles(x86)}\Windows Kits\10\bin\x64"