diff --git a/shared/src/Datadog.Trace.ClrProfiler.Native/Datadog.Trace.ClrProfiler.Native.vcxproj b/shared/src/Datadog.Trace.ClrProfiler.Native/Datadog.Trace.ClrProfiler.Native.vcxproj index 5b281cc6a213..d49bebdaab64 100644 --- a/shared/src/Datadog.Trace.ClrProfiler.Native/Datadog.Trace.ClrProfiler.Native.vcxproj +++ b/shared/src/Datadog.Trace.ClrProfiler.Native/Datadog.Trace.ClrProfiler.Native.vcxproj @@ -315,6 +315,7 @@ + diff --git a/tracer/src/Datadog.Tracer.Native/version.h b/shared/src/native-src/version.h similarity index 100% rename from tracer/src/Datadog.Tracer.Native/version.h rename to shared/src/native-src/version.h diff --git a/tracer/build/_build/PrepareRelease/SetAllVersions.cs b/tracer/build/_build/PrepareRelease/SetAllVersions.cs index 6c30a883e3e5..2825d5ea05e0 100644 --- a/tracer/build/_build/PrepareRelease/SetAllVersions.cs +++ b/tracer/build/_build/PrepareRelease/SetAllVersions.cs @@ -331,10 +331,6 @@ public override void Run() return text; }); - SynchronizeVersion( - "src/Datadog.Tracer.Native/version.h", - text => FullVersionReplace(text, ".")); - // .NET profiler SynchronizeVersion( @@ -373,6 +369,10 @@ public override void Run() "../shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt", text => FullVersionReplace(text, ".", prefix: "VERSION ")); + SynchronizeVersion( + "../shared/src/native-src/version.h", + text => FullVersionReplace(text, ".")); + // Misc SynchronizeVersion( diff --git a/tracer/src/Datadog.Tracer.Native/Datadog.Tracer.Native.vcxproj b/tracer/src/Datadog.Tracer.Native/Datadog.Tracer.Native.vcxproj index 721f8682b041..7ec5a3e303d5 100644 --- a/tracer/src/Datadog.Tracer.Native/Datadog.Tracer.Native.vcxproj +++ b/tracer/src/Datadog.Tracer.Native/Datadog.Tracer.Native.vcxproj @@ -274,6 +274,7 @@ + @@ -334,7 +335,6 @@ - diff --git a/tracer/src/Datadog.Tracer.Native/class_factory.cpp b/tracer/src/Datadog.Tracer.Native/class_factory.cpp index 7060b5cab97c..904628f3c96e 100644 --- a/tracer/src/Datadog.Tracer.Native/class_factory.cpp +++ b/tracer/src/Datadog.Tracer.Native/class_factory.cpp @@ -2,10 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full // license information. +#include "../../../shared/src/native-src/version.h" + #include "class_factory.h" #include "cor_profiler.h" #include "logger.h" -#include "version.h" ClassFactory::ClassFactory() : refCount(0) { diff --git a/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp b/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp index 329f0ecb6bf7..107fbe01d283 100644 --- a/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp +++ b/tracer/src/Datadog.Tracer.Native/cor_profiler.cpp @@ -19,9 +19,9 @@ #include "module_metadata.h" #include "resource.h" #include "stats.h" -#include "version.h" #include "../../../shared/src/native-src/pal.h" +#include "../../../shared/src/native-src/version.h" #include "iast/dataflow.h" diff --git a/tracer/src/Datadog.Tracer.Native/debugger_method_rewriter.cpp b/tracer/src/Datadog.Tracer.Native/debugger_method_rewriter.cpp index e60fa6361d44..f701ba1ecc9e 100644 --- a/tracer/src/Datadog.Tracer.Native/debugger_method_rewriter.cpp +++ b/tracer/src/Datadog.Tracer.Native/debugger_method_rewriter.cpp @@ -6,7 +6,6 @@ #include "il_rewriter_wrapper.h" #include "logger.h" #include "stats.h" -#include "version.h" #include "environment_variables_util.h" #include "debugger_probes_tracker.h" #include "fault_tolerant_envionrment_variables_util.h" diff --git a/tracer/src/Datadog.Tracer.Native/iast/iast_util.cpp b/tracer/src/Datadog.Tracer.Native/iast/iast_util.cpp index 84746f1de288..1e4da065daef 100644 --- a/tracer/src/Datadog.Tracer.Native/iast/iast_util.cpp +++ b/tracer/src/Datadog.Tracer.Native/iast/iast_util.cpp @@ -1,5 +1,6 @@ #include "iast_util.h" #include "../../../../shared/src/native-src/pal.h" +#include "../../../../shared/src/native-src/version.h" #include #include @@ -9,7 +10,6 @@ #include #include #include "../logger.h" -#include "../version.h" using namespace shared; diff --git a/tracer/src/Datadog.Tracer.Native/method_rewriter.cpp b/tracer/src/Datadog.Tracer.Native/method_rewriter.cpp index 9485bc3fcfae..efe7d8ad5603 100644 --- a/tracer/src/Datadog.Tracer.Native/method_rewriter.cpp +++ b/tracer/src/Datadog.Tracer.Native/method_rewriter.cpp @@ -4,7 +4,6 @@ #include "integration.h" #include "logger.h" #include "stats.h" -#include "version.h" #include "environment_variables_util.h" #include "dd_profiler_constants.h"