@joebigelow / wix-1 / commits / dc5e7be8

Update WixBA to Mba.Core 4.0.35.

Sean Hall committed May 5, 2021 at 19:01 UTC dc5e7be8b3810510ef2948d38c66a4c98501c229
3 files changed +10 -10
src/WixToolset.WixBA/InstallationViewModel.cs
+2 -2
@@ -329,7 +329,7 @@ namespace WixToolset.WixBA
329 {
330 if (this.openLogCommand == null)
331 {
332 - this.openLogCommand = new RelayCommand(param => WixBA.OpenLog(new Uri(WixBA.Model.Engine.StringVariables["WixBundleLog"])));
332 + this.openLogCommand = new RelayCommand(param => WixBA.OpenLog(new Uri(WixBA.Model.Engine.GetVariableString("WixBundleLog"))));
333 }
334 return this.openLogCommand;
335 }
@@ -341,7 +341,7 @@ namespace WixToolset.WixBA
341 {
342 if (this.openLogFolderCommand == null)
343 {
344 - string logFolder = IO.Path.GetDirectoryName(WixBA.Model.Engine.StringVariables["WixBundleLog"]);
344 + string logFolder = IO.Path.GetDirectoryName(WixBA.Model.Engine.GetVariableString("WixBundleLog"));
345 this.openLogFolderCommand = new RelayCommand(param => WixBA.OpenLogFolder(logFolder));
346 }
347 return this.openLogFolderCommand;
src/WixToolset.WixBA/Model.cs
+7 -7
@@ -27,7 +27,7 @@ namespace WixToolset.WixBA
27 this.Command = bootstrapper.Command;
28 this.Engine = bootstrapper.Engine;
29 this.Telemetry = new List<KeyValuePair<string, string>>();
30 - this.Version = this.Engine.VersionVariables[BurnBundleVersionVariable];
30 + this.Version = this.Engine.GetVariableVersion(BurnBundleVersionVariable);
31 }
32
33 public IBootstrapperApplicationData BAManifest { get; }
@@ -69,17 +69,17 @@ namespace WixToolset.WixBA
69 {
70 get
71 {
72 - if (!this.Engine.StringVariables.Contains(BurnBundleInstallDirectoryVariable))
72 + if (!this.Engine.ContainsVariable(BurnBundleInstallDirectoryVariable))
73 {
74 return null;
75 }
76
77 - return this.Engine.StringVariables[BurnBundleInstallDirectoryVariable];
77 + return this.Engine.GetVariableString(BurnBundleInstallDirectoryVariable);
78 }
79
80 set
81 {
82 - this.Engine.StringVariables[BurnBundleInstallDirectoryVariable] = value;
82 + this.Engine.SetVariable(BurnBundleInstallDirectoryVariable, value, false);
83 }
84 }
85
@@ -90,17 +90,17 @@ namespace WixToolset.WixBA
90 {
91 get
92 {
93 - if (!this.Engine.StringVariables.Contains(BurnBundleLayoutDirectoryVariable))
93 + if (!this.Engine.ContainsVariable(BurnBundleLayoutDirectoryVariable))
94 {
95 return null;
96 }
97
98 - return this.Engine.StringVariables[BurnBundleLayoutDirectoryVariable];
98 + return this.Engine.GetVariableString(BurnBundleLayoutDirectoryVariable);
99 }
100
101 set
102 {
103 - this.Engine.StringVariables[BurnBundleLayoutDirectoryVariable] = value;
103 + this.Engine.SetVariable(BurnBundleLayoutDirectoryVariable, value, false);
104 }
105 }
106
src/WixToolset.WixBA/WixToolset.WixBA.csproj
+1 -1
@@ -41,6 +41,6 @@
41 </ItemGroup>
42 <ItemGroup>
43 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" />
44 - <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
44 + <PackageReference Include="WixToolset.Mba.Core" Version="4.0.35" />
45 </ItemGroup>
46 </Project>
\ No newline at end of file