From 560ebc5a916196a32c63591824834286f75d0ade Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Thu, 7 Sep 2023 11:20:59 +0100 Subject: [PATCH 1/2] Build script corrections. Signed-off-by: Konstantina Chremmou --- scripts/xenadmin-build.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/xenadmin-build.ps1 b/scripts/xenadmin-build.ps1 index 0f00b72c4..3fef2f288 100644 --- a/scripts/xenadmin-build.ps1 +++ b/scripts/xenadmin-build.ps1 @@ -260,7 +260,7 @@ else { Write-Host "INFO: Sign script does not exist; skip signing installer" } -Copy-Item "$SCRATCH_DIR\WixInstaller\$appName.msi" $OUTPUT_DIR +Copy-Item -LiteralPath "$SCRATCH_DIR\WixInstaller\$appName.msi" $OUTPUT_DIR -Verbose:$verbose ################### # build the tests # @@ -292,17 +292,17 @@ Compress-Archive -Path $REPO\packages\*.pdb,$REPO\XenAdmin\bin\Release\*.pdb,$RE # calculate installer and source zip checksums # ################################################ -$msi_checksum = (Get-FileHash -Path "$OUTPUT_DIR\$appName.msi" -Algorithm SHA256 |` +$msi_checksum = (Get-FileHash -LiteralPath "$OUTPUT_DIR\$appName.msi" -Algorithm SHA256 |` Select-Object -ExpandProperty Hash).ToLower() -$msi_checksum | Out-File -FilePath "$OUTPUT_DIR\$appName.msi.checksum" -Encoding utf8 +$msi_checksum | Out-File -LiteralPath "$OUTPUT_DIR\$appName.msi.checksum" -Encoding utf8 Write-Host "INFO: Calculated checksum installer checksum: $msi_checksum" -$source_checksum = (Get-FileHash -Path "$OUTPUT_DIR\$appName-source.zip" -Algorithm SHA256 |` +$source_checksum = (Get-FileHash -LiteralPath "$OUTPUT_DIR\$appName-source.zip" -Algorithm SHA256 |` Select-Object -ExpandProperty Hash).ToLower() -$source_checksum | Out-File -FilePath "$OUTPUT_DIR\$appName-source.zip.checksum" -Encoding utf8 +$source_checksum | Out-File -LiteralPath "$OUTPUT_DIR\$appName-source.zip.checksum" -Encoding utf8 Write-Host "INFO: Calculated checksum source checksum: $source_checksum" @@ -325,8 +325,8 @@ $xmlFormat=@" $msi_url = $XC_UPDATES_URL -replace "XCUpdates.xml","$appName.msi" $date=(Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") -$productFullName = "$appName $productVersion" $productVersion = "$BRANDING_XC_PRODUCT_VERSION.$buildNumber" +$productFullName = "$appName $productVersion" Write-Host "INFO: Generating XCUpdates.xml" From 78073c7123f1d840a23b5b40f1065dabea96baf9 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Thu, 7 Sep 2023 15:24:20 +0100 Subject: [PATCH 2/2] Missing null check. Signed-off-by: Konstantina Chremmou --- XenAdmin/TabPages/PerformancePage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XenAdmin/TabPages/PerformancePage.cs b/XenAdmin/TabPages/PerformancePage.cs index 97ed278c1..a4531c08d 100644 --- a/XenAdmin/TabPages/PerformancePage.cs +++ b/XenAdmin/TabPages/PerformancePage.cs @@ -81,7 +81,7 @@ protected override void Dispose(bool disposing) if (disposing) { DeregisterEvents(); - _archiveMaintainer.Dispose(); + _archiveMaintainer?.Dispose(); components?.Dispose(); _disposed = true;