Set CPU arch for additional deps

open-telemetry · Feb 19, 2024 · bab2afc · bab2afc
1 parent bf08ac9
commit bab2afc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
@@ -118,10 +118,21 @@ partial class Build
             foreach (var project in Solution.GetManagedSrcProjects())
             {
                 // Always AnyCPU
-                DotNetBuild(x => x
-                    .SetProjectFile(project)
-                    .SetConfiguration(BuildConfiguration)
-                    .SetNoRestore(NoRestore));
+                DotNetBuild(x =>
+                    {
+                        var settings = x
+                            .SetProjectFile(project)
+                            .SetConfiguration(BuildConfiguration)
+                            .SetNoRestore(NoRestore);
+
+                        if (project.Name == Projects.AutoInstrumentationAdditionalDeps)
+                        {
+                            settings.SetPlatform(Platform);
+                        }
+
+                        return settings;
+                    }
+                );
             }
         });
 

diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt
@@ -4,7 +4,7 @@
   /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json,
   /LICENSE,
   /instrument.sh,
-  /linux-x64/OpenTelemetry.AutoInstrumentation.Native.so,
+  /linux-arm64/OpenTelemetry.AutoInstrumentation.Native.so,
   /net/Google.Protobuf.dll,
   /net/Grpc.Core.Api.dll,
   /net/Grpc.Net.Client.dll,