From 18fef93c490d4cce306b862d6146e29eb51cdf93 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Jun 2020 13:28:33 -0700 Subject: [PATCH 1/6] Add diagnostics --- tools/packaging/packaging.psm1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index a9c56d19534..6b5510c165b 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -2984,6 +2984,7 @@ function New-MSIPackage Write-Verbose "Place dependencies such as icons to $assetsInSourcePath" Copy-Item "$AssetsPath\*.ico" $assetsInSourcePath -Force + Get-ChildItem $assetsInSourcePath -Recurse | Out-String | Write-Verbose -Verbose $productVersionWithName = $ProductName + '_' + $ProductVersion $productSemanticVersionWithName = $ProductName + '-' + $ProductSemanticVersion @@ -3060,6 +3061,7 @@ function New-MSIPackage Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixCandleExePath "$ProductWxsPath" "$FilesWxsPath" -out (Join-Path "$env:Temp" "\\") -ext WixUIExtension -ext WixUtilExtension -arch $ProductTargetArchitecture -dIsPreview="$isPreview" -v} Write-Log "running light..." + Get-ChildItem $assetsInSourcePath -Recurse | Out-String | Write-Verbose -Verbose # suppress ICE61, because we allow same version upgrades # suppress ICE57, this suppresses an error caused by our shortcut not being installed per user Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $wixObjProductPath $wixObjFragmentPath -ext WixUIExtension -ext WixUtilExtension } From bf5776eed8c44ebb683811c173cca6ba31bc29c3 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Jun 2020 13:45:17 -0700 Subject: [PATCH 2/6] Add diagnostics --- tools/packaging/packaging.psm1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 6b5510c165b..8c8fce7faa1 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -3042,6 +3042,11 @@ function New-MSIPackage # We are verifying that the generated $wixFragmentPath and $FilesWxsPath are functionally the same Test-FileWxs -FilesWxsPath $FilesWxsPath -HeatFilesWxsPath $wixFragmentPath + Write-Log -message "uploading generated files wxs $wixFragmentPath" + if ($env:TF_BUILD) + { + Write-Host "##vso[artifact.upload containerfolder=wix;artifactname=wix]$wixFragmentPath" + } if ($isPreview) { @@ -3066,7 +3071,7 @@ function New-MSIPackage # suppress ICE57, this suppresses an error caused by our shortcut not being installed per user Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $wixObjProductPath $wixObjFragmentPath -ext WixUIExtension -ext WixUtilExtension } - Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force + #Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force Remove-Item -ErrorAction SilentlyContinue $wixObjProductPath -Force Remove-Item -ErrorAction SilentlyContinue $wixObjFragmentPath -Force From 05ada1c7a056c605d34e9e3db6756fc55bc2f813 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Jun 2020 13:56:24 -0700 Subject: [PATCH 3/6] add icons --- tools/packaging/packaging.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 8c8fce7faa1..9a2868c3b6f 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -2973,13 +2973,13 @@ function New-MSIPackage $simpleProductVersion += '-preview' } - $assetsInSourcePath = Join-Path $ProductSourcePath 'assets' - $staging = "$PSScriptRoot/staging" New-StagingFolder -StagingPath $staging -PackageSourcePath $ProductSourcePath Get-ChildItem $staging -Filter *.pdb -Recurse | Remove-Item -Force + $assetsInSourcePath = Join-Path $staging 'assets' + New-Item $assetsInSourcePath -type directory -Force | Write-Verbose Write-Verbose "Place dependencies such as icons to $assetsInSourcePath" From 0b00611ab8b22645f909875f4b6c0cc5f3828205 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Jun 2020 14:56:26 -0700 Subject: [PATCH 4/6] add icons --- assets/files.wxs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/assets/files.wxs b/assets/files.wxs index 2420352c008..d42bb18cea0 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -1956,6 +1956,18 @@ + + + + + + + + + + + + @@ -4103,6 +4115,10 @@ + + + + From 384014653be6dd0d24170d5b69ab085234cb4cfa Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Jun 2020 14:57:11 -0700 Subject: [PATCH 5/6] Revert "Add diagnostics" This reverts commit 18fef93c490d4cce306b862d6146e29eb51cdf93. --- tools/packaging/packaging.psm1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 9a2868c3b6f..874aa19d154 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -2984,7 +2984,6 @@ function New-MSIPackage Write-Verbose "Place dependencies such as icons to $assetsInSourcePath" Copy-Item "$AssetsPath\*.ico" $assetsInSourcePath -Force - Get-ChildItem $assetsInSourcePath -Recurse | Out-String | Write-Verbose -Verbose $productVersionWithName = $ProductName + '_' + $ProductVersion $productSemanticVersionWithName = $ProductName + '-' + $ProductSemanticVersion @@ -3066,7 +3065,6 @@ function New-MSIPackage Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixCandleExePath "$ProductWxsPath" "$FilesWxsPath" -out (Join-Path "$env:Temp" "\\") -ext WixUIExtension -ext WixUtilExtension -arch $ProductTargetArchitecture -dIsPreview="$isPreview" -v} Write-Log "running light..." - Get-ChildItem $assetsInSourcePath -Recurse | Out-String | Write-Verbose -Verbose # suppress ICE61, because we allow same version upgrades # suppress ICE57, this suppresses an error caused by our shortcut not being installed per user Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $wixObjProductPath $wixObjFragmentPath -ext WixUIExtension -ext WixUtilExtension } From 48aebe8f7752229ae2bcb4bde1acf48fe81aeb59 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 17 Jun 2020 14:57:17 -0700 Subject: [PATCH 6/6] Revert "Add diagnostics" This reverts commit bf5776eed8c44ebb683811c173cca6ba31bc29c3. --- tools/packaging/packaging.psm1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 874aa19d154..d3b5d8b5590 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -3041,11 +3041,6 @@ function New-MSIPackage # We are verifying that the generated $wixFragmentPath and $FilesWxsPath are functionally the same Test-FileWxs -FilesWxsPath $FilesWxsPath -HeatFilesWxsPath $wixFragmentPath - Write-Log -message "uploading generated files wxs $wixFragmentPath" - if ($env:TF_BUILD) - { - Write-Host "##vso[artifact.upload containerfolder=wix;artifactname=wix]$wixFragmentPath" - } if ($isPreview) { @@ -3069,7 +3064,7 @@ function New-MSIPackage # suppress ICE57, this suppresses an error caused by our shortcut not being installed per user Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $wixObjProductPath $wixObjFragmentPath -ext WixUIExtension -ext WixUtilExtension } - #Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force + Remove-Item -ErrorAction SilentlyContinue $wixFragmentPath -Force Remove-Item -ErrorAction SilentlyContinue $wixObjProductPath -Force Remove-Item -ErrorAction SilentlyContinue $wixObjFragmentPath -Force