diff --git a/protocol/src/main/kotlin/model/rider/AsmViewerModel.kt b/protocol/src/main/kotlin/model/rider/AsmViewerModel.kt
index 165ebcd..e4729dc 100644
--- a/protocol/src/main/kotlin/model/rider/AsmViewerModel.kt
+++ b/protocol/src/main/kotlin/model/rider/AsmViewerModel.kt
@@ -65,6 +65,8 @@ class AsmViewerModel : Ext(SolutionModel.Solution) {
         field("targetFrameworkOverride", string.nullable)
         field("selectedCompiler", CompilerType)
         field("disassemblyTimeoutSeconds", int)
+        field("useCustomRuntime", bool)
+        field("pathToLocalCoreClr", string.nullable)
     }
 
     private val CompilationResult = structdef {
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/AsmViewerModel.Generated.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler/AsmViewerModel.Generated.cs
index e985798..dd0d825 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/AsmViewerModel.Generated.cs
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/AsmViewerModel.Generated.cs
@@ -36,7 +36,7 @@ namespace JetBrains.Rider.Model
   
   
   /// <summary>
-  /// <p>Generated from: AsmViewerModel.kt:8</p>
+  /// <p>Generated from: AsmViewerModel.kt:7</p>
   /// </summary>
   public class AsmViewerModel : RdExtBase
   {
@@ -112,7 +112,7 @@ internal AsmViewerModel (
     
     
     
-    protected override long SerializationHash => -8744739113612796705L;
+    protected override long SerializationHash => 4503471233995481963L;
     
     protected override Action<ISerializers> Register => RegisterDeclaredTypesSerializers;
     public static void RegisterDeclaredTypesSerializers(ISerializers serializers)
@@ -161,7 +161,7 @@ public static AsmViewerModel GetAsmViewerModel(this Solution solution)
   
   
   /// <summary>
-  /// <p>Generated from: AsmViewerModel.kt:70</p>
+  /// <p>Generated from: AsmViewerModel.kt:72</p>
   /// </summary>
   public sealed class CompilationResult : IPrintable, IEquatable<CompilationResult>
   {
@@ -406,6 +406,8 @@ public sealed class JitConfiguration : IPrintable, IEquatable<JitConfiguration>
     [CanBeNull] public string TargetFrameworkOverride {get; private set;}
     public CompilerType SelectedCompiler {get; private set;}
     public int DisassemblyTimeoutSeconds {get; private set;}
+    public bool UseCustomRuntime {get; private set;}
+    [CanBeNull] public string PathToLocalCoreClr {get; private set;}
     
     //private fields
     //primary constructor
@@ -420,7 +422,9 @@ public JitConfiguration(
       bool useDotnetBuildForReload,
       [CanBeNull] string targetFrameworkOverride,
       CompilerType selectedCompiler,
-      int disassemblyTimeoutSeconds
+      int disassemblyTimeoutSeconds,
+      bool useCustomRuntime,
+      [CanBeNull] string pathToLocalCoreClr
     )
     {
       ShowAsmComments = showAsmComments;
@@ -434,10 +438,12 @@ int disassemblyTimeoutSeconds
       TargetFrameworkOverride = targetFrameworkOverride;
       SelectedCompiler = selectedCompiler;
       DisassemblyTimeoutSeconds = disassemblyTimeoutSeconds;
+      UseCustomRuntime = useCustomRuntime;
+      PathToLocalCoreClr = pathToLocalCoreClr;
     }
     //secondary constructor
     //deconstruct trait
-    public void Deconstruct(out bool showAsmComments, out bool diffable, out bool useTieredJit, out bool usePGO, out bool runAppMode, out bool useNoRestoreFlag, out bool useDotnetPublishForReload, out bool useDotnetBuildForReload, [CanBeNull] out string targetFrameworkOverride, out CompilerType selectedCompiler, out int disassemblyTimeoutSeconds)
+    public void Deconstruct(out bool showAsmComments, out bool diffable, out bool useTieredJit, out bool usePGO, out bool runAppMode, out bool useNoRestoreFlag, out bool useDotnetPublishForReload, out bool useDotnetBuildForReload, [CanBeNull] out string targetFrameworkOverride, out CompilerType selectedCompiler, out int disassemblyTimeoutSeconds, out bool useCustomRuntime, [CanBeNull] out string pathToLocalCoreClr)
     {
       showAsmComments = ShowAsmComments;
       diffable = Diffable;
@@ -450,6 +456,8 @@ public void Deconstruct(out bool showAsmComments, out bool diffable, out bool us
       targetFrameworkOverride = TargetFrameworkOverride;
       selectedCompiler = SelectedCompiler;
       disassemblyTimeoutSeconds = DisassemblyTimeoutSeconds;
+      useCustomRuntime = UseCustomRuntime;
+      pathToLocalCoreClr = PathToLocalCoreClr;
     }
     //statics
     
@@ -466,7 +474,9 @@ public void Deconstruct(out bool showAsmComments, out bool diffable, out bool us
       var targetFrameworkOverride = ReadStringNullable(ctx, reader);
       var selectedCompiler = (CompilerType)reader.ReadInt();
       var disassemblyTimeoutSeconds = reader.ReadInt();
-      var _result = new JitConfiguration(showAsmComments, diffable, useTieredJit, usePGO, runAppMode, useNoRestoreFlag, useDotnetPublishForReload, useDotnetBuildForReload, targetFrameworkOverride, selectedCompiler, disassemblyTimeoutSeconds);
+      var useCustomRuntime = reader.ReadBool();
+      var pathToLocalCoreClr = ReadStringNullable(ctx, reader);
+      var _result = new JitConfiguration(showAsmComments, diffable, useTieredJit, usePGO, runAppMode, useNoRestoreFlag, useDotnetPublishForReload, useDotnetBuildForReload, targetFrameworkOverride, selectedCompiler, disassemblyTimeoutSeconds, useCustomRuntime, pathToLocalCoreClr);
       return _result;
     };
     public static CtxReadDelegate<string> ReadStringNullable = JetBrains.Rd.Impl.Serializers.ReadString.NullableClass();
@@ -484,6 +494,8 @@ public void Deconstruct(out bool showAsmComments, out bool diffable, out bool us
       WriteStringNullable(ctx, writer, value.TargetFrameworkOverride);
       writer.Write((int)value.SelectedCompiler);
       writer.Write(value.DisassemblyTimeoutSeconds);
+      writer.Write(value.UseCustomRuntime);
+      WriteStringNullable(ctx, writer, value.PathToLocalCoreClr);
     };
     public static  CtxWriteDelegate<string> WriteStringNullable = JetBrains.Rd.Impl.Serializers.WriteString.NullableClass();
     
@@ -503,7 +515,7 @@ public bool Equals(JitConfiguration other)
     {
       if (ReferenceEquals(null, other)) return false;
       if (ReferenceEquals(this, other)) return true;
-      return ShowAsmComments == other.ShowAsmComments && Diffable == other.Diffable && UseTieredJit == other.UseTieredJit && UsePGO == other.UsePGO && RunAppMode == other.RunAppMode && UseNoRestoreFlag == other.UseNoRestoreFlag && UseDotnetPublishForReload == other.UseDotnetPublishForReload && UseDotnetBuildForReload == other.UseDotnetBuildForReload && Equals(TargetFrameworkOverride, other.TargetFrameworkOverride) && SelectedCompiler == other.SelectedCompiler && DisassemblyTimeoutSeconds == other.DisassemblyTimeoutSeconds;
+      return ShowAsmComments == other.ShowAsmComments && Diffable == other.Diffable && UseTieredJit == other.UseTieredJit && UsePGO == other.UsePGO && RunAppMode == other.RunAppMode && UseNoRestoreFlag == other.UseNoRestoreFlag && UseDotnetPublishForReload == other.UseDotnetPublishForReload && UseDotnetBuildForReload == other.UseDotnetBuildForReload && Equals(TargetFrameworkOverride, other.TargetFrameworkOverride) && SelectedCompiler == other.SelectedCompiler && DisassemblyTimeoutSeconds == other.DisassemblyTimeoutSeconds && UseCustomRuntime == other.UseCustomRuntime && Equals(PathToLocalCoreClr, other.PathToLocalCoreClr);
     }
     //hash code trait
     public override int GetHashCode()
@@ -521,6 +533,8 @@ public override int GetHashCode()
         hash = hash * 31 + (TargetFrameworkOverride != null ? TargetFrameworkOverride.GetHashCode() : 0);
         hash = hash * 31 + (int) SelectedCompiler;
         hash = hash * 31 + DisassemblyTimeoutSeconds.GetHashCode();
+        hash = hash * 31 + UseCustomRuntime.GetHashCode();
+        hash = hash * 31 + (PathToLocalCoreClr != null ? PathToLocalCoreClr.GetHashCode() : 0);
         return hash;
       }
     }
@@ -540,6 +554,8 @@ public void Print(PrettyPrinter printer)
         printer.Print("targetFrameworkOverride = "); TargetFrameworkOverride.PrintEx(printer); printer.Println();
         printer.Print("selectedCompiler = "); SelectedCompiler.PrintEx(printer); printer.Println();
         printer.Print("disassemblyTimeoutSeconds = "); DisassemblyTimeoutSeconds.PrintEx(printer); printer.Println();
+        printer.Print("useCustomRuntime = "); UseCustomRuntime.PrintEx(printer); printer.Println();
+        printer.Print("pathToLocalCoreClr = "); PathToLocalCoreClr.PrintEx(printer); printer.Println();
       }
       printer.Print(")");
     }
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitCodegenProvider.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitCodegenProvider.cs
index 7ad6f0c..77cfe65 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitCodegenProvider.cs
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitCodegenProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Core;
@@ -276,7 +277,9 @@ private async Task<Result<JitCodeGenResult, Error>> GetJitCodegenInternalAsync(D
                 if (!runtimePackPath.Succeed)
                     return Result.FailWithValue(new Error(AsmViewerErrorCode.RuntimePackNotFound, runtimePackPath.FailMessage));
 
-                executable = Path.Combine(configuration.PathToLocalCoreClr, "dotnet.cmd");
+                var dotnetScript = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                    ? "dotnet.cmd" : "dotnet.sh";
+                executable = Path.Combine(configuration.PathToLocalCoreClr, dotnetScript);
                 command = $"{Path.Combine(pathToCoreClrChecked.Value, "crossgen2", "crossgen2.dll")} --out aot ";
 
                 foreach (var envVar in envVars)
@@ -476,7 +479,7 @@ private async Task<Result<JitCodeGenResult, Error>> GetJitCodegenInternalAsync(D
                 if (!pathToCoreClrChecked.Succeed)
                     return Result.FailWithValue(new Error(AsmViewerErrorCode.CoreClrCheckedNotFound, pathToCoreClrChecked.FailMessage));
 
-                executable = Path.Combine(pathToCoreClrChecked.Value, "CoreRun.exe");
+                executable = Path.Combine(pathToCoreClrChecked.Value, JitPathUtils.CoreRunExecutable);
             }
 
             if ((configuration.RunAppMode) &&
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitPathUtils.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitPathUtils.cs
index 9cfd02c..4cb774c 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitPathUtils.cs
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasm/JitPathUtils.cs
@@ -1,32 +1,43 @@
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using JetBrains.Core;
 
 namespace ReSharperPlugin.DotNetDisassembler.JitDisasm;
 
 public class JitPathUtils
 {
+    private static readonly string OsPrefix =
+        RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "osx" :
+        RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "linux" : "windows";
+
+    private static readonly string CoreRunExecutableName =
+        RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "CoreRun.exe" : "corerun";
+
+    public static string CoreRunExecutable => CoreRunExecutableName;
+
     public static Result<string> GetPathToRuntimePack(string pathToLocalCoreClr, string arch)
     {
         var result = GetPathToCoreClrChecked(pathToLocalCoreClr, arch);
         if (!result.Succeed)
             return Result.Fail(result.FailMessage);
 
-        string runtimePacksPath = Path.Combine(pathToLocalCoreClr, @"artifacts\bin\runtime");
+        string runtimePacksPath = Path.Combine(pathToLocalCoreClr, "artifacts", "bin", "runtime");
         string runtimePackPath = null;
         if (Directory.Exists(runtimePacksPath))
         {
-            var packs = Directory.GetDirectories(runtimePacksPath, "*-windows-Release-" + arch);
+            var packs = Directory.GetDirectories(runtimePacksPath, $"*-{OsPrefix}-Release-{arch}");
             runtimePackPath = packs.OrderByDescending(i => i).FirstOrDefault();
         }
 
         if (!Directory.Exists(runtimePackPath))
         {
+            var buildCmd = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "build.cmd" : "./build.sh";
             var msg =
                 $"""
                  Please, build a runtime-pack in your local repo:
 
-                 Run 'build.cmd Clr+Clr.Aot+Libs -c Release -a {arch}' in the repo root
+                 Run '{buildCmd} Clr+Clr.Aot+Libs -c Release -a {arch}' in the repo root
                  Don't worry, you won't have to re-build it every time you change something in jit, vm or corelib.
                  """;
             return Result.Fail(msg);
@@ -37,13 +48,14 @@ public static Result<string> GetPathToRuntimePack(string pathToLocalCoreClr, str
 
     public static Result<string> GetPathToCoreClrChecked(JitDisasmConfiguration configuration) =>
         GetPathToCoreClrChecked(configuration.PathToLocalCoreClr, configuration.Arch, configuration.CrossgenIsSelected);
-    
+
     public static Result<string> GetPathToCoreClrChecked(string pathToLocalCoreClr, string arch,
         bool isCrossgenSelected = false)
     {
         var clrCheckedFilesDir = FindJitDirectory(pathToLocalCoreClr, arch);
         if (string.IsNullOrWhiteSpace(clrCheckedFilesDir))
         {
+            var buildCmd = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "build.cmd" : "./build.sh";
             var msg =
                 $"""
                  Path to a local dotnet/runtime repository is either not set or it's not built for {arch} arch yet
@@ -53,7 +65,7 @@ public static Result<string> GetPathToCoreClrChecked(string pathToLocalCoreClr,
                                  \nPlease clone it and build it in `Checked` mode, e.g.:\n\n
                                  git clone git@github.com:dotnet/runtime.git\n
                                  cd runtime\n
-                                 build.cmd Clr+Clr.Aot+Libs -c Release -rc Checked -a {arch}\n\n
+                                 {buildCmd} Clr+Clr.Aot+Libs -c Release -rc Checked -a {arch}\n\n
                  """;
             return Result.Fail(msg);
         }
@@ -61,13 +73,23 @@ build.cmd Clr+Clr.Aot+Libs -c Release -rc Checked -a {arch}\n\n
         return Result.Success(clrCheckedFilesDir);
     }
 
-
     public static Result<string> GetPathToCoreClrCheckedForNativeAot(string pathToLocalCoreClr, string arch)
     {
-        var releaseFolder = Path.Combine(pathToLocalCoreClr, "artifacts", "bin", "coreclr", $"windows.{arch}.Checked");
-        if (!Directory.Exists(releaseFolder) || !Directory.Exists(Path.Combine(releaseFolder, "aotsdk")) ||
-            !Directory.Exists(Path.Combine(releaseFolder, "ilc")))
+        string releaseFolder = null;
+        foreach (var config in new[] { "Checked", "Debug" })
         {
+            var candidate = Path.Combine(pathToLocalCoreClr, "artifacts", "bin", "coreclr", $"{OsPrefix}.{arch}.{config}");
+            if (Directory.Exists(candidate) && Directory.Exists(Path.Combine(candidate, "aotsdk")) &&
+                Directory.Exists(Path.Combine(candidate, "ilc")))
+            {
+                releaseFolder = candidate;
+                break;
+            }
+        }
+
+        if (releaseFolder == null)
+        {
+            var buildCmd = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "build.cmd" : "./build.sh";
             var msg =
                 $"""
                  Path to a local dotnet/runtime repository is either not set or it's not correctly built for {arch} arch yet for NativeAOT
@@ -75,7 +97,7 @@ public static Result<string> GetPathToCoreClrCheckedForNativeAot(string pathToLo
 
                  git clone git@github.com:dotnet/runtime.git
                  cd runtime
-                 build.cmd Clr+Clr.Aot+Libs -c Release -rc Checked -a {arch}
+                 {buildCmd} Clr+Clr.Aot+Libs -c Release -rc Checked -a {arch}
                  """;
             return Result.Fail(msg);
         }
@@ -85,17 +107,13 @@ build.cmd Clr+Clr.Aot+Libs -c Release -rc Checked -a {arch}
 
     public static string FindJitDirectory(string basePath, string arch)
     {
-        string jitDir = Path.Combine(basePath, $@"artifacts\bin\coreclr\windows.{arch}.Checked");
+        string jitDir = Path.Combine(basePath, "artifacts", "bin", "coreclr", $"{OsPrefix}.{arch}.Checked");
         if (Directory.Exists(jitDir))
-        {
             return jitDir;
-        }
 
-        jitDir = Path.Combine(basePath, $@"artifacts\bin\coreclr\windows.{arch}.Debug");
+        jitDir = Path.Combine(basePath, "artifacts", "bin", "coreclr", $"{OsPrefix}.{arch}.Debug");
         if (Directory.Exists(jitDir))
-        {
             return jitDir;
-        }
 
         return null;
     }
@@ -122,4 +140,4 @@ public static void CopyDirectory(string sourceDir, string destinationDir)
             CopyDirectory(subDir.FullName, newDestinationDir);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmConfigurationFactory.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmConfigurationFactory.cs
index becc4fd..d763502 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmConfigurationFactory.cs
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmConfigurationFactory.cs
@@ -27,12 +27,12 @@ public static JitDisasmConfiguration Create(JitConfiguration config)
             // Advanced properties use defaults (not exposed in UI)
             UseUnloadableContext = false,
             JitDumpInsteadOfDisasm = false,
-            UseCustomRuntime = false,
+            UseCustomRuntime = config.UseCustomRuntime,
             FgEnable = false,
             CustomEnvVars = null,
             Crossgen2Args = null,
             IlcArgs = null,
-            PathToLocalCoreClr = null,
+            PathToLocalCoreClr = config.PathToLocalCoreClr,
             OverridenJitDisasm = null,
             DontGuessTfm = false,
             Arch = RuntimePlatformUtils.GetCurrentArch()
diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerModel.Generated.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerModel.Generated.kt
index be2db23..9020066 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerModel.Generated.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerModel.Generated.kt
@@ -16,7 +16,7 @@ import kotlin.jvm.JvmStatic
 
 
 /**
- * #### Generated from [AsmViewerModel.kt:8]
+ * #### Generated from [AsmViewerModel.kt:7]
  */
 class AsmViewerModel private constructor(
     private val _show: RdSignal<Unit>,
@@ -44,7 +44,7 @@ class AsmViewerModel private constructor(
         
         
         
-        const val serializationHash = -8744739113612796705L
+        const val serializationHash = 4503471233995481963L
         
     }
     override val serializersOwner: ISerializersOwner get() = AsmViewerModel
@@ -125,7 +125,7 @@ val Solution.asmViewerModel get() = getOrCreateExtension("asmViewerModel", ::Asm
 
 
 /**
- * #### Generated from [AsmViewerModel.kt:70]
+ * #### Generated from [AsmViewerModel.kt:72]
  */
 data class CompilationResult (
     val content: String?,
@@ -340,7 +340,9 @@ data class JitConfiguration (
     val useDotnetBuildForReload: Boolean,
     val targetFrameworkOverride: String?,
     val selectedCompiler: CompilerType,
-    val disassemblyTimeoutSeconds: Int
+    val disassemblyTimeoutSeconds: Int,
+    val useCustomRuntime: Boolean,
+    val pathToLocalCoreClr: String?
 ) : IPrintable {
     //companion
     
@@ -361,7 +363,9 @@ data class JitConfiguration (
             val targetFrameworkOverride = buffer.readNullable { buffer.readString() }
             val selectedCompiler = buffer.readEnum<CompilerType>()
             val disassemblyTimeoutSeconds = buffer.readInt()
-            return JitConfiguration(showAsmComments, diffable, useTieredJit, usePGO, runAppMode, useNoRestoreFlag, useDotnetPublishForReload, useDotnetBuildForReload, targetFrameworkOverride, selectedCompiler, disassemblyTimeoutSeconds)
+            val useCustomRuntime = buffer.readBool()
+            val pathToLocalCoreClr = buffer.readNullable { buffer.readString() }
+            return JitConfiguration(showAsmComments, diffable, useTieredJit, usePGO, runAppMode, useNoRestoreFlag, useDotnetPublishForReload, useDotnetBuildForReload, targetFrameworkOverride, selectedCompiler, disassemblyTimeoutSeconds, useCustomRuntime, pathToLocalCoreClr)
         }
         
         override fun write(ctx: SerializationCtx, buffer: AbstractBuffer, value: JitConfiguration)  {
@@ -376,6 +380,8 @@ data class JitConfiguration (
             buffer.writeNullable(value.targetFrameworkOverride) { buffer.writeString(it) }
             buffer.writeEnum(value.selectedCompiler)
             buffer.writeInt(value.disassemblyTimeoutSeconds)
+            buffer.writeBool(value.useCustomRuntime)
+            buffer.writeNullable(value.pathToLocalCoreClr) { buffer.writeString(it) }
         }
         
         
@@ -402,6 +408,8 @@ data class JitConfiguration (
         if (targetFrameworkOverride != other.targetFrameworkOverride) return false
         if (selectedCompiler != other.selectedCompiler) return false
         if (disassemblyTimeoutSeconds != other.disassemblyTimeoutSeconds) return false
+        if (useCustomRuntime != other.useCustomRuntime) return false
+        if (pathToLocalCoreClr != other.pathToLocalCoreClr) return false
         
         return true
     }
@@ -419,6 +427,8 @@ data class JitConfiguration (
         __r = __r*31 + if (targetFrameworkOverride != null) targetFrameworkOverride.hashCode() else 0
         __r = __r*31 + selectedCompiler.hashCode()
         __r = __r*31 + disassemblyTimeoutSeconds.hashCode()
+        __r = __r*31 + useCustomRuntime.hashCode()
+        __r = __r*31 + if (pathToLocalCoreClr != null) pathToLocalCoreClr.hashCode() else 0
         return __r
     }
     //pretty print
@@ -436,6 +446,8 @@ data class JitConfiguration (
             print("targetFrameworkOverride = "); targetFrameworkOverride.print(printer); println()
             print("selectedCompiler = "); selectedCompiler.print(printer); println()
             print("disassemblyTimeoutSeconds = "); disassemblyTimeoutSeconds.print(printer); println()
+            print("useCustomRuntime = "); useCustomRuntime.print(printer); println()
+            print("pathToLocalCoreClr = "); pathToLocalCoreClr.print(printer); println()
         }
         printer.print(")")
     }
diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerSettings.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerSettings.kt
index 09d8c07..a178715 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerSettings.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerSettings.kt
@@ -21,6 +21,8 @@ class JitConfigurationState : BaseState() {
     var targetFrameworkOverride by string(null)
     var selectedCompiler by enum(CompilerType.Clrjit)
     var disassemblyTimeoutSeconds by property(120)
+    var useCustomRuntime by property(false)
+    var pathToLocalCoreClr by string(null)
 }
 
 @Service(Service.Level.PROJECT)
@@ -60,7 +62,9 @@ class AsmViewerSettings : SimplePersistentStateComponent<AsmViewerSettings.State
         useDotnetBuildForReload = state.jit.useDotnetBuildForReload,
         targetFrameworkOverride = state.jit.targetFrameworkOverride,
         selectedCompiler = state.jit.selectedCompiler,
-        disassemblyTimeoutSeconds = state.jit.disassemblyTimeoutSeconds
+        disassemblyTimeoutSeconds = state.jit.disassemblyTimeoutSeconds,
+        useCustomRuntime = state.jit.useCustomRuntime,
+        pathToLocalCoreClr = state.jit.pathToLocalCoreClr
     )
 
     fun updateFrom(config: JitConfiguration) {
@@ -75,6 +79,8 @@ class AsmViewerSettings : SimplePersistentStateComponent<AsmViewerSettings.State
         state.jit.targetFrameworkOverride = config.targetFrameworkOverride
         state.jit.selectedCompiler = config.selectedCompiler
         state.jit.disassemblyTimeoutSeconds = config.disassemblyTimeoutSeconds
+        state.jit.useCustomRuntime = config.useCustomRuntime
+        state.jit.pathToLocalCoreClr = config.pathToLocalCoreClr
         fireChangeListeners()
     }
 }
diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/ConfigurationDialog.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/ConfigurationDialog.kt
index 32f043a..0de21d2 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/ConfigurationDialog.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/ConfigurationDialog.kt
@@ -1,8 +1,11 @@
 package com.jetbrains.rider.plugins.dotnetdisassembler
 
 import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
+import com.intellij.openapi.ui.TextFieldWithBrowseButton
+import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.ui.ContextHelpLabel
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBLabel
@@ -16,7 +19,7 @@ import java.awt.BorderLayout
 import java.awt.Dimension
 import javax.swing.*
 
-class ConfigurationDialog(project: Project) : DialogWrapper(project) {
+class ConfigurationDialog(private val project: Project) : DialogWrapper(project) {
 
     companion object {
         private val logger = Logger.getInstance(ConfigurationDialog::class.java)
@@ -27,7 +30,7 @@ class ConfigurationDialog(project: Project) : DialogWrapper(project) {
     private val generalPanel = GeneralOptionsPanel(currentConfig)
     private val jitPanel = JitOptionsPanel(currentConfig)
     private val buildPanel = BuildOptionsPanel(currentConfig)
-    private val runtimePanel = RuntimeOptionsPanel(currentConfig)
+    private val runtimePanel = RuntimeOptionsPanel(project, currentConfig)
 
     init {
         logger.debug("Opening configuration dialog")
@@ -78,13 +81,17 @@ class ConfigurationDialog(project: Project) : DialogWrapper(project) {
                 useDotnetBuildForReload = buildPanel.useDotnetBuildForReload,
                 targetFrameworkOverride = buildPanel.targetFrameworkOverride,
                 selectedCompiler = jitPanel.selectedCompiler,
-                disassemblyTimeoutSeconds = runtimePanel.disassemblyTimeoutSeconds
+                disassemblyTimeoutSeconds = runtimePanel.disassemblyTimeoutSeconds,
+                useCustomRuntime = runtimePanel.useCustomRuntime,
+                pathToLocalCoreClr = runtimePanel.pathToLocalCoreClr
             )
         )
 
         super.doOKAction()
     }
 
+    override fun doValidate(): ValidationInfo? = runtimePanel.validate()
+
     override fun doCancelAction() {
         logger.debug("Cancelling configuration dialog")
         super.doCancelAction()
@@ -196,7 +203,7 @@ class ConfigurationDialog(project: Project) : DialogWrapper(project) {
         }
     }
 
-    private class RuntimeOptionsPanel(config: JitConfiguration) {
+    private class RuntimeOptionsPanel(project: Project, config: JitConfiguration) {
         private val runAppModeCheckbox = JBCheckBox(AsmViewerBundle.message("runtime.run.app.mode"), config.runAppMode)
         private val runAppModeHelp = ContextHelpLabel.create(AsmViewerBundle.message("runtime.run.project.help")).apply {
             icon = com.intellij.icons.AllIcons.General.Warning
@@ -204,13 +211,58 @@ class ConfigurationDialog(project: Project) : DialogWrapper(project) {
         private val timeoutSpinner = JSpinner(SpinnerNumberModel(config.disassemblyTimeoutSeconds, 0, 3600, 10))
         private val timeoutHelp = ContextHelpLabel.create(AsmViewerBundle.message("runtime.timeout.help"))
 
+        private val useCustomRuntimeCheckbox = JBCheckBox(
+            AsmViewerBundle.message("runtime.custom.runtime"), config.useCustomRuntime
+        )
+        private val customRuntimeHelp = ContextHelpLabel.create(AsmViewerBundle.message("runtime.custom.runtime.help"))
+        private val pathField = TextFieldWithBrowseButton().apply {
+            val fieldSize = Dimension(JBUI.scale(360), preferredSize.height)
+            preferredSize = fieldSize
+            maximumSize = fieldSize
+            text = config.pathToLocalCoreClr ?: ""
+            isEnabled = config.useCustomRuntime
+            addBrowseFolderListener(
+                project,
+                FileChooserDescriptorFactory.createSingleFolderDescriptor()
+                    .withTitle(AsmViewerBundle.message("runtime.custom.runtime.path.label"))
+            )
+        }
+
+        init {
+            useCustomRuntimeCheckbox.addItemListener {
+                pathField.isEnabled = useCustomRuntimeCheckbox.isSelected
+            }
+        }
+
         val runAppMode: Boolean get() = runAppModeCheckbox.isSelected
         val disassemblyTimeoutSeconds: Int get() = timeoutSpinner.value as Int
+        val useCustomRuntime: Boolean get() = useCustomRuntimeCheckbox.isSelected
+        val pathToLocalCoreClr: String? get() = pathField.text.takeIf { it.isNotBlank() && useCustomRuntime }
+
+        fun validate(): ValidationInfo? {
+            if (useCustomRuntime && pathField.text.isBlank()) {
+                return ValidationInfo(AsmViewerBundle.message("runtime.custom.runtime.path.required"), pathField)
+            }
+
+            return null
+        }
 
         fun addToForm(formBuilder: FormBuilder) {
             formBuilder
                 .addComponent(runAppModeCheckbox.withHelp(runAppModeHelp))
                 .addLabeledComponent(AsmViewerBundle.message("runtime.timeout.label"), timeoutSpinner.withHelp(timeoutHelp))
+                .addVerticalGap(10)
+                .addComponent(useCustomRuntimeCheckbox.withHelp(customRuntimeHelp))
+                .addComponent(createIndentedPathField())
+        }
+
+        private fun createIndentedPathField() = JPanel().apply {
+            layout = BoxLayout(this, BoxLayout.X_AXIS)
+            border = JBUI.Borders.emptyLeft(20)
+            add(JBLabel(AsmViewerBundle.message("runtime.custom.runtime.path.label")))
+            add(Box.createHorizontalStrut(JBUI.scale(6)))
+            add(pathField)
+            add(Box.createHorizontalGlue())
         }
     }
 }
diff --git a/src/rider/main/resources/messages/AsmViewerBundle.properties b/src/rider/main/resources/messages/AsmViewerBundle.properties
index 7b470c4..4f66801 100644
--- a/src/rider/main/resources/messages/AsmViewerBundle.properties
+++ b/src/rider/main/resources/messages/AsmViewerBundle.properties
@@ -43,6 +43,10 @@ build.use.publish=dotnet publish
 build.no.restore=Skip Package Restore
 build.target.framework.label=Target Framework:
 build.target.framework.placeholder=auto (newest)
+runtime.custom.runtime=Use Custom Runtime (local dotnet/runtime build)
+runtime.custom.runtime.help=Use a locally built dotnet/runtime repo instead of the system .NET SDK. Requires .NET 7+ target framework.
+runtime.custom.runtime.path.label=Path to dotnet/runtime:
+runtime.custom.runtime.path.required=Path to dotnet/runtime is required when custom runtime is enabled.
 runtime.run.app.mode=Run Project
 runtime.run.project.help=Runs the entire application instead of analyzing a single method in isolation. <b>Warning:</b> may take a long time or hang if the application waits for input.
 runtime.timeout.label=Timeout (seconds):