Skip to content

Commit 03220ba

Browse files
committed
Support both Unicode and non-Unicode builds
1 parent 5f0a131 commit 03220ba

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ the code is regenerated.
2424
------------------------------------------------------------------------------
2525
";
2626

27+
private const string VersionStringDefineContent = @"#if defined(_UNICODE)
28+
#define NBGV_VERSION_STRING(x) L ##x
29+
#else
30+
#define NBGV_VERSION_STRING(x) x
31+
#endif";
32+
2733
private const string VersionInfoContent = @"#ifdef RC_INVOKED
2834
2935
#include <winres.h>
@@ -107,6 +113,9 @@ public override bool Execute()
107113
this.generator.AddComment(FileHeaderComment);
108114
this.generator.AddBlankLine();
109115

116+
this.generator.AddContent(VersionStringDefineContent);
117+
this.generator.AddBlankLine();
118+
110119
this.CreateDefines();
111120
this.generator.AddBlankLine();
112121

@@ -271,9 +280,9 @@ internal void AddDefine(string name, int value)
271280

272281
internal void AddDefine(string name, string value)
273282
{
274-
var escapedValue = "\"" + value.Replace("\\", "\\\\") + "\"";
283+
var escapedValue = value.Replace("\\", "\\\\");
275284

276-
this.codeBuilder.AppendLine($"#define {name} {escapedValue}");
285+
this.codeBuilder.AppendLine($"#define {name} NBGV_VERSION_STRING(\"{escapedValue}\")");
277286
}
278287

279288
internal void EndFile()

0 commit comments

Comments
 (0)