From 3afcdb255803a747447d2770b56019d5d144d443 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 5 May 2021 19:16:10 -0500
Subject: Update WixBA to Mba.Core 4.0.40.

---
 src/WixToolset.WixBA/Model.cs                | 6 +++---
 src/WixToolset.WixBA/UpdateViewModel.cs      | 2 +-
 src/WixToolset.WixBA/WixToolset.WixBA.csproj | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

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
         /// <summary>
         /// Get the version of the install.
         /// </summary>
-        public Version Version { get; private set; }
+        public string Version { get; private set; }
 
         /// <summary>
         /// Get or set the path where the bundle is installed.
@@ -79,7 +79,7 @@ namespace WixToolset.WixBA
 
             set
             {
-                this.Engine.SetVariable(BurnBundleInstallDirectoryVariable, value, false);
+                this.Engine.SetVariableString(BurnBundleInstallDirectoryVariable, value, false);
             }
         }
 
@@ -100,7 +100,7 @@ namespace WixToolset.WixBA
 
             set
             {
-                this.Engine.SetVariable(BurnBundleLayoutDirectoryVariable, value, false);
+                this.Engine.SetVariableString(BurnBundleLayoutDirectoryVariable, value, false);
             }
         }
 
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
             // or smaller than ours (we have a private build). If we really wanted to, we could leave the e.StopProcessingUpdates alone and
             // enumerate all of the updates.
             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));
-            if (e.Version > WixBA.Model.Version)
+            if (WixBA.Model.Engine.CompareVersions(e.Version, WixBA.Model.Version) > 0)
             {
                 WixBA.Model.Engine.SetUpdate(null, e.UpdateLocation, e.Size, UpdateHashType.None, null);
                 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 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" />
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.35" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.40" />
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb