From d04d19ef4d73dd2764f1e4b1354e6b983114ffd9 Mon Sep 17 00:00:00 2001
From: "dixue@microsoft.com" <dixue@microsoft.com>
Date: Tue, 26 May 2020 17:51:13 +0800
Subject: [PATCH 1/2] Fix bug that other psd1 file is not updated when current
 module version is changed

---
 tools/VersionController/Models/VersionFileHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/VersionController/Models/VersionFileHelper.cs b/tools/VersionController/Models/VersionFileHelper.cs
index f20c8b899142..8a637952bddd 100644
--- a/tools/VersionController/Models/VersionFileHelper.cs
+++ b/tools/VersionController/Models/VersionFileHelper.cs
@@ -17,7 +17,7 @@ public VersionFileHelper(string rootDirectory, string outputModuleManifestPath,
 
             _outputDirectories = new List<string>{ DebugDirectory };
 
-            _projectDirectories = new List<string>{ SrcDirectory };
+            _projectDirectories = new List<string>{ Path.Combine(RootDirectory, @"src") };
         }
 
         public string RootDirectory { get; set; }

From 3fa76389adfba0f3ec74f474722421c4e47f0d7c Mon Sep 17 00:00:00 2001
From: "dixue@microsoft.com" <dixue@microsoft.com>
Date: Tue, 26 May 2020 22:36:10 +0800
Subject: [PATCH 2/2] Fix MSI version label

---
 setup/generate.ps1             | 2 +-
 tools/RunVersionController.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/generate.ps1 b/setup/generate.ps1
index 5408f8c6fcf1..738783431bba 100644
--- a/setup/generate.ps1
+++ b/setup/generate.ps1
@@ -37,7 +37,7 @@ if( (-not (get-command -ea 0 light)) -or (-not (get-command -ea 0 heat)) -or (-n
 $outputName ="Az-Cmdlets"
 
 # generate the product name from the current month/year.
-$productName = "Microsoft Azure PowerShell - $((Get-Culture).DateTimeFormat.GetMonthName((get-date).month)) $((get-date).year)"
+$productName = "Microsoft Azure PowerShell - May 2020"
 
 # where to put temp files
 $tmp = Join-Path $env:temp azure-cmdlets-tmp
diff --git a/tools/RunVersionController.ps1 b/tools/RunVersionController.ps1
index 91538bc41a36..a197f2044fb4 100644
--- a/tools/RunVersionController.ps1
+++ b/tools/RunVersionController.ps1
@@ -96,9 +96,9 @@ function Update-AzurecmdFile
         [string]$RootPath
     )
 
-    $AzurecmdFile = Get-Item -Path "$RootPath\setup\azurecmd.wxs"
+    $AzurecmdFile = Get-Item -Path "$RootPath\setup\generate.ps1"
     (Get-Content $AzurecmdFile.FullName) | % {
-        $_ -replace "Microsoft Azure PowerShell - (\w*)(\s)(\w*)", "Microsoft Azure PowerShell - $Release"
+        $_ -replace "Microsoft Azure PowerShell - (\w*)(\s)(\d*)", "Microsoft Azure PowerShell - $Release"
     } | Set-Content -Path $AzurecmdFile.FullName -Encoding UTF8
 
     (Get-Content $AzurecmdFile.FullName) | % {