From 0c817c22cbcf03e59970c3e4d3d57d749bfdb480 Mon Sep 17 00:00:00 2001 From: RassK Date: Mon, 19 Feb 2024 14:38:46 +0200 Subject: [PATCH] fix store output platforms --- build/Build.Steps.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Build.Steps.cs b/build/Build.Steps.cs index 31ff3fd6c1..79e935be63 100644 --- 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() - .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);