aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-05 19:01:35 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-11 19:11:19 -0500
commitdc5e7be8b3810510ef2948d38c66a4c98501c229 (patch)
treee5e40aac54f1f7289cc602d542abae81e27ff9d3
parent42170f18cf21e6ac018b264f88eab104eacfe6ab (diff)
downloadwix-dc5e7be8b3810510ef2948d38c66a4c98501c229.tar.gz
wix-dc5e7be8b3810510ef2948d38c66a4c98501c229.tar.bz2
wix-dc5e7be8b3810510ef2948d38c66a4c98501c229.zip
Update WixBA to Mba.Core 4.0.35.
-rw-r--r--src/WixToolset.WixBA/InstallationViewModel.cs4
-rw-r--r--src/WixToolset.WixBA/Model.cs14
-rw-r--r--src/WixToolset.WixBA/WixToolset.WixBA.csproj2
3 files changed, 10 insertions, 10 deletions
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
329 { 329 {
330 if (this.openLogCommand == null) 330 if (this.openLogCommand == null)
331 { 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 } 333 }
334 return this.openLogCommand; 334 return this.openLogCommand;
335 } 335 }
@@ -341,7 +341,7 @@ namespace WixToolset.WixBA
341 { 341 {
342 if (this.openLogFolderCommand == null) 342 if (this.openLogFolderCommand == null)
343 { 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)); 345 this.openLogFolderCommand = new RelayCommand(param => WixBA.OpenLogFolder(logFolder));
346 } 346 }
347 return this.openLogFolderCommand; 347 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
27 this.Command = bootstrapper.Command; 27 this.Command = bootstrapper.Command;
28 this.Engine = bootstrapper.Engine; 28 this.Engine = bootstrapper.Engine;
29 this.Telemetry = new List<KeyValuePair<string, string>>(); 29 this.Telemetry = new List<KeyValuePair<string, string>>();
30 this.Version = this.Engine.VersionVariables[BurnBundleVersionVariable]; 30 this.Version = this.Engine.GetVariableVersion(BurnBundleVersionVariable);
31 } 31 }
32 32
33 public IBootstrapperApplicationData BAManifest { get; } 33 public IBootstrapperApplicationData BAManifest { get; }
@@ -69,17 +69,17 @@ namespace WixToolset.WixBA
69 { 69 {
70 get 70 get
71 { 71 {
72 if (!this.Engine.StringVariables.Contains(BurnBundleInstallDirectoryVariable)) 72 if (!this.Engine.ContainsVariable(BurnBundleInstallDirectoryVariable))
73 { 73 {
74 return null; 74 return null;
75 } 75 }
76 76
77 return this.Engine.StringVariables[BurnBundleInstallDirectoryVariable]; 77 return this.Engine.GetVariableString(BurnBundleInstallDirectoryVariable);
78 } 78 }
79 79
80 set 80 set
81 { 81 {
82 this.Engine.StringVariables[BurnBundleInstallDirectoryVariable] = value; 82 this.Engine.SetVariable(BurnBundleInstallDirectoryVariable, value, false);
83 } 83 }
84 } 84 }
85 85
@@ -90,17 +90,17 @@ namespace WixToolset.WixBA
90 { 90 {
91 get 91 get
92 { 92 {
93 if (!this.Engine.StringVariables.Contains(BurnBundleLayoutDirectoryVariable)) 93 if (!this.Engine.ContainsVariable(BurnBundleLayoutDirectoryVariable))
94 { 94 {
95 return null; 95 return null;
96 } 96 }
97 97
98 return this.Engine.StringVariables[BurnBundleLayoutDirectoryVariable]; 98 return this.Engine.GetVariableString(BurnBundleLayoutDirectoryVariable);
99 } 99 }
100 100
101 set 101 set
102 { 102 {
103 this.Engine.StringVariables[BurnBundleLayoutDirectoryVariable] = value; 103 this.Engine.SetVariable(BurnBundleLayoutDirectoryVariable, value, false);
104 } 104 }
105 } 105 }
106 106
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 @@
41 </ItemGroup> 41 </ItemGroup>
42 <ItemGroup> 42 <ItemGroup>
43 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" /> 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> 45 </ItemGroup>
46</Project> \ No newline at end of file 46</Project> \ No newline at end of file