Fix windows build

DataDog · Feb 7, 2025 · 0bf6824 · 0bf6824
1 parent 2a946df
commit 0bf6824
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.102",
+    "version": "9.0.101",
     "rollForward": "minor"
   }
-}
+}
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.cpp b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.cpp
@@ -106,7 +106,7 @@ CrashReporting::~CrashReporting()
 ddog_crasht_OsInfo GetOsInfo()
 {
     auto osType = libdatadog::to_char_slice(
-#ifdef _WIN32
+#ifdef _WINDOWS
                 "Windows"
 #elif MACOS
                 "macOS"
@@ -116,7 +116,13 @@ ddog_crasht_OsInfo GetOsInfo()
     );
 
     auto architecture = libdatadog::to_char_slice(
-#ifdef AMD64
+#ifdef _WINDOWS
+#ifdef BIT64
+                "x86_64"
+#else
+                "x86"
+#endif
+#elif AMD64
                 "x86_64"
 #elif X86
                 "x86"

diff --git a/tracer/build/_build/Build.Profiler.Steps.cs b/tracer/build/_build/Build.Profiler.Steps.cs
@@ -218,7 +218,7 @@ async Task DownloadAndExtractVcpkg(AbsolutePath destinationFolder)
         .Unlisted()
         .Description("Test that the Native wrapper symbols haven't changed")
         .After(CompileNativeWrapper)
-        .OnlyWhenStatic(() => IsLinux)
+        .OnlyWhenStatic(() => IsLinux && AsUniversal)
         .Executes(() =>
         {
             var (arch, _) = GetUnixArchitectureAndExtension();