From dc5e7be8b3810510ef2948d38c66a4c98501c229 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 5 May 2021 19:01:35 -0500 Subject: Update WixBA to Mba.Core 4.0.35. --- src/WixToolset.WixBA/InstallationViewModel.cs | 4 ++-- src/WixToolset.WixBA/Model.cs | 14 +++++++------- src/WixToolset.WixBA/WixToolset.WixBA.csproj | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/WixToolset.WixBA/InstallationViewModel.cs b/src/WixToolset.WixBA/InstallationViewModel.cs index 1ccb2485..c7b736ff 100644 --- a/src/WixToolset.WixBA/InstallationViewModel.cs +++ b/src/WixToolset.WixBA/InstallationViewModel.cs @@ -329,7 +329,7 @@ namespace WixToolset.WixBA { if (this.openLogCommand == null) { - this.openLogCommand = new RelayCommand(param => WixBA.OpenLog(new Uri(WixBA.Model.Engine.StringVariables["WixBundleLog"]))); + this.openLogCommand = new RelayCommand(param => WixBA.OpenLog(new Uri(WixBA.Model.Engine.GetVariableString("WixBundleLog")))); } return this.openLogCommand; } @@ -341,7 +341,7 @@ namespace WixToolset.WixBA { if (this.openLogFolderCommand == null) { - string logFolder = IO.Path.GetDirectoryName(WixBA.Model.Engine.StringVariables["WixBundleLog"]); + string logFolder = IO.Path.GetDirectoryName(WixBA.Model.Engine.GetVariableString("WixBundleLog")); this.openLogFolderCommand = new RelayCommand(param => WixBA.OpenLogFolder(logFolder)); } return this.openLogFolderCommand; diff --git a/src/WixToolset.WixBA/Model.cs b/src/WixToolset.WixBA/Model.cs index 02d329d4..8c5f7082 100644 --- a/src/WixToolset.WixBA/Model.cs +++ b/src/WixToolset.WixBA/Model.cs @@ -27,7 +27,7 @@ namespace WixToolset.WixBA this.Command = bootstrapper.Command; this.Engine = bootstrapper.Engine; this.Telemetry = new List>(); - this.Version = this.Engine.VersionVariables[BurnBundleVersionVariable]; + this.Version = this.Engine.GetVariableVersion(BurnBundleVersionVariable); } public IBootstrapperApplicationData BAManifest { get; } @@ -69,17 +69,17 @@ namespace WixToolset.WixBA { get { - if (!this.Engine.StringVariables.Contains(BurnBundleInstallDirectoryVariable)) + if (!this.Engine.ContainsVariable(BurnBundleInstallDirectoryVariable)) { return null; } - return this.Engine.StringVariables[BurnBundleInstallDirectoryVariable]; + return this.Engine.GetVariableString(BurnBundleInstallDirectoryVariable); } set { - this.Engine.StringVariables[BurnBundleInstallDirectoryVariable] = value; + this.Engine.SetVariable(BurnBundleInstallDirectoryVariable, value, false); } } @@ -90,17 +90,17 @@ namespace WixToolset.WixBA { get { - if (!this.Engine.StringVariables.Contains(BurnBundleLayoutDirectoryVariable)) + if (!this.Engine.ContainsVariable(BurnBundleLayoutDirectoryVariable)) { return null; } - return this.Engine.StringVariables[BurnBundleLayoutDirectoryVariable]; + return this.Engine.GetVariableString(BurnBundleLayoutDirectoryVariable); } set { - this.Engine.StringVariables[BurnBundleLayoutDirectoryVariable] = value; + this.Engine.SetVariable(BurnBundleLayoutDirectoryVariable, value, false); } } diff --git a/src/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj index f0fc32dd..f4fc803d 100644 --- a/src/WixToolset.WixBA/WixToolset.WixBA.csproj +++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj @@ -41,6 +41,6 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb