diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-06-29 19:14:02 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-07-02 12:50:09 -0500 |
| commit | 8cbfc326cccf8d9b3b63cb6f752fc770f7dee0fc (patch) | |
| tree | 639f70e7327cdfade62271da04aaaaae2e85cc05 /src/test/burn/WixToolset.WixBA/InstallationViewModel.cs | |
| parent | e844f12f7d7247a1e9ba4eef2a388e614001bb24 (diff) | |
| download | wix-8cbfc326cccf8d9b3b63cb6f752fc770f7dee0fc.tar.gz wix-8cbfc326cccf8d9b3b63cb6f752fc770f7dee0fc.tar.bz2 wix-8cbfc326cccf8d9b3b63cb6f752fc770f7dee0fc.zip | |
Expose overridable variable APIs in balutil and Mba.Core.
Fixes #4777
Diffstat (limited to 'src/test/burn/WixToolset.WixBA/InstallationViewModel.cs')
| -rw-r--r-- | src/test/burn/WixToolset.WixBA/InstallationViewModel.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs index 410ab110..14ea561f 100644 --- a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs +++ b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs | |||
| @@ -256,7 +256,7 @@ namespace WixToolset.WixBA | |||
| 256 | 256 | ||
| 257 | public bool IsComplete | 257 | public bool IsComplete |
| 258 | { | 258 | { |
| 259 | get { return IsSuccessfulCompletion || IsFailedCompletion; } | 259 | get { return this.IsSuccessfulCompletion || this.IsFailedCompletion; } |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | public bool IsSuccessfulCompletion | 262 | public bool IsSuccessfulCompletion |
| @@ -358,7 +358,7 @@ namespace WixToolset.WixBA | |||
| 358 | { | 358 | { |
| 359 | this.root.Canceled = false; | 359 | this.root.Canceled = false; |
| 360 | WixBA.Plan(WixBA.Model.PlannedAction); | 360 | WixBA.Plan(WixBA.Model.PlannedAction); |
| 361 | }, param => IsFailedCompletion); | 361 | }, param => this.IsFailedCompletion); |
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | return this.tryAgainCommand; | 364 | return this.tryAgainCommand; |
| @@ -456,7 +456,7 @@ namespace WixToolset.WixBA | |||
| 456 | 456 | ||
| 457 | // Force all commands to reevaluate CanExecute. | 457 | // Force all commands to reevaluate CanExecute. |
| 458 | // InvalidateRequerySuggested must be run on the UI thread. | 458 | // InvalidateRequerySuggested must be run on the UI thread. |
| 459 | root.Dispatcher.Invoke(new Action(CommandManager.InvalidateRequerySuggested)); | 459 | this.root.Dispatcher.Invoke(new Action(CommandManager.InvalidateRequerySuggested)); |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | private void PlanPackageBegin(object sender, PlanPackageBeginEventArgs e) | 462 | private void PlanPackageBegin(object sender, PlanPackageBeginEventArgs e) |
| @@ -639,7 +639,7 @@ namespace WixToolset.WixBA | |||
| 639 | WixBA.Dispatcher.BeginInvoke(new Action(WixBA.View.Close)); | 639 | WixBA.Dispatcher.BeginInvoke(new Action(WixBA.View.Close)); |
| 640 | return; | 640 | return; |
| 641 | } | 641 | } |
| 642 | else if (root.AutoClose) | 642 | else if (this.root.AutoClose) |
| 643 | { | 643 | { |
| 644 | // Automatically closing since the user clicked the X button. | 644 | // Automatically closing since the user clicked the X button. |
| 645 | WixBA.Dispatcher.BeginInvoke(new Action(WixBA.View.Close)); | 645 | WixBA.Dispatcher.BeginInvoke(new Action(WixBA.View.Close)); |
| @@ -648,13 +648,13 @@ namespace WixToolset.WixBA | |||
| 648 | 648 | ||
| 649 | // Force all commands to reevaluate CanExecute. | 649 | // Force all commands to reevaluate CanExecute. |
| 650 | // InvalidateRequerySuggested must be run on the UI thread. | 650 | // InvalidateRequerySuggested must be run on the UI thread. |
| 651 | root.Dispatcher.Invoke(new Action(CommandManager.InvalidateRequerySuggested)); | 651 | this.root.Dispatcher.Invoke(new Action(CommandManager.InvalidateRequerySuggested)); |
| 652 | } | 652 | } |
| 653 | 653 | ||
| 654 | private void ParseCommandLine() | 654 | private void ParseCommandLine() |
| 655 | { | 655 | { |
| 656 | // Get array of arguments based on the system parsing algorithm. | 656 | // Get array of arguments based on the system parsing algorithm. |
| 657 | string[] args = WixBA.Model.Command.CommandLineArgs; | 657 | string[] args = BootstrapperCommand.ParseCommandLineToArgs(WixBA.Model.Command.CommandLine); |
| 658 | for (int i = 0; i < args.Length; ++i) | 658 | for (int i = 0; i < args.Length; ++i) |
| 659 | { | 659 | { |
| 660 | if (args[i].StartsWith("InstallFolder=", StringComparison.InvariantCultureIgnoreCase)) | 660 | if (args[i].StartsWith("InstallFolder=", StringComparison.InvariantCultureIgnoreCase)) |
