Some more corrections. #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Konstantina Chremmou <[email protected]>
kc284
commented
Oct 30, 2023
| } | ||
| else | ||
| { | ||
| string outputPathAndFileName; | ||
| using (var saveSourceDialog = new SaveFileDialog()) | ||
| { | ||
| saveSourceDialog.FileName = string.Format(Messages.SOURCE_FILE_NAME, BrandManager.BrandConsole, clientVersion.Version) + ".zip"; | ||
| saveSourceDialog.FileName = $"{BrandManager.BrandConsole}-v{clientVersion.Version}-source.zip"; |
There was a problem hiding this comment.
I think we should not localise this because it is the filename of the deliverable as we publish it on the website. If the users want, they can always change the name when they save it.
kc284
commented
Oct 30, 2023
| dlg.ShowDialog(parent); | ||
| } | ||
|
|
||
| if (!downloadSourceAction.Succeeded) |
There was a problem hiding this comment.
This check is not needed since we don't do anything in case od success; the method will return anyway.
kc284
commented
Oct 30, 2023
| @@ -114,8 +113,6 @@ static BrandManager() | |||
|
|
|||
| public static readonly string CfuUrl; | |||
|
|
|||
| public static readonly string SourceUrl; | |||
kc284
commented
Oct 30, 2023
| $prodXml = [string]::Format($xmlFormat, $productFullName, $date, $msi_url, $msi_checksum, $productVersion) | ||
| $testXml = [string]::Format($xmlFormat, $productFullName, $date, "@DEV_MSI_URL_PLACEHOLDER@", $msi_checksum, $productVersion) | ||
| $prodXml = [string]::Format($xmlFormat, $productFullName, $date, $msi_url, $msi_checksum, $productVersion, $source_url) | ||
| $testXml = [string]::Format($xmlFormat, $productFullName, $date, "@DEV_MSI_URL_PLACEHOLDER@", $msi_checksum, $productVersion, "@DEV_SRC_URL_PLACEHOLDER@") |
There was a problem hiding this comment.
I believe we need a placeholer for this too for testing.
kc284
commented
Oct 30, 2023
| @@ -334,10 +334,8 @@ $bomLessEncoding = New-Object System.Text.UTF8Encoding $false | |||
|
|
|||
| Write-Host "INFO: Generating XCUpdates.xml" | |||
|
|
|||
| [string]::Format($xmlFormat, $productFullName, $date, $msi_url, $msi_checksum, $productVersion, $source_url) |` | |||
There was a problem hiding this comment.
This was regressing to that issue we had the BOM character that was corrupting the file.
There was a problem hiding this comment.
Apologies that came from a conflict on the rebase, picked the wrong file to use
CitrixChris
approved these changes
Oct 30, 2023
CitrixChris
merged commit ed71d8e
into
CitrixChris:CP-40844-xc-source-download
1 check passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.