Skip to content

Fix issue that MSI version is incorrect #11997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 28, 2020
Merged

Fix issue that MSI version is incorrect #11997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d04d19e
Fix bug that other psd1 file is not updated when current module versi…
dingmeng-xue May 26, 2020
3fa7638
Fix MSI version label
dingmeng-xue May 26, 2020
e82d123
Merge remote-tracking branch 'upstream/release-2020-06-02' into release2
dingmeng-xue May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup/generate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/RunVersionController.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) | % {
Expand Down