Skip to content

Commit 20c223a

Browse files
committed
Fix building twice with PlayInEditor, bump to v1.1.1
This was also causing an issue where a breakpoint source location would not be found when running for the first time after building the project.
1 parent 0daca48 commit 20c223a

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

GodotAddinVS/Debugging/GodotDebuggableProjectCfg.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,17 @@ public int get_RootURL(out string pbstrRootURL)
9292

9393
public int DebugLaunch(uint grfLaunch)
9494
{
95+
bool noDebug = ((__VSDBGLAUNCHFLAGS)grfLaunch & __VSDBGLAUNCHFLAGS.DBGLAUNCH_NoDebug) != 0;
96+
_ = noDebug; // TODO: Run without Debugging
97+
9598
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
9699

97100
var random = new Random(DateTime.Now.Millisecond);
98101
var port = 8800 + random.Next(0, 100);
99102

100103
var startArgs = new SoftDebuggerListenArgs(_baseProject.Name, IPAddress.Loopback, port) {MaxConnectionAttempts = 3};
101104

102-
var startInfo = new GodotStartInfo(startArgs, null, _baseProject) { WorkingDirectory = GodotPackage.Instance.GodotSolutionEventsListener?.SolutionDir};
105+
var startInfo = new GodotStartInfo(startArgs, null, _baseProject) {WorkingDirectory = GodotPackage.Instance.GodotSolutionEventsListener?.SolutionDir};
103106
var session = new GodotDebuggerSession();
104107

105108
var launcher = new MonoDebuggerLauncher(new Progress<string>());

GodotAddinVS/Debugging/GodotDebuggerSession.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,13 @@ protected override void OnRun(DebuggerStartInfo startInfo)
9898

9999
const string host = "127.0.0.1";
100100

101-
var playRequest = new DebugPlayRequest {DebuggerHost = host, DebuggerPort = assignedDebugPort};
101+
var playRequest = new DebugPlayRequest
102+
{
103+
DebuggerHost = host,
104+
DebuggerPort = assignedDebugPort,
105+
BuildBeforePlaying = false
106+
};
107+
102108
_ = godotMessagingClient.SendRequest<DebugPlayResponse>(playRequest)
103109
.ContinueWith(t =>
104110
{

GodotAddinVS/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
// You can specify all the values or you can default the Build and Revision Numbers
2929
// by using the '*' as shown below:
3030
// [assembly: AssemblyVersion("1.0.*")]
31-
[assembly: AssemblyVersion("1.1.0.0")]
32-
[assembly: AssemblyFileVersion("1.1.0.0")]
31+
[assembly: AssemblyVersion("1.1.1.0")]
32+
[assembly: AssemblyFileVersion("1.1.1.0")]

GodotAddinVS/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="GodotAddinVS" Version="1.1.0" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
4+
<Identity Id="GodotAddinVS" Version="1.1.1" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
55
<DisplayName>Godot Support</DisplayName>
66
<Description xml:space="preserve">Support for Godot Engine C# projects, including debugging and extended code completion.</Description>
77
<License>LICENSE.txt</License>

0 commit comments

Comments
 (0)