Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into feature/merge #3171

Merged
merged 40 commits into from
Jul 12, 2023
Merged

Merge master into feature/merge #3171

merged 40 commits into from
Jul 12, 2023

Conversation

kc284
Copy link
Contributor

@kc284 kc284 commented Jul 12, 2023

No description provided.

danilo-delbusso and others added 30 commits April 21, 2023 11:44
When an instance of XenCenter is already running, the installer shows the `MsiRMFilesInUse` fragment. Pressing OK within that fragment with the `WixUIRMOption` property set to `UseRM` means that the `RMShutdownAndRestart` event kicks in at the end of the installation.

This happens at the same time as the existing "Launch XenCenter" event (if the matching checkbox is checked), causing in the executable being started twice at about the same time. My guess is that the pipe system is not initialised at that point, and that's how we get two applications.

To avoid this, this commit adds a new custom property: `XS_WixUIRMPressedOk`. This is set to `1` when the user clicks OK on the `WixUIRMOption`. It allows us to know whether or not that dialog was shown at all, as checking `WixUIRMOption` is not possible (it's already set to `UseRM` by default). By checking the value of this property we prevent the "Launch XenCenter" option to be shown if `MsiRMFilesInUse` was shown to the user (and they clicked OK). This applies both in case of a repair and an upgrade from a previous version.

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
The text shown is the `Text` property of the `OptionalCheckBox` control

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Adds a new field in `SelectMultipleVMDestinationPage`: `AllSelectedTargets`.

This new field contains a list of all hosts that have been selected. This way `ImportSelectHostPage` can check for each `Host` that has been selected individually and add more relevant messages

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
…ngUpgradeWizardPrecheckPage`

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
… `Check`

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Also:
- Remove unused `button_click` event handler in `AcceptEuaDialog`
- Load EUAs within the `UpgradeRequiresEua` `Check` and removed the spinner from `AcceptEuaDialog`
- Remove `_errors` from `AcceptEuaDialog`

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Also:
- Add `HostDoesNotHaveHotfixWarning` warning to EUA `Check` when necessary
- Filter our `null` EUAs before passing them to the `Problem`

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
- Ensure `UpgradeRequiresEUA` runs for Yangtze or greater hosts
- Group non-manual checks in same if block
- Remove unused field in `EuaNotFoundProblem`

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
…ion` is null

Applies to newly added EUA presence problem

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
…and layout tweaks:

- The checkbox should be above the credential textboxes.
- Some controls were not aligned correctly.
- Place the controls in tableLayout panels.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
…vTPMs as OVF/OVA packages.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
…des to 8.2 CU1 or below

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
…s are missing

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
danilo-delbusso and others added 10 commits July 4, 2023 08:57
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
CA-379402: Fix EUA check & add hotfix check to `HostMemoryPostUpgradeCheck`
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
Also update spacing of controls within the `CustomizeDlg` to take more advantage of the available space

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
…g with Wix installer

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
CA-376480, CA-374325, & CA-378489: Prevent two instances from starting after running installer; Add desktop shortcut option; Remove existing shortcuts
CP-43770: Removed images from the WLB credentials dialog (plus some refactoring and layout tweaks)
… Session constructors.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
@CitrixChris CitrixChris added the 1 approval PR has been approved by one reviewer label Jul 12, 2023
@danilo-delbusso danilo-delbusso added 2 approvals PR has been approved by two reviewers and removed 1 approval PR has been approved by one reviewer labels Jul 12, 2023
@kc284 kc284 merged commit 9950996 into feature/merge Jul 12, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2 approvals PR has been approved by two reviewers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants