Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Build] Fix version bump autogen files error #6464

Merged
merged 1 commit into from
Dec 24, 2024
+10 −3
Merged

[Build] Fix version bump autogen files error #6464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions tracer/build/_build/CodeGenerators/CallTargetsGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,18 @@ internal static void GenerateNativeFile(Dictionary<CallTargetDefinitionSource, T
// </copyright>
// <auto-generated/>
#include "generated_definitions.h"
#include "../../../../shared/src/native-src/version.h"

namespace trace
{
int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
{
std::string version = PROFILER_VERSION;
std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
shared::WSTRING nameW = ToWSTRING(name);
WCHAR* assemblyName = (WCHAR*) (nameW.c_str());
""");

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

// Retrieve all signatures
Expand Down
6 changes: 5 additions & 1 deletion tracer/src/Datadog.Tracer.Native/Generated/generated_calltargets.g.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
// </copyright>
// <auto-generated/>
#include "generated_definitions.h"
#include "../../../../shared/src/native-src/version.h"

namespace trace
{
int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
{
WCHAR* assemblyName = (WCHAR*)WStr("Datadog.Trace, Version=3.8.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
std::string version = PROFILER_VERSION;
std::string name = "Datadog.Trace, Version=" + version + ".0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb";
shared::WSTRING nameW = ToWSTRING(name);
WCHAR* assemblyName = (WCHAR*) (nameW.c_str());

WCHAR* sig000[]={(WCHAR*)WStr("!!0"),(WCHAR*)WStr("StackExchange.Redis.Message"),(WCHAR*)WStr("StackExchange.Redis.ResultProcessor`1[!!0]"),(WCHAR*)WStr("StackExchange.Redis.ServerEndPoint"),};
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"),};
Expand Down
Loading