Updated SetMsiVersion script to align Azure and AzureRM modules.

Author: Hovsep Mkrtchyan

tools/PreparePSRelease.ps1

@@ -1,3 +1,5 @@
+# e.g. .\PreparePSRelease.ps1 9.10.11 "Spring 2018" -Patch
+# 
 [CmdletBinding()]
 Param(
 [Parameter(Mandatory=$True, Position=0)]

tools/SetMsiVersion.ps1

@@ -10,7 +10,7 @@ Param(
 
 function SetMsiVersion([string]$FilePath, [string]$MsiVersion)
 { 
-    $wxsPath = Join-Path $FilePath "azurecmd.wxs"
+    $wxsPath = Join-Path $FilePath "setup\azurecmd.wxs"
 
     Write-Output "Updating File: $wxsPath"   
     $content = Get-Content $wxsPath
@@ -25,24 +25,53 @@ function SetMsiVersion([string]$FilePath, [string]$MsiVersion)
 
 function SetMsiReleaseString([string]$FilePath, [string]$MsiRelease)
 { 
-    $wxsPath = Join-Path $FilePath "azurecmd.wxs"
+    $wxsPath = Join-Path $FilePath "setup\azurecmd.wxs"
 
     Write-Output "Updating File: $wxsPath"   
     $content = Get-Content $wxsPath
     $matches = ([regex]::matches($content, '\<\?define productName="Microsoft Azure PowerShell - ([a-zA-z]+\s[\d]+)" \?\>'))
 
     $prevousVersion = $matches.Groups[1].Value
-    Write-Output "Found: $prevousVersion"
 
     $content = $content.Replace("<?define productName=`"Microsoft Azure PowerShell - $prevousVersion`" ?>", "<?define productName=`"Microsoft Azure PowerShell - $MsiRelease`" ?>")
 
     Set-Content -Path $wxsPath -Value $content -Encoding UTF8
 }
 
+function AlignAsmPsdReleaseVersion([string]$FilePath, [string]$MsiVersion)
+{
+    $psd1Path = Join-Path $FilePath "src\ServiceManagement\Services\Commands.Utilities\Azure.psd1"
+
+    $content = Get-Content $psd1Path
+    $matches = ([regex]::matches($content, "ModuleVersion = '([\d\.]+)'\s+"))
+
+    $packageVersion = $matches.Groups[1].Value
+    Write-Output "Updating version of $psd1Path from $packageVersion to $MsiVersion"
+    $content = $content.Replace("ModuleVersion = '$packageVersion'", "ModuleVersion = '$MsiVersion'")
+    
+    Set-Content -Path $psd1Path -Value $content -Encoding UTF8
+}
+
+function AlignArmPsdReleaseVersion([string]$FilePath, [string]$MsiVersion)
+{
+    $psd1Path = Join-Path $FilePath "tools\AzureRM\AzureRM.psd1"
+
+    $content = Get-Content $psd1Path
+    $matches = ([regex]::matches($content, "ModuleVersion = '([\d\.]+)'\s+"))
+
+    $packageVersion = $matches.Groups[1].Value
+    Write-Output "Updating version of $psd1Path from $packageVersion to $MsiVersion"
+    $content = $content.Replace("ModuleVersion = '$packageVersion'", "ModuleVersion = '$MsiVersion'")
+    
+    Set-Content -Path $psd1Path -Value $content -Encoding UTF8
+}
+
 if (!$Folder) 
 {
-    $Folder = "$PSScriptRoot\..\setup"
+    $Folder = "$PSScriptRoot\.."
 }
 
 SetMsiVersion $Folder $Version
-SetMsiReleaseString $Folder $Release
+SetMsiReleaseString $Folder $Release
+AlignAsmPsdReleaseVersion $Folder $Version
+AlignArmPsdReleaseVersion $Folder $Version