maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix MSI Upgrade failure for preview builds (#9013)

Browse source
This commit is contained in:
Travis Plunk 2019-02-28 14:05:27 -08:00 committed by Travis Plunk
parent 991929ce46
commit 2a2ffd5955
No known key found for this signature in database
GPG key ID: B60A25843F0C2CD1
2 changed files with 34 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/Product.wxs
View file

@ -48,6 +48,8 @@
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Open $(env.ProductName)" />
<!-- Default value of Checkbox of starting PowerShell after installation -->
<Property Id="WixShellExecTarget" Value="[$(var.ProductDirectoryName)]pwsh.exe"/>
<!-- This changes the default setting from "reinstall if the file is a newer version" to "reinstall if the file is a different version" -->
<Property Id="REINSTALLMODE" Value="dmus"/>
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
<SetProperty Id="RegisterManifest"

59
tools/packaging/packaging.psm1
View file

@ -2646,7 +2646,6 @@ function New-MSIPackage
if ($isPreview)
{
$simpleProductVersion += '-preview'
$FilesWxsPath = New-PreviewFileWxs -FilesWxsPath $FilesWxsPath
}
$ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion
@ -2698,14 +2697,7 @@ function New-MSIPackage
$wixFragmentPath = Join-Path $env:Temp "Fragment.wxs"
$wixObjProductPath = Join-Path $env:Temp "Product.wixobj"
if ($isPreview)
{
$wixObjFragmentPath = Join-Path $env:Temp "files-preview.wixobj"
}
else
{
$wixObjFragmentPath = Join-Path $env:Temp "files.wixobj"
}
# cleanup any garbage on the system
Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force
@ -2726,8 +2718,24 @@ function New-MSIPackage
Write-Log "verifying no new files have been added or removed..."
Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixHeatExePath dir $ProductSourcePath -dr $productDirectoryName -cg $productDirectoryName -gg -sfrag -srd -scom -sreg -out $wixFragmentPath -var env.ProductSourcePath -v}
# We are verifying that the generated $wixFragmentPath and $FilesWxsPath are functionally the same
Test-FileWxs -FilesWxsPath $FilesWxsPath -HeatFilesWxsPath $wixFragmentPath
if ($isPreview)
{
# Now that we know that the two are functionally the same,
# We only need to use $FilesWxsPath for release we want to be able to Path
# and two releases shouldn't have the same identifiers,
# so we use the generated one for preview
$FilesWxsPath = $wixFragmentPath
$wixObjFragmentPath = Join-Path $env:Temp "Fragment.wixobj"
# cleanup any garbage on the system
Remove-Item -ErrorAction SilentlyContinue $wixObjFragmentPath -Force
}
Write-Log "running candle..."
Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixCandleExePath "$ProductWxsPath" "$FilesWxsPath" -out (Join-Path "$env:Temp" "\\") -ext WixUIExtension -ext WixUtilExtension -arch $ProductTargetArchitecture -v}
@ -2739,11 +2747,6 @@ function New-MSIPackage
Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force
Remove-Item -ErrorAction SilentlyContinue $wixObjProductPath -Force
Remove-Item -ErrorAction SilentlyContinue $wixObjFragmentPath -Force
if ($isPreview)
{
# remove the temporary generated files.wxs for preview builds
Remove-Item -ErrorAction SilentlyContinue $FilesWxsPath -Force
}
if ((Test-Path $msiLocationPath) -and (Test-Path $msiPdbLocationPath))
{
@ -2765,36 +2768,6 @@ function New-MSIPackage
}
}
# generate a files.wxs for preview builds
# so that the component ids are different than the stable builds
# the file is created in the temp folder
function New-PreviewFileWxs
{
param
(
# File describing the MSI file components from the asset folder
[ValidateNotNullOrEmpty()]
[ValidateScript( {Test-Path $_})]
[string] $FilesWxsPath = "$RepoRoot\assets\Files.wxs"
)
Write-Verbose "Generating new component Ids for Files-Preview.wxs" -Verbose
[xml] $filesAssetXml = Get-Content -Raw -Path $FilesWxsPath
foreach($component in $filesAssetXml.GetElementsByTagName('Component'))
{
$component.Id = $component.Id + "_Preview"
}
foreach($componentRef in $filesAssetXml.GetElementsByTagName('ComponentRef'))
{
$componentRef.Id = $componentRef.Id + "_Preview"
}
$previewFilesWxsPath = Join-Path ([System.IO.Path]::GetTempPath()) "Files-Preview.wxs"
$filesAssetXml.Save($previewFilesWxsPath)
$previewFilesWxsPath
}
# verify no files have been added or removed
# if so, write an error with details
function Test-FileWxs