diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-02-15 22:01:57 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-05-11 19:11:19 -0500 |
| commit | bfd0eeddbbdec0348f43e47c36dedf4a23e9a927 (patch) | |
| tree | 9a46b6085cf508a4f87c4967771871452604e333 /src/WixToolset.WixBA/InstallationViewModel.cs | |
| parent | 22263a6a6ca49222d9c46acf8e99a68ffc699a54 (diff) | |
| download | wix-bfd0eeddbbdec0348f43e47c36dedf4a23e9a927.tar.gz wix-bfd0eeddbbdec0348f43e47c36dedf4a23e9a927.tar.bz2 wix-bfd0eeddbbdec0348f43e47c36dedf4a23e9a927.zip | |
WIXFEAT:3815 - use interfaces added in BootstrapperCore.
Diffstat (limited to 'src/WixToolset.WixBA/InstallationViewModel.cs')
| -rw-r--r-- | src/WixToolset.WixBA/InstallationViewModel.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.WixBA/InstallationViewModel.cs b/src/WixToolset.WixBA/InstallationViewModel.cs index 35510db4..33b14810 100644 --- a/src/WixToolset.WixBA/InstallationViewModel.cs +++ b/src/WixToolset.WixBA/InstallationViewModel.cs | |||
| @@ -403,9 +403,9 @@ namespace WixToolset.WixBA | |||
| 403 | this.Downgrade = true; | 403 | this.Downgrade = true; |
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | if (!WixBA.Model.Bootstrapper.BAManifest.Bundle.Packages.ContainsKey(e.ProductCode)) | 406 | if (!WixBA.Model.BAManifest.Bundle.Packages.ContainsKey(e.ProductCode)) |
| 407 | { | 407 | { |
| 408 | WixBA.Model.Bootstrapper.BAManifest.Bundle.AddRelatedBundleAsPackage(e); | 408 | WixBA.Model.BAManifest.Bundle.AddRelatedBundleAsPackage(e); |
| 409 | } | 409 | } |
| 410 | } | 410 | } |
| 411 | 411 | ||
| @@ -426,8 +426,8 @@ namespace WixToolset.WixBA | |||
| 426 | if (this.Downgrade) | 426 | if (this.Downgrade) |
| 427 | { | 427 | { |
| 428 | this.root.DetectState = DetectionState.Newer; | 428 | this.root.DetectState = DetectionState.Newer; |
| 429 | IEnumerable<PackageInfo> relatedPackages = WixBA.Model.Bootstrapper.BAManifest.Bundle.Packages.Values.Where(p => p.Type == PackageType.UpgradeBundle); | 429 | var relatedPackages = WixBA.Model.BAManifest.Bundle.Packages.Values.Where(p => p.Type == PackageType.UpgradeBundle); |
| 430 | Version installedVersion = relatedPackages.Any() ? new Version(relatedPackages.Max(p => p.Version)) : null; | 430 | var installedVersion = relatedPackages.Any() ? new Version(relatedPackages.Max(p => p.Version)) : null; |
| 431 | if (installedVersion != null && installedVersion < new Version(4, 1) && installedVersion.Build > 10) | 431 | if (installedVersion != null && installedVersion < new Version(4, 1) && installedVersion.Build > 10) |
| 432 | { | 432 | { |
| 433 | this.DowngradeMessage = "You must uninstall WiX v" + installedVersion + " before you can install this."; | 433 | this.DowngradeMessage = "You must uninstall WiX v" + installedVersion + " before you can install this."; |
| @@ -641,7 +641,7 @@ namespace WixToolset.WixBA | |||
| 641 | private void ParseCommandLine() | 641 | private void ParseCommandLine() |
| 642 | { | 642 | { |
| 643 | // Get array of arguments based on the system parsing algorithm. | 643 | // Get array of arguments based on the system parsing algorithm. |
| 644 | string[] args = WixBA.Model.Command.GetCommandLineArgs(); | 644 | string[] args = WixBA.Model.Command.CommandLineArgs; |
| 645 | for (int i = 0; i < args.Length; ++i) | 645 | for (int i = 0; i < args.Length; ++i) |
| 646 | { | 646 | { |
| 647 | if (args[i].StartsWith("InstallFolder=", StringComparison.InvariantCultureIgnoreCase)) | 647 | if (args[i].StartsWith("InstallFolder=", StringComparison.InvariantCultureIgnoreCase)) |
