Store the prefix character in VERUTIL_VERSION.

Fix edge case where version string is all v's.

3 files changed, 9 insertions, 0 deletions

diff --git a/src/api/burn/WixToolset.Mba.Core/VerUtil.cs b/src/api/burn/WixToolset.Mba.Core/VerUtil.cs
index a342f85c..611f9710 100644
--- a/src/api/burn/WixToolset.Mba.Core/VerUtil.cs
+++ b/src/api/burn/WixToolset.Mba.Core/VerUtil.cs
@@ -59,6 +59,7 @@ namespace WixToolset.Mba.Core
         internal struct VersionStruct
         {
             public IntPtr sczVersion;
+            public char chPrefix;
             public uint dwMajor;
             public uint dwMinor;
             public uint dwPatch;
diff --git a/src/api/burn/WixToolset.Mba.Core/VerUtilVersion.cs b/src/api/burn/WixToolset.Mba.Core/VerUtilVersion.cs
index 7408c26f..731dedaf 100644
--- a/src/api/burn/WixToolset.Mba.Core/VerUtilVersion.cs
+++ b/src/api/burn/WixToolset.Mba.Core/VerUtilVersion.cs
@@ -17,6 +17,7 @@ namespace WixToolset.Mba.Core
             var pVersion = handle.DangerousGetHandle();
             var version = (VerUtil.VersionStruct)Marshal.PtrToStructure(pVersion, typeof(VerUtil.VersionStruct));
             this.Version = Marshal.PtrToStringUni(version.sczVersion);
+            this.Prefix = version.chPrefix;
             this.Major = version.dwMajor;
             this.Minor = version.dwMinor;
             this.Patch = version.dwPatch;
@@ -39,6 +40,11 @@ namespace WixToolset.Mba.Core
         public string Version { get; private set; }
 
         /// <summary>
+        /// Prefix character that was stripped from <c>Version</c>, or the null character if there was no prefix.
+        /// </summary>
+        public char Prefix { get; private set; }
+
+        /// <summary>
         /// For version A.B.C.D, Major is A. It is 0 if not specified.
         /// </summary>
         public uint Major { get; private set; }
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs b/src/api/burn/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs
index 44142e3d..ceb1b12a 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs
@@ -49,6 +49,7 @@ namespace WixToolsetTest.Mba.Core
 
             using var parsedVersion = VerUtil.VersionFromQword(qwVersion);
             Assert.Equal("100.200.300.400", parsedVersion.Version);
+            Assert.Equal('\0', parsedVersion.Prefix);
             Assert.Equal(100u, parsedVersion.Major);
             Assert.Equal(200u, parsedVersion.Minor);
             Assert.Equal(300u, parsedVersion.Patch);
@@ -65,6 +66,7 @@ namespace WixToolsetTest.Mba.Core
 
             using var parsedVersion = VerUtil.ParseVersion(version, strict: false);
             Assert.Equal(version, parsedVersion.Version);
+            Assert.Equal('\0', parsedVersion.Prefix);
             Assert.Equal(1u, parsedVersion.Major);
             Assert.Equal(2u, parsedVersion.Minor);
             Assert.Equal(3u, parsedVersion.Patch);