8000 MSI: Cause preview builds to install Side by side with release builds… · kalgiz/PowerShell@7c7ec24 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7c7ec24

Browse files
TravisEz13TravisEz13
authored
MSI: Cause preview builds to install Side by side with release builds (PowerShell#6301)
MSI: Cause preview builds to install Side by side with release builds - change the upgrade code if there is a preview part of the version
1 parent 8dc62af commit 7c7ec24

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

‎assets/Product.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<?define ProductCode = "$(env.ProductCode)" ?>
99
<!-- UpgradeCode GUID MUST REMAIN SAME THROUGHOUT ALL VERSIONS, otherwise, updates won't occur. -->
1010
<?if $(sys.BUILDARCH)=x64?>
11-
<?define UpgradeCode = "31ab5147-9a97-4452-8443-d9709f0516e1" ?>
11+
<?define UpgradeCode = "$(env.UpgradeCodeX64)" ?>
1212
<?define ProductSemanticVersionWithNameAndOptionalArchitecture = "$(var.ProductName) $(env.ProductSemanticVersion)"?>
1313
<?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(env.ProductSemanticVersion)"?>
1414
<?else?>
15-
<?define UpgradeCode = "1d00683b-0f84-4db8-a64f-2f98ad42fe06" ?>
15+
<?define UpgradeCode = "$(env.UpgradeCodeX86)" ?>
1616
<?define ProductSemanticVersionWithNameAndOptionalArchitecture = "$(var.ProductName) $(env.ProductSemanticVersion) ($(sys.BUILDARCH))"?>
1717
<?define ExplorerContextMenuDialogText = "&$(var.ProductName) $(env.ProductSemanticVersion) ($(sys.BUILDARCH))"?>
1818
<?endif?>

‎tools/packaging/packaging.psm1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2089,6 +2089,7 @@ function New-MSIPackage
20892089
$wixLightExePath = Join-Path $wixToolsetBinPath "Light.exe"
20902090

20912091
$ProductSemanticVersion = Get-PackageSemanticVersion -Version $ProductVersion
2092+
$isPreview = $ProductSemanticVersion -like '*-*'
20922093
$ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion
20932094

20942095
$assetsInSourcePath = Join-Path $ProductSourcePath 'assets'
@@ -2109,6 +2110,17 @@ function New-MSIPackage
21092110
[Environment]::SetEnvironmentVariable("ProductVersion", $ProductVersion, "Process")
21102111
[Environment]::SetEnvironmentVariable("ProductSemanticVersion", $ProductSemanticVersion, "Process")
21112112
[Environment]::SetEnvironmentVariable("ProductVersionWithName", $productVersionWithName, "Process")
2113+
if(!$isPreview)
2114+
{
2115+
[Environment]::SetEnvironmentVariable("UpgradeCodeX64", '31ab5147-9a97-4452-8443-d9709f0516e1', "Process")
2116+
[Environment]::SetEnvironmentVariable("UpgradeCodeX86", '1d00683b-0f84-4db8-a64f-2f98ad42fe06', "Process")
2117+
}
2118+
else
2119+
{
2120+
[Environment]::SetEnvironmentVariable("UpgradeCodeX64", '39243d76-adaf-42b1-94fb-16ecf83237c8', "Process")
2121+
[Environment]::SetEnvironmentVariable("UpgradeCodeX86", '86abcfbd-1ccc-4a88-b8b2-0facfde29094', "Process")
2122+
}
2123+
21122124
$ProductProgFilesDir = "ProgramFiles64Folder"
21132125
if ($ProductTargetArchitecture -eq "x86")
21142126
{

0 commit comments

Comments
 (0)
0