Skip to content

Commit 0c817c2

Browse files
committed
fix store output platforms
1 parent bf08ac9 commit 0c817c2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

build/Build.Steps.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Diagnostics;
2+
using System.Runtime.InteropServices;
23
using System.Text.Json;
34
using System.Text.Json.Nodes;
45
using Extensions;
@@ -550,7 +551,7 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore()
550551
DotNetPublish(s => s
551552
.SetProject(Solution.GetProjectByName(Projects.AutoInstrumentationAdditionalDeps))
552553
.SetConfiguration(BuildConfiguration)
553-
.SetTargetPlatformAnyCPU()
554+
.SetTargetPlatform(Platform)
554555
.SetProperty("TracerHomePath", TracerHomeDirectory)
555556
.EnableNoBuild()
556557
.SetNoRestore(NoRestore)
@@ -569,8 +570,9 @@ void RemoveFilesInNetFolderAvailableInAdditionalStore()
569570

570571
var folderRuntimeName = depsJson.GetFolderRuntimeName();
571572
var architectureStores = new List<AbsolutePath>()
572-
.AddIf(StoreDirectory / "x64" / folderRuntimeName, true) // All OS'es support x64 runtime
573+
.AddIf(StoreDirectory / "x64" / folderRuntimeName, RuntimeInformation.OSArchitecture == Architecture.X64)
573574
.AddIf(StoreDirectory / "x86" / folderRuntimeName, IsWin) // Only Windows supports x86 runtime
575+
.AddIf(StoreDirectory / "arm64" / folderRuntimeName, IsArm64)
574576
.AsReadOnly();
575577

576578
depsJson.CopyNativeDependenciesToStore(file, architectureStores);

0 commit comments

Comments
 (0)