Skip to content

fix: resolve Roslyn assemblies on macOS (Unity.app/Contents path) #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dougfy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve Roslyn assemblies on macOS (Unity.app/Contents path) #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions Editor/MCPEditorCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,39 @@ private static bool TryLoadRoslyn()
// If not already loaded, try to find and load them from the Unity editor directory
if (_roslynCSharpAsm == null || _roslynCoreAsm == null)
{
string editorDir = Path.GetDirectoryName(EditorApplication.applicationPath);
string managedDir = Path.Combine(editorDir, "Data", "Managed");
string toolsDir = Path.Combine(editorDir, "Data", "Tools", "Roslyn");
// Mono-compatible Roslyn assemblies (preferred for Unity's Mono runtime)
string monoDir = Path.Combine(editorDir, "Data", "MonoBleedingEdge", "lib", "mono", "4.5");
string msbuildRoslynDir = Path.Combine(editorDir, "Data", "MonoBleedingEdge", "lib", "mono", "msbuild", "Current", "bin", "Roslyn");
// ApiUpdater has full Roslyn assemblies
string apiUpdaterDir = Path.Combine(editorDir, "Data", "Tools", "BuildPipeline", "Compilation", "ApiUpdater");
// DotNetSdkRoslyn contains .NET Core assemblies — may fail on Mono, tried last
string sdkRoslynDir = Path.Combine(editorDir, "Data", "DotNetSdkRoslyn");

foreach (var searchDir in new[] { managedDir, toolsDir, monoDir, msbuildRoslynDir, apiUpdaterDir, sdkRoslynDir, editorDir })
// Resolve the editor's "Data" directory across platforms.
// Windows: <EditorDir>/Data/...
// macOS: EditorApplication.applicationPath ends in "Unity.app"; Data lives at Unity.app/Contents
// Linux: <EditorDir>/Data/... (same as Windows)
string appPath = EditorApplication.applicationPath;
string editorDir = Path.GetDirectoryName(appPath);
var dataRoots = new List<string>();
// Windows / Linux layout
if (!string.IsNullOrEmpty(editorDir))
dataRoots.Add(Path.Combine(editorDir, "Data"));
// macOS layout: Unity.app/Contents
if (!string.IsNullOrEmpty(appPath) && appPath.EndsWith(".app", StringComparison.OrdinalIgnoreCase))
dataRoots.Add(Path.Combine(appPath, "Contents"));

var searchDirs = new List<string>();
foreach (var data in dataRoots)
{
searchDirs.Add(Path.Combine(data, "Managed"));
searchDirs.Add(Path.Combine(data, "Tools", "Roslyn"));
// Mono-compatible Roslyn assemblies (preferred for Unity's Mono runtime)
searchDirs.Add(Path.Combine(data, "MonoBleedingEdge", "lib", "mono", "4.5"));
searchDirs.Add(Path.Combine(data, "MonoBleedingEdge", "lib", "mono", "msbuild", "Current", "bin", "Roslyn"));
// ApiUpdater has full Roslyn assemblies
searchDirs.Add(Path.Combine(data, "Tools", "BuildPipeline", "Compilation", "ApiUpdater"));
// ScriptUpdater also ships Roslyn (Mono-compatible)
searchDirs.Add(Path.Combine(data, "Tools", "ScriptUpdater"));
// DotNetSdkRoslyn contains .NET Core assemblies — may fail on Mono, tried last
searchDirs.Add(Path.Combine(data, "DotNetSdkRoslyn"));
}
if (!string.IsNullOrEmpty(editorDir))
searchDirs.Add(editorDir);

foreach (var searchDir in searchDirs)
{
if (!Directory.Exists(searchDir)) continue;
if (_roslynCoreAsm == null)
Expand Down