diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-22 09:34:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 09:34:47 +0100 |
| commit | 7acdf74a6a87c5a2e91b13a5060ae5ba9d4438a1 (patch) | |
| tree | 7aaf66f551b84a1e42a4ad657509904636171789 | |
| parent | aac31cf0eeafe2beea3d72eef7b6fdcb3a970f27 (diff) | |
| parent | 05946be2f19c75c18972a19cf440a6b020206b2f (diff) | |
Merge pull request #37210 from van800/fix-36995
Fix warning: Property not found: mono/editor/editor_path_optional
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools/BuildManager.cs | 2 | ||||
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs index 94214cbb8f..520e665595 100644 --- a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs +++ b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs @@ -251,7 +251,7 @@ namespace GodotTools var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings(); var msbuild = BuildTool.MsBuildMono; if (OS.IsWindows) - msbuild = RiderPathManager.IsRider((string) editorSettings.GetSetting(RiderPathManager.EditorPathSettingName)) + msbuild = RiderPathManager.IsExternalEditorSetToRider(editorSettings) ? BuildTool.JetBrainsMsBuild : BuildTool.MsBuildVs; diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs index ee5677a6a8..16f91a0925 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs @@ -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) { if (string.IsNullOrEmpty(path)) |