Skip to content

Commit 95f058c

Browse files
Fix version bump autogen files error
Removed unneeded file Removed utils function Rebase fix
1 parent 1ef216b commit 95f058c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -511,15 +511,18 @@ internal static void GenerateNativeFile(Dictionary<CallTargetDefinitionSource, T
511511
// </copyright>
512512
// <auto-generated/>
513513
#include "generated_definitions.h"
514+
#include "../../../../shared/src/native-src/version.h"
514515
515516
namespace trace
516517
{
517518
int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
518519
{
520+
std::string version = PROFILER_VERSION;
521+
std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
522+
shared::WSTRING nameW = ToWSTRING(name);
523+
WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
519524
""");
520525

521-
var assemblyName = $"Datadog.Trace, Version={version}.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
522-
sb.AppendLine($"WCHAR* assemblyName = (WCHAR*)WStr(\"{assemblyName}\");");
523526
sb.AppendLine();
524527

525528
// Retrieve all signatures

tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
// </copyright>
55
// <auto-generated/>
66
#include "generated_definitions.h"
7+
#include "../../../../shared/src/native-src/version.h"
78

89
namespace trace
910
{
1011
int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
1112
{
12-
WCHAR* assemblyName = (WCHAR*)WStr("Datadog.Trace, Version=3.8.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
13+
std::string version = PROFILER_VERSION;
14+
std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
15+
shared::WSTRING nameW = ToWSTRING(name);
16+
WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
1317

1418
WCHAR* sig000[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),};
1519
WCHAR* sig001[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),(WCHAR*)WStr("!!0"),};

0 commit comments

Comments
 (0)