From 6bc32281a99bea30541f77dd0bf9e9658753afdc Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 21 Dec 2022 21:41:03 -0500
Subject: Get "real" Burn version for logging.

Fixes https://github.com/wixtoolset/issues/issues/7082.
---
 src/burn/engine/engine.cpp     | 2 +-
 src/burn/engine/engine.vcxproj | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp
index c9d2bdcd..b093ec9b 100644
--- a/src/burn/engine/engine.cpp
+++ b/src/burn/engine/engine.cpp
@@ -204,7 +204,7 @@ extern "C" HRESULT EngineRun(
     }
 
     PathForCurrentProcess(&sczExePath, NULL); // Ignore failure.
-    LogId(REPORT_STANDARD, MSG_BURN_INFO, szVerMajorMinorBuild, ovix.dwMajorVersion, ovix.dwMinorVersion, ovix.dwBuildNumber, ovix.wServicePackMajor, sczExePath, szBurnPlatform, szMachinePlatform);
+    LogId(REPORT_STANDARD, MSG_BURN_INFO, szInformationalVersion, ovix.dwMajorVersion, ovix.dwMinorVersion, ovix.dwBuildNumber, ovix.wServicePackMajor, sczExePath, szBurnPlatform, szMachinePlatform);
     ReleaseNullStr(sczExePath);
 
     // initialize core
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index ba26f68e..768f20ba 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -162,6 +162,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
       <rup>$(GitBaseVersionPatch)</rup>
       <rpr>$(GitCommits)</rpr>
       <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild>
+      <szInformationalVersion>$(InformationalVersion)</szInformationalVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -176,6 +177,8 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
 #define rmm	$(rmm)
 #define rup	$(rup)
 #define rpr	$(rpr)
+#define szInformationalVersion &quot;$(szInformationalVersion)&quot;
+#define wzInformationalVersion L&quot;$(szInformationalVersion)&quot;
 
 #endif
 "/>
-- 
cgit v1.2.3-55-g6feb