fix store output platforms

open-telemetry · Feb 19, 2024 · 0c817c2 · 0c817c2
1 parent bf08ac9
commit 0c817c2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using Extensions;
@@ -550,7 +551,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore()
             DotNetPublish(s => s
                 .SetProject(Solution.GetProjectByName(Projects.AutoInstrumentationAdditionalDeps))
                 .SetConfiguration(BuildConfiguration)
-                .SetTargetPlatformAnyCPU()
+                .SetTargetPlatform(Platform)
                 .SetProperty("TracerHomePath", TracerHomeDirectory)
                 .EnableNoBuild()
                 .SetNoRestore(NoRestore)
@@ -569,8 +570,9 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore()
 
                     var folderRuntimeName = depsJson.GetFolderRuntimeName();
                     var architectureStores = new List<AbsolutePath>()
-                        .AddIf(StoreDirectory / "x64" / folderRuntimeName, true) // All OS'es support x64 runtime
+                        .AddIf(StoreDirectory / "x64" / folderRuntimeName, RuntimeInformation.OSArchitecture == Architecture.X64)
                         .AddIf(StoreDirectory / "x86" / folderRuntimeName, IsWin) // Only Windows supports x86 runtime
+                        .AddIf(StoreDirectory / "arm64" / folderRuntimeName, IsArm64)
                         .AsReadOnly();
 
                     depsJson.CopyNativeDependenciesToStore(file, architectureStores);