@joebigelow / wix-1 / commits / 3afcdb25

Update WixBA to Mba.Core 4.0.40.

Sean Hall committed May 5, 2021 at 19:16 UTC 3afcdb255803a747447d2770b56019d5d144d443
3 files changed +6 -6
src/WixToolset.WixBA/Model.cs
+3 -3
@@ -60,7 +60,7 @@ namespace WixToolset.WixBA
60 /// <summary>
61 /// Get the version of the install.
62 /// </summary>
63 - public Version Version { get; private set; }
63 + public string Version { get; private set; }
64
65 /// <summary>
66 /// Get or set the path where the bundle is installed.
@@ -79,7 +79,7 @@ namespace WixToolset.WixBA
79
80 set
81 {
82 - this.Engine.SetVariable(BurnBundleInstallDirectoryVariable, value, false);
82 + this.Engine.SetVariableString(BurnBundleInstallDirectoryVariable, value, false);
83 }
84 }
85
@@ -100,7 +100,7 @@ namespace WixToolset.WixBA
100
101 set
102 {
103 - this.Engine.SetVariable(BurnBundleLayoutDirectoryVariable, value, false);
103 + this.Engine.SetVariableString(BurnBundleLayoutDirectoryVariable, value, false);
104 }
105 }
106
src/WixToolset.WixBA/UpdateViewModel.cs
+1 -1
@@ -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
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));
174 - if (e.Version > WixBA.Model.Version)
174 + if (WixBA.Model.Engine.CompareVersions(e.Version, WixBA.Model.Version) > 0)
175 {
176 WixBA.Model.Engine.SetUpdate(null, e.UpdateLocation, e.Size, UpdateHashType.None, null);
177 this.UpdateVersion = String.Concat("v", e.Version.ToString());
src/WixToolset.WixBA/WixToolset.WixBA.csproj
+2 -2
@@ -40,7 +40,7 @@
40 <Reference Include="WindowsBase" />
41 </ItemGroup>
42 <ItemGroup>
43 - <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" />
44 - <PackageReference Include="WixToolset.Mba.Core" Version="4.0.35" />
43 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
44 + <PackageReference Include="WixToolset.Mba.Core" Version="4.0.40" />
45 </ItemGroup>
46 </Project>
\ No newline at end of file