diff options
-rw-r--r-- | mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs | 2 | ||||
-rw-r--r-- | mcs/class/Mono.Debugger.Soft/Test/dtest.cs | 3 | ||||
-rw-r--r-- | mono/mini/debugger-agent.c | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs index 252959eb361..de8604c29c0 100644 --- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs +++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs @@ -439,7 +439,7 @@ namespace Mono.Debugger.Soft * with newer runtimes, and vice versa. */ internal const int MAJOR_VERSION = 2; - internal const int MINOR_VERSION = 56; + internal const int MINOR_VERSION = 57; enum WPSuspendPolicy { NONE = 0, diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs index a8f12094bbd..8c953f6fe3d 100644 --- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs +++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs @@ -65,9 +65,6 @@ public class DebuggerTests Event GetNextEvent () { var es = vm.GetNextEventSet (); Assert.AreEqual (1, es.Events.Length); - if (step_req != null && es [0] != null && es [0].Request != null && es [0].Request is StepEventRequest && ((StepEventRequest)es [0].Request).GetId() != step_req.GetId()) { - step_req = ((StepEventRequest)es [0].Request); - } return es [0]; } diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c index 577a499d95d..fac4893af85 100644 --- a/mono/mini/debugger-agent.c +++ b/mono/mini/debugger-agent.c @@ -294,7 +294,7 @@ typedef struct { #define HEADER_LENGTH 11 #define MAJOR_VERSION 2 -#define MINOR_VERSION 56 +#define MINOR_VERSION 57 typedef enum { CMD_SET_VM = 1, @@ -4983,7 +4983,6 @@ debugger_agent_breakpoint_from_context (MonoContext *ctx) if (MONO_CONTEXT_GET_IP (ctx) == orig_ip - 1) MONO_CONTEXT_SET_IP (ctx, orig_ip); } - static void ss_args_destroy (SingleStepArgs *ss_args) { @@ -4994,6 +4993,8 @@ ss_args_destroy (SingleStepArgs *ss_args) static int handle_multiple_ss_requests (void) { + if (!CHECK_PROTOCOL_VERSION (2, 57)) + return DE_ERR_NOT_IMPLEMENTED; return 1; } |