godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warning: Property not found: mono/editor/editor_path_optional (#36995) 

(cherry picked from commit 05946be2f1)
This commit is contained in:
Ivan.Shakhov 2020-03-21 15:33:14 +01:00 committed by Rémi Verschelde
parent d06ae167bf
commit 9d0518cf80
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mono/editor/GodotTools/GodotTools/BuildManager.cs
View File

@ -251,7 +251,7 @@ namespace GodotTools
var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
var msbuild = BuildTool.MsBuildMono; var msbuild = BuildTool.MsBuildMono;
if (OS.IsWindows) if (OS.IsWindows)
msbuild = RiderPathManager.IsRider((string) editorSettings.GetSetting(RiderPathManager.EditorPathSettingName)) msbuild = RiderPathManager.IsExternalEditorSetToRider(editorSettings)
? BuildTool.JetBrainsMsBuild ? BuildTool.JetBrainsMsBuild
: BuildTool.MsBuildVs; : BuildTool.MsBuildVs;

5
modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
View File

@ -55,6 +55,11 @@ namespace GodotTools.Ides.Rider
} }
} }
public static bool IsExternalEditorSetToRider(EditorSettings editorSettings)
{
return editorSettings.HasSetting(EditorPathSettingName) && IsRider((string) editorSettings.GetSetting(EditorPathSettingName));
}
public static bool IsRider(string path) public static bool IsRider(string path)
{ {
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))