diff --git a/JetBrains.Profiler.SelfApi/src/Impl/ConsoleProfiler.cs b/JetBrains.Profiler.SelfApi/src/Impl/ConsoleProfiler.cs
index 97da0ac..a8baefe 100644
--- a/JetBrains.Profiler.SelfApi/src/Impl/ConsoleProfiler.cs
+++ b/JetBrains.Profiler.SelfApi/src/Impl/ConsoleProfiler.cs
@@ -28,18 +28,11 @@ public ConsoleProfiler(string executable, string arguments, string messageServic
_presentableName = presentableName;
_isApiReady = isApiReady;
- // Note(ww898): Process architecture is inherited by default in macOS ARM64. Here we turn off this behavior!!!
- var isX64ProcessUnderMacOsArm64 = HabitatInfo.Platform == JetPlatform.MacOsX &&
- HabitatInfo.OSArchitecture == JetArchitecture.Arm64 &&
- HabitatInfo.ProcessArchitecture == JetArchitecture.X64;
- var effectiveExecutable = isX64ProcessUnderMacOsArm64 ? "/usr/bin/arch" : executable;
- var effectiveArguments = isX64ProcessUnderMacOsArm64 ? $"-arm64 \"${executable}\" ${arguments}" : arguments;
-
var commandRegex = BuildCommandRegex("([a-zA-Z-]*)", "(.*)");
var si = new ProcessStartInfo
{
- FileName = effectiveExecutable,
- Arguments = effectiveArguments,
+ FileName = executable,
+ Arguments = arguments,
CreateNoWindow = true,
UseShellExecute = false,
RedirectStandardInput = true,
diff --git a/JetBrains.Profiler.SelfApi/src/Impl/PrerequisiteBase.cs b/JetBrains.Profiler.SelfApi/src/Impl/PrerequisiteBase.cs
index cd39426..2b34aad 100644
--- a/JetBrains.Profiler.SelfApi/src/Impl/PrerequisiteBase.cs
+++ b/JetBrains.Profiler.SelfApi/src/Impl/PrerequisiteBase.cs
@@ -80,7 +80,8 @@ private async Task DoDownloadAsync(
Trace.Info("Prerequisite.Download: targetPath = `{0}`", downloadTo);
Directory.CreateDirectory(downloadTo);
- var nupkgName = GetPackageName() + "." + HabitatInfo.OSRuntimeIdString;
+ // Note(ww898): Process architecture is inherited by default in macOS ARM64. So use only process architecture!
+ var nupkgName = GetPackageName() + "." + HabitatInfo.ProcessRuntimeIdString;
string nupkgFolder, nupkgPath, readyMarker;
var downloadProgress = new SubProgress(progress, 0, downloadWeight);
diff --git a/JetBrains.Profiler.SelfApi/src/JetBrains.Profiler.SelfApi.csproj b/JetBrains.Profiler.SelfApi/src/JetBrains.Profiler.SelfApi.csproj
index 79add94..d6a4141 100644
--- a/JetBrains.Profiler.SelfApi/src/JetBrains.Profiler.SelfApi.csproj
+++ b/JetBrains.Profiler.SelfApi/src/JetBrains.Profiler.SelfApi.csproj
@@ -28,7 +28,7 @@ Supported frameworks:
https://github.com/JetBrains/profiler-self-api/blob/master/README.md
icon.png
jetbrains profiler profiling memory performance net dotnet netcore dotnetcore netstandard windows uwp macos mac linux musl glibc x86 x64 arm64 x86-64 x86_64 aarch64
- 2.5.5-preview1
+ 2.5.5-preview2