Skip to content

Commit 2f078e5

Browse files
committed
Merge pull request godotengine#97198 from raulsntos/dotnet/open-visual-studio-with-dotnet-cli
C#: Use dotnet CLI to launch `OpenVisualStudio.dll`
2 parents 90a1192 + ec189b1 commit 2f078e5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<TargetFramework>net6.0-windows</TargetFramework>
66
<LangVersion>10</LangVersion>
77
<Nullable>enable</Nullable>
8-
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
98
<SelfContained>False</SelfContained>
109
<RollForward>LatestMajor</RollForward>
1110
</PropertyGroup>

modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,12 @@ public Error OpenInExternalEditor(Script script, int line, int col)
259259

260260
var args = new List<string>
261261
{
262+
Path.Combine(GodotSharpDirs.DataEditorToolsDir, "GodotTools.OpenVisualStudio.dll"),
262263
GodotSharpDirs.ProjectSlnPath,
263264
line >= 0 ? $"{scriptPath};{line + 1};{col + 1}" : scriptPath
264265
};
265266

266-
string command = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "GodotTools.OpenVisualStudio.exe");
267+
string command = DotNetFinder.FindDotNetExe() ?? "dotnet";
267268

268269
try
269270
{

0 commit comments

Comments
 (0)