Get "real" Burn version for logging.
Fixes https://github.com/wixtoolset/issues/issues/7082.
Bob Arnson committed
Dec 21, 2022 at 21:41 UTC
6bc32281a99bea30541f77dd0bf9e9658753afdc
2 files changed
+4
-1
src/burn/engine/engine.cpp
+1
-1
@@ -204,7 +204,7 @@ extern "C" HRESULT EngineRun(
204
}
205
206
PathForCurrentProcess(&sczExePath, NULL); // Ignore failure.
207
- LogId(REPORT_STANDARD, MSG_BURN_INFO, szVerMajorMinorBuild, ovix.dwMajorVersion, ovix.dwMinorVersion, ovix.dwBuildNumber, ovix.wServicePackMajor, sczExePath, szBurnPlatform, szMachinePlatform);
207
+ LogId(REPORT_STANDARD, MSG_BURN_INFO, szInformationalVersion, ovix.dwMajorVersion, ovix.dwMinorVersion, ovix.dwBuildNumber, ovix.wServicePackMajor, sczExePath, szBurnPlatform, szMachinePlatform);
208
ReleaseNullStr(sczExePath);
209
210
// initialize core
src/burn/engine/engine.vcxproj
+3
@@ -162,6 +162,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
162
<rup>$(GitBaseVersionPatch)</rup>
163
<rpr>$(GitCommits)</rpr>
164
<szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild>
165
+ <szInformationalVersion>$(InformationalVersion)</szInformationalVersion>
166
</PropertyGroup>
167
168
<ItemGroup>
@@ -176,6 +177,8 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
177
#define rmm $(rmm)
178
#define rup $(rup)
179
#define rpr $(rpr)
180
+#define szInformationalVersion "$(szInformationalVersion)"
181
+#define wzInformationalVersion L"$(szInformationalVersion)"
182
183
#endif
184
"/>