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

Fix the build and some versions #6466

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Fix the build and some versions #6466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
042aab5
Fix broken CMakeLists.txt
andrewlock Dec 19, 2024
1747430
Add longer prefixes to the version bumper so we don't bump the wrong …
andrewlock Dec 19, 2024
c7a70a7
Fix generated file
andrewlock Dec 19, 2024
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
2 changes: 1 addition & 1 deletion shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.8.0)
cmake_minimum_required (VERSION 3.13.4)
cmake_policy(SET CMP0015 NEW)

# macOS uses 3.30 which deprecates FetchContent_Populate in favor of FetchContent_MakeAvailable,
Expand Down
13 changes: 4 additions & 9 deletions tracer/build/_build/PrepareRelease/SetAllVersions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,10 @@ public override void Run()
// upgrading four part, then three part *seems* safe
text => ThreePartVersionReplace(FourPartVersionReplace(text)));

// Top-level CMakeLists.txt
SynchronizeVersion(
"CMakeLists.txt",
text => FullVersionReplace(text, ".", prefix: "VERSION "));

// Native clr profiler updates
SynchronizeVersion(
"src/Datadog.Tracer.Native/CMakeLists.txt",
text => FullVersionReplace(text, ".", prefix: "VERSION "));
text => FullVersionReplace(text, ".", prefix: "\"Datadog.Tracer.Native\" VERSION "));

SynchronizeVersion(
"src/Datadog.Tracer.Native/Resource.rc",
Expand All @@ -349,11 +344,11 @@ public override void Run()

SynchronizeVersion(
"../profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt",
text => FullVersionReplace(text, ".", prefix: "VERSION "));
text => FullVersionReplace(text, ".", prefix: "\"Datadog.Profiler.Native.Linux\" VERSION "));

SynchronizeVersion(
"../profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt",
text => FullVersionReplace(text, ".", prefix: "VERSION "));
text => FullVersionReplace(text, ".", prefix: "\"Datadog.Linux.ApiWrapper\" VERSION "));

SynchronizeVersion(
"../profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h",
Expand All @@ -372,7 +367,7 @@ public override void Run()

SynchronizeVersion(
"../shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt",
text => FullVersionReplace(text, ".", prefix: "VERSION "));
text => FullVersionReplace(text, ".", prefix: "\"Datadog.Trace.ClrProfiler.Native\" VERSION "));

SynchronizeVersion(
"../shared/src/native-src/version.h",
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Tracer.Native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.8.0)
cmake_minimum_required (VERSION 3.13.4)
cmake_policy(SET CMP0015 NEW)

# macOS uses 3.30 which deprecates FetchContent_Populate in favor of FetchContent_MakeAvailable,
Expand Down
2 changes: 1 addition & 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 @@ -9,7 +9,7 @@ namespace trace
{
int GeneratedDefinitions::InitCallTargets(UINT32 enabledCategories, UINT32 platform)
{
WCHAR* assemblyName = (WCHAR*)WStr("Datadog.Trace, Version=3.7.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
WCHAR* assemblyName = (WCHAR*)WStr("Datadog.Trace, Version=3.8.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

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