diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-04 17:55:17 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-05 16:22:04 -0600 |
| commit | e027c6c571a4bc8c818244e2b0c5015eb4ef3110 (patch) | |
| tree | 8149aa491766bfe8a883f921831a52133abceea5 /src/test/burn/WixToolset.WixBA | |
| parent | baf09c19c5a0f0d3f9533f9084f094066c1be7d9 (diff) | |
| download | wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.gz wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.tar.bz2 wix-e027c6c571a4bc8c818244e2b0c5015eb4ef3110.zip | |
Change ARP property Installed to 0 when registrationType is InProgress.
Being registered in ARP and "installed" were always separate concepts, and some things like fEligibleForCleanup were looking at the wrong thing. This also allows the BA to tell the difference.
Diffstat (limited to 'src/test/burn/WixToolset.WixBA')
| -rw-r--r-- | src/test/burn/WixToolset.WixBA/InstallationViewModel.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs index e056b943..3a71779a 100644 --- a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs +++ b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs | |||
| @@ -53,9 +53,9 @@ namespace WixToolset.WixBA | |||
| 53 | /// </summary> | 53 | /// </summary> |
| 54 | public class InstallationViewModel : PropertyNotifyBase | 54 | public class InstallationViewModel : PropertyNotifyBase |
| 55 | { | 55 | { |
| 56 | private RootViewModel root; | 56 | private readonly RootViewModel root; |
| 57 | 57 | ||
| 58 | private Dictionary<string, int> downloadRetries; | 58 | private readonly Dictionary<string, int> downloadRetries; |
| 59 | private bool downgrade; | 59 | private bool downgrade; |
| 60 | private string downgradeMessage; | 60 | private string downgradeMessage; |
| 61 | 61 | ||
| @@ -407,7 +407,7 @@ namespace WixToolset.WixBA | |||
| 407 | 407 | ||
| 408 | private void DetectBegin(object sender, DetectBeginEventArgs e) | 408 | private void DetectBegin(object sender, DetectBeginEventArgs e) |
| 409 | { | 409 | { |
| 410 | this.root.DetectState = e.Installed ? DetectionState.Present : DetectionState.Absent; | 410 | this.root.DetectState = RegistrationType.Full == e.RegistrationType ? DetectionState.Present : DetectionState.Absent; |
| 411 | WixBA.Model.PlannedAction = LaunchAction.Unknown; | 411 | WixBA.Model.PlannedAction = LaunchAction.Unknown; |
| 412 | } | 412 | } |
| 413 | 413 | ||