Browse Source

C#: Use dotnet CLI to launch OpenVisualStudio.dll

Use the DLL instead of the EXE, so we can rely on the dotnet CLI handling the architecture.
Raul Santos 11 months ago
parent
commit
ec189b1574

+ 0 - 1
modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj

@@ -5,7 +5,6 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <TargetFramework>net6.0-windows</TargetFramework>
     <LangVersion>10</LangVersion>
     <LangVersion>10</LangVersion>
     <Nullable>enable</Nullable>
     <Nullable>enable</Nullable>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>False</SelfContained>
     <SelfContained>False</SelfContained>
     <RollForward>LatestMajor</RollForward>
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
   </PropertyGroup>

+ 2 - 1
modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs

@@ -259,11 +259,12 @@ namespace GodotTools
 
 
                     var args = new List<string>
                     var args = new List<string>
                     {
                     {
+                        Path.Combine(GodotSharpDirs.DataEditorToolsDir, "GodotTools.OpenVisualStudio.dll"),
                         GodotSharpDirs.ProjectSlnPath,
                         GodotSharpDirs.ProjectSlnPath,
                         line >= 0 ? $"{scriptPath};{line + 1};{col + 1}" : scriptPath
                         line >= 0 ? $"{scriptPath};{line + 1};{col + 1}" : scriptPath
                     };
                     };
 
 
-                    string command = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "GodotTools.OpenVisualStudio.exe");
+                    string command = DotNetFinder.FindDotNetExe() ?? "dotnet";
 
 
                     try
                     try
                     {
                     {