aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-05 19:16:10 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-11 19:11:19 -0500
commit3afcdb255803a747447d2770b56019d5d144d443 (patch)
tree27c05d9d428418b2f52652580dd1ce275795a09b
parentdc5e7be8b3810510ef2948d38c66a4c98501c229 (diff)
downloadwix-3afcdb255803a747447d2770b56019d5d144d443.tar.gz
wix-3afcdb255803a747447d2770b56019d5d144d443.tar.bz2
wix-3afcdb255803a747447d2770b56019d5d144d443.zip
Update WixBA to Mba.Core 4.0.40.
-rw-r--r--src/WixToolset.WixBA/Model.cs6
-rw-r--r--src/WixToolset.WixBA/UpdateViewModel.cs2
-rw-r--r--src/WixToolset.WixBA/WixToolset.WixBA.csproj4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.WixBA/Model.cs b/src/WixToolset.WixBA/Model.cs
index 8c5f7082..a557fa4e 100644
--- a/src/WixToolset.WixBA/Model.cs
+++ b/src/WixToolset.WixBA/Model.cs
@@ -60,7 +60,7 @@ namespace WixToolset.WixBA
60 /// <summary> 60 /// <summary>
61 /// Get the version of the install. 61 /// Get the version of the install.
62 /// </summary> 62 /// </summary>
63 public Version Version { get; private set; } 63 public string Version { get; private set; }
64 64
65 /// <summary> 65 /// <summary>
66 /// Get or set the path where the bundle is installed. 66 /// Get or set the path where the bundle is installed.
@@ -79,7 +79,7 @@ namespace WixToolset.WixBA
79 79
80 set 80 set
81 { 81 {
82 this.Engine.SetVariable(BurnBundleInstallDirectoryVariable, value, false); 82 this.Engine.SetVariableString(BurnBundleInstallDirectoryVariable, value, false);
83 } 83 }
84 } 84 }
85 85
@@ -100,7 +100,7 @@ namespace WixToolset.WixBA
100 100
101 set 101 set
102 { 102 {
103 this.Engine.SetVariable(BurnBundleLayoutDirectoryVariable, value, false); 103 this.Engine.SetVariableString(BurnBundleLayoutDirectoryVariable, value, false);
104 } 104 }
105 } 105 }
106 106
diff --git a/src/WixToolset.WixBA/UpdateViewModel.cs b/src/WixToolset.WixBA/UpdateViewModel.cs
index 445a9b1a..80d894cb 100644
--- a/src/WixToolset.WixBA/UpdateViewModel.cs
+++ b/src/WixToolset.WixBA/UpdateViewModel.cs
@@ -171,7 +171,7 @@ namespace WixToolset.WixBA
171 // or smaller than ours (we have a private build). If we really wanted to, we could leave the e.StopProcessingUpdates alone and 171 // or smaller than ours (we have a private build). If we really wanted to, we could leave the e.StopProcessingUpdates alone and
172 // enumerate all of the updates. 172 // enumerate all of the updates.
173 WixBA.Model.Engine.Log(LogLevel.Verbose, String.Format("Potential update v{0} from '{1}'; current version: v{2}", e.Version, e.UpdateLocation, WixBA.Model.Version)); 173 WixBA.Model.Engine.Log(LogLevel.Verbose, String.Format("Potential update v{0} from '{1}'; current version: v{2}", e.Version, e.UpdateLocation, WixBA.Model.Version));
174 if (e.Version > WixBA.Model.Version) 174 if (WixBA.Model.Engine.CompareVersions(e.Version, WixBA.Model.Version) > 0)
175 { 175 {
176 WixBA.Model.Engine.SetUpdate(null, e.UpdateLocation, e.Size, UpdateHashType.None, null); 176 WixBA.Model.Engine.SetUpdate(null, e.UpdateLocation, e.Size, UpdateHashType.None, null);
177 this.UpdateVersion = String.Concat("v", e.Version.ToString()); 177 this.UpdateVersion = String.Concat("v", e.Version.ToString());
diff --git a/src/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
index f4fc803d..16225233 100644
--- a/src/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -40,7 +40,7 @@
40 <Reference Include="WindowsBase" /> 40 <Reference Include="WindowsBase" />
41 </ItemGroup> 41 </ItemGroup>
42 <ItemGroup> 42 <ItemGroup>
43 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" /> 43 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
44 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.35" /> 44 <PackageReference Include="WixToolset.Mba.Core" Version="4.0.40" />
45 </ItemGroup> 45 </ItemGroup>
46</Project> \ No newline at end of file 46</Project> \ No newline at end of file