From bfd0eeddbbdec0348f43e47c36dedf4a23e9a927 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 15 Feb 2019 22:01:57 -0600 Subject: WIXFEAT:3815 - use interfaces added in BootstrapperCore. --- src/WixToolset.WixBA/InstallationViewModel.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.WixBA/InstallationViewModel.cs') 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 this.Downgrade = true; } - if (!WixBA.Model.Bootstrapper.BAManifest.Bundle.Packages.ContainsKey(e.ProductCode)) + if (!WixBA.Model.BAManifest.Bundle.Packages.ContainsKey(e.ProductCode)) { - WixBA.Model.Bootstrapper.BAManifest.Bundle.AddRelatedBundleAsPackage(e); + WixBA.Model.BAManifest.Bundle.AddRelatedBundleAsPackage(e); } } @@ -426,8 +426,8 @@ namespace WixToolset.WixBA if (this.Downgrade) { this.root.DetectState = DetectionState.Newer; - IEnumerable relatedPackages = WixBA.Model.Bootstrapper.BAManifest.Bundle.Packages.Values.Where(p => p.Type == PackageType.UpgradeBundle); - Version installedVersion = relatedPackages.Any() ? new Version(relatedPackages.Max(p => p.Version)) : null; + var relatedPackages = WixBA.Model.BAManifest.Bundle.Packages.Values.Where(p => p.Type == PackageType.UpgradeBundle); + var installedVersion = relatedPackages.Any() ? new Version(relatedPackages.Max(p => p.Version)) : null; if (installedVersion != null && installedVersion < new Version(4, 1) && installedVersion.Build > 10) { this.DowngradeMessage = "You must uninstall WiX v" + installedVersion + " before you can install this."; @@ -641,7 +641,7 @@ namespace WixToolset.WixBA private void ParseCommandLine() { // Get array of arguments based on the system parsing algorithm. - string[] args = WixBA.Model.Command.GetCommandLineArgs(); + string[] args = WixBA.Model.Command.CommandLineArgs; for (int i = 0; i < args.Length; ++i) { if (args[i].StartsWith("InstallFolder=", StringComparison.InvariantCultureIgnoreCase)) -- cgit v1.2.3-55-g6feb