From db6cd171a29c79d17a62d1644c3a81c0582c2578 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Fri, 3 Sep 2010 18:32:47 +0200
Subject: [PATCH] Adjust line numbers in debugger unit test to new file
 headers.

---
 .../Debugger.Tests/Tests/AppDomain_Tests.cs   |   4 +-
 .../Debugger.Tests/Tests/Breakpoint_Tests.cs  |  28 ++---
 .../Tests/ControlFlow_DebuggeeKilled.cs       |   2 +-
 .../Tests/ControlFlow_MainThreadExit.cs       |   4 +-
 .../Tests/ControlFlow_Stepping.cs             | 114 +++++++++---------
 .../ControlFlow_TerminatePausedProcess.cs     |   4 +-
 .../ControlFlow_TerminateRunningProcess.cs    |   8 +-
 .../DebugType_CompilerGeneratedClasses.cs     |   6 +-
 .../Debugger.Tests/Tests/DebugType_Tests.cs   |   2 +-
 .../Debugger.Tests/Tests/DynamicCode.cs       |   4 +-
 .../Debugger.Tests/Tests/Exception_Custom.cs  |   2 +-
 .../Tests/Exception_StackOverflow.cs          |   4 +-
 .../Tests/ExpressionEvaluator_Tests.cs        |   8 +-
 .../Tests/Process_MemoryReadWrite.cs          |   2 +-
 .../Tests/StackFrame_Callstack.cs             |  18 +--
 .../Tests/StackFrame_Lifetime.cs              |  22 ++--
 .../Debugger.Tests/Tests/StackFrame_SetIP.cs  |  10 +-
 .../Debugger.Tests/Tests/StackFrame_Tests.cs  |   8 +-
 .../Tests/StackFrame_VariablesLifetime.cs     |  10 +-
 .../Debugger.Tests/Tests/Thread_Tests.cs      |   4 +-
 .../Debugger.Tests/Tests/Value_Tests.cs       |   2 +-
 .../Debugger.Tests/Tests/_HelloWorldTest.cs   |   2 +-
 22 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
index 534197f5f6..22684b3201 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
@@ -63,11 +63,11 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>AppDomain_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break AppDomain_Tests.cs:17,4-17,40</DebuggingPaused>
+    <DebuggingPaused>Break AppDomain_Tests.cs:13,4-13,40</DebuggingPaused>
     <SameDomainEqual>True</SameDomainEqual>
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>AppDomain_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break AppDomain_Tests.cs:30,4-30,40</DebuggingPaused>
+    <DebuggingPaused>Break AppDomain_Tests.cs:26,4-26,40</DebuggingPaused>
     <AppDomainName>myDomain Id=2</AppDomainName>
     <OtherDomainEqual>False</OtherDomainEqual>
     <AppDomainsEqual>False</AppDomainsEqual>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
index 34623f57b7..0909840898 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
@@ -28,8 +28,8 @@ namespace Debugger.Tests {
 		[NUnit.Framework.Test]
 		public void Breakpoint_Tests()
 		{
-			Breakpoint breakpoint1 = debugger.Breakpoints.Add(@"Breakpoint_Tests.cs", 18);
-			Breakpoint breakpoint2 = debugger.Breakpoints.Add(@"Breakpoint_Tests.cs", 19);
+			Breakpoint breakpoint1 = debugger.Breakpoints.Add(@"Breakpoint_Tests.cs", 14);
+			Breakpoint breakpoint2 = debugger.Breakpoints.Add(@"Breakpoint_Tests.cs", 15);
 			
 			StartTest();
 			
@@ -61,45 +61,45 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Breakpoint_Tests.exe (Has symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <DebuggingPaused>Break Breakpoint_Tests.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>Break Breakpoint_Tests.cs:12,4-12,40</DebuggingPaused>
     <Breakpoint1>
       <Breakpoint
         Enabled="True"
         FileName="Breakpoint_Tests.cs"
         IsSet="True"
-        Line="18"
-        OriginalLocation="Breakpoint_Tests.cs:18,4-18,49" />
+        Line="14"
+        OriginalLocation="Breakpoint_Tests.cs:14,4-14,49" />
     </Breakpoint1>
     <Breakpoint2>
       <Breakpoint
         Enabled="True"
         FileName="Breakpoint_Tests.cs"
         IsSet="True"
-        Line="19"
-        OriginalLocation="Breakpoint_Tests.cs:20,4-20,49" />
+        Line="15"
+        OriginalLocation="Breakpoint_Tests.cs:16,4-16,49" />
     </Breakpoint2>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>Main 1\r\n</LogMessage>
-    <DebuggingPaused>Breakpoint Breakpoint_Tests.cs:18,4-18,49</DebuggingPaused>
+    <DebuggingPaused>Breakpoint Breakpoint_Tests.cs:14,4-14,49</DebuggingPaused>
     <LogMessage>Main 2\r\n</LogMessage>
-    <DebuggingPaused>Breakpoint Breakpoint_Tests.cs:20,4-20,49</DebuggingPaused>
+    <DebuggingPaused>Breakpoint Breakpoint_Tests.cs:16,4-16,49</DebuggingPaused>
     <LogMessage>Main 3\r\n</LogMessage>
-    <DebuggingPaused>Break Breakpoint_Tests.cs:21,4-21,40</DebuggingPaused>
+    <DebuggingPaused>Break Breakpoint_Tests.cs:17,4-17,40</DebuggingPaused>
     <ProcessExited />
     <Breakpoint1>
       <Breakpoint
         Enabled="True"
         FileName="Breakpoint_Tests.cs"
-        Line="18"
-        OriginalLocation="Breakpoint_Tests.cs:18,4-18,49" />
+        Line="14"
+        OriginalLocation="Breakpoint_Tests.cs:14,4-14,49" />
     </Breakpoint1>
     <Breakpoint2>
       <Breakpoint
         Enabled="True"
         FileName="Breakpoint_Tests.cs"
-        Line="19"
-        OriginalLocation="Breakpoint_Tests.cs:20,4-20,49" />
+        Line="15"
+        OriginalLocation="Breakpoint_Tests.cs:16,4-16,49" />
     </Breakpoint2>
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
index 962189bace..74cf7f1c03 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
@@ -45,7 +45,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_DebuggeeKilled.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_DebuggeeKilled.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_DebuggeeKilled.cs:12,4-12,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
index af1328f14d..a7d21d4b0e 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
@@ -56,7 +56,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_MainThreadExit.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_MainThreadExit.cs:24,4-24,40</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_MainThreadExit.cs:20,4-20,40</DebuggingPaused>
     <ThreadsBeforeExit
       Count="2"
       Selected="Thread Name =  Suspended = False">
@@ -84,7 +84,7 @@ namespace Debugger.Tests {
           RuntimeValue="{System.Threading.Thread}" />
       </Item>
     </ThreadsBeforeExit>
-    <DebuggingPaused>ForcedBreak ControlFlow_MainThreadExit.cs:29,4-29,26</DebuggingPaused>
+    <DebuggingPaused>ForcedBreak ControlFlow_MainThreadExit.cs:25,4-25,26</DebuggingPaused>
     <ThreadsAfterExit
       Count="2"
       Selected="Thread Name = Worker thread Suspended = False">
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
index b9f1816db3..d1b99fbe00 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
@@ -201,75 +201,75 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_Stepping.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_Stepping.cs:102,4-102,40</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_Stepping.cs:98,4-98,40</DebuggingPaused>
     <Log>Starting run with JMC=True</Log>
-    <DebuggingPaused>SetIP ControlFlow_Stepping.cs:103,4-103,37</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,15</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:27,27-27,28</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,15</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,36</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:30,25-30,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,36</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:107,4-107,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:108,4-108,21</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:109,4-109,14</DebuggingPaused>
+    <DebuggingPaused>SetIP ControlFlow_Stepping.cs:99,4-99,37</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:100,4-100,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:23,27-23,28</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:100,4-100,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:101,4-101,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:26,25-26,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:101,4-101,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:102,4-102,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:103,4-103,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,21</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,14</DebuggingPaused>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:62,3-62,4</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:63,4-63,46</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:58,3-58,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:59,4-59,46</DebuggingPaused>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:64,4-64,14</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:62,3-62,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:60,4-60,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:58,3-58,4</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:109,4-109,14</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:110,4-110,35</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:91,50-91,51</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:94,50-94,51</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:110,4-110,35</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:111,3-111,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:87,50-87,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:90,50-90,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:107,3-107,4</DebuggingPaused>
     <Log>Starting run with JMC=True</Log>
-    <DebuggingPaused>SetIP ControlFlow_Stepping.cs:103,4-103,37</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,15</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:27,27-27,28</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,15</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,36</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:30,25-30,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,36</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:107,4-107,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:108,4-108,21</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:109,4-109,14</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:62,3-62,4</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:63,4-63,46</DebuggingPaused>
+    <DebuggingPaused>SetIP ControlFlow_Stepping.cs:99,4-99,37</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:100,4-100,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:23,27-23,28</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:100,4-100,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:101,4-101,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:26,25-26,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:101,4-101,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:102,4-102,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:103,4-103,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,21</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:58,3-58,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:59,4-59,46</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:64,4-64,14</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:62,3-62,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:60,4-60,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:58,3-58,4</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:109,4-109,14</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:110,4-110,35</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:91,50-91,51</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:94,50-94,51</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:110,4-110,35</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:111,3-111,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,14</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:87,50-87,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:90,50-90,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:107,3-107,4</DebuggingPaused>
     <Log>Starting run with JMC=False</Log>
-    <DebuggingPaused>SetIP ControlFlow_Stepping.cs:103,4-103,37</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,15</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,36</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:30,25-30,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,36</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:107,4-107,26</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:108,4-108,21</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:109,4-109,14</DebuggingPaused>
+    <DebuggingPaused>SetIP ControlFlow_Stepping.cs:99,4-99,37</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:100,4-100,15</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:101,4-101,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:26,25-26,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:101,4-101,36</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:102,4-102,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:103,4-103,26</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:104,4-104,21</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:105,4-105,14</DebuggingPaused>
     <LogMessage>ZigZag2</LogMessage>
     <LogMessage>ZigZag2</LogMessage>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:110,4-110,35</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:91,50-91,51</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:94,50-94,51</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:110,4-110,35</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:111,3-111,4</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:87,50-87,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:90,50-90,51</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:106,4-106,35</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_Stepping.cs:107,3-107,4</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
index 1bb6b7a602..ddf35a769f 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
@@ -41,12 +41,12 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminatePausedProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_TerminatePausedProcess.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_TerminatePausedProcess.cs:12,4-12,40</DebuggingPaused>
     <ProcessExited />
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminatePausedProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_TerminatePausedProcess.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_TerminatePausedProcess.cs:12,4-12,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
index ee036026c8..9feda4d2e1 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
@@ -53,15 +53,15 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminateRunningProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_TerminateRunningProcess.cs:20,4-20,40</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_TerminateRunningProcess.cs:21,4-21,26</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_TerminateRunningProcess.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_TerminateRunningProcess.cs:17,4-17,26</DebuggingPaused>
     <Log>Calling terminate</Log>
     <ProcessExited />
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminateRunningProcess.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ControlFlow_TerminateRunningProcess.cs:20,4-20,40</DebuggingPaused>
-    <DebuggingPaused>StepComplete ControlFlow_TerminateRunningProcess.cs:21,4-21,26</DebuggingPaused>
+    <DebuggingPaused>Break ControlFlow_TerminateRunningProcess.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>StepComplete ControlFlow_TerminateRunningProcess.cs:17,4-17,26</DebuggingPaused>
     <Log>Calling terminate</Log>
     <ProcessExited />
   </Test>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
index cb0a544d6b..c958cb2df9 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
@@ -91,7 +91,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>DebugType_CompilerGeneratedClasses.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break DebugType_CompilerGeneratedClasses.cs:38,5-38,41</DebuggingPaused>
+    <DebuggingPaused>Break DebugType_CompilerGeneratedClasses.cs:34,5-34,41</DebuggingPaused>
     <YieldLocalVariables>
       <Item>
         <LocalVariable
@@ -142,7 +142,7 @@ namespace Debugger.Tests {
           Value="103" />
       </Item>
     </YieldLocalVariables>
-    <DebuggingPaused>Break DebugType_CompilerGeneratedClasses.cs:57,6-57,42</DebuggingPaused>
+    <DebuggingPaused>Break DebugType_CompilerGeneratedClasses.cs:53,6-53,42</DebuggingPaused>
     <OutterDelegateLocalVariables>
       <Item>
         <LocalVariable
@@ -199,7 +199,7 @@ namespace Debugger.Tests {
           Value="{Debugger.Tests.DebugType_CompilerGeneratedClasses}" />
       </Item>
     </OutterDelegateLocalVariables>
-    <DebuggingPaused>Break DebugType_CompilerGeneratedClasses.cs:54,7-54,43</DebuggingPaused>
+    <DebuggingPaused>Break DebugType_CompilerGeneratedClasses.cs:50,7-50,43</DebuggingPaused>
     <InnterDelegateLocalVariables>
       <Item>
         <LocalVariable
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs
index a27482aba7..79860c7519 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs
@@ -251,7 +251,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>DebugType_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break DebugType_Tests.cs:171,4-171,40</DebuggingPaused>
+    <DebuggingPaused>Break DebugType_Tests.cs:167,4-167,40</DebuggingPaused>
     <DefinedTypes
       Capacity="16"
       Count="15">
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs
index a0c7d6fb16..311ce0f98b 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs
@@ -77,8 +77,8 @@ namespace Debugger.Tests {
     <ModuleLoaded>DynamicllyGeneratedAssembly (No symbols)</ModuleLoaded>
     <ModuleLoaded>ISymWrapper.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <DebuggingPaused>Break DynamicCode.cs:46,4-46,40</DebuggingPaused>
-    <DebuggingPaused>StepComplete DynamicCode.cs:47,4-47,73</DebuggingPaused>
+    <DebuggingPaused>Break DynamicCode.cs:42,4-42,40</DebuggingPaused>
+    <DebuggingPaused>StepComplete DynamicCode.cs:43,4-43,73</DebuggingPaused>
     <DebuggingPaused>StepComplete Source.txt:1,1-1,100</DebuggingPaused>
     <ProcessExited />
   </Test>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
index 2bd3656c54..afbe5d7973 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
@@ -50,7 +50,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Exception_Custom.exe (Has symbols)</ModuleLoaded>
     <ExceptionThrown>Debugger.Tests.MyException: test2 ---&gt; Debugger.Tests.MyException: test1</ExceptionThrown>
-    <DebuggingPaused>ExceptionIntercepted Exception_Custom.cs:27,5-27,39</DebuggingPaused>
+    <DebuggingPaused>ExceptionIntercepted Exception_Custom.cs:23,5-23,39</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs
index 936c7ae0d8..dc30b414d1 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs
@@ -48,9 +48,9 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Exception_StackOverflow.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break Exception_StackOverflow.cs:16,4-16,40</DebuggingPaused>
+    <DebuggingPaused>Break Exception_StackOverflow.cs:12,4-12,40</DebuggingPaused>
     <ExceptionThrown>Could not intercept: System.StackOverflowException</ExceptionThrown>
-    <DebuggingPaused>Exception Exception_StackOverflow.cs:21,3-21,4</DebuggingPaused>
+    <DebuggingPaused>Exception Exception_StackOverflow.cs:17,3-17,4</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
index 9e2f9eef10..a649e0cc1e 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
@@ -311,9 +311,9 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ExpressionEvaluator_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break ExpressionEvaluator_Tests.cs:147,4-147,40</DebuggingPaused>
-    <DebuggingPaused>StepComplete ExpressionEvaluator_Tests.cs:148,4-148,19</DebuggingPaused>
-    <DebuggingPaused>StepComplete ExpressionEvaluator_Tests.cs:149,4-149,39</DebuggingPaused>
+    <DebuggingPaused>Break ExpressionEvaluator_Tests.cs:143,4-143,40</DebuggingPaused>
+    <DebuggingPaused>StepComplete ExpressionEvaluator_Tests.cs:144,4-144,19</DebuggingPaused>
+    <DebuggingPaused>StepComplete ExpressionEvaluator_Tests.cs:145,4-145,39</DebuggingPaused>
     <Eval> </Eval>
     <Eval> b = 1 </Eval>
     <Eval> i = 4 </Eval>
@@ -451,7 +451,7 @@ namespace Debugger.Tests {
     <TypesIdentitcal>True</TypesIdentitcal>
     <TypesEqual>True</TypesEqual>
     <WorkerThreadMoved>False</WorkerThreadMoved>
-    <DebuggingPaused>Break ExpressionEvaluator_Tests.cs:150,4-150,40</DebuggingPaused>
+    <DebuggingPaused>Break ExpressionEvaluator_Tests.cs:146,4-146,40</DebuggingPaused>
     <WorkerThreadMoved>True</WorkerThreadMoved>
     <ProcessExited />
   </Test>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
index 0110a69ae6..e09fa7c808 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
@@ -69,7 +69,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Process_MemoryReadWrite.exe (Has symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <DebuggingPaused>Break Process_MemoryReadWrite.cs:18,4-18,40</DebuggingPaused>
+    <DebuggingPaused>Break Process_MemoryReadWrite.cs:14,4-14,40</DebuggingPaused>
     <hello>5 0 0 0 48 0 65 0 6C 0 6C 0 6F 0 </hello>
     <world>6 0 0 0 20 0 20 0 20 0 20 0 20 0 21 0 </world>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
index acfe0c10f9..ab203551d6 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
@@ -53,7 +53,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_Callstack.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break StackFrame_Callstack.cs:26,4-26,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Callstack.cs:22,4-22,40</DebuggingPaused>
     <Callstack>
       <Item>
         <StackFrame
@@ -61,7 +61,7 @@ namespace Debugger.Tests {
           FrameIndex="2"
           HasSymbols="True"
           MethodInfo="static void Debugger.Tests.StackFrame_Callstack.Sub2()"
-          NextStatement="StackFrame_Callstack.cs:26,4-26,40"
+          NextStatement="StackFrame_Callstack.cs:22,4-22,40"
           Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
@@ -70,7 +70,7 @@ namespace Debugger.Tests {
           FrameIndex="1"
           HasSymbols="True"
           MethodInfo="static void Debugger.Tests.StackFrame_Callstack.Sub1()"
-          NextStatement="StackFrame_Callstack.cs:21,4-21,11"
+          NextStatement="StackFrame_Callstack.cs:17,4-17,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
@@ -78,11 +78,11 @@ namespace Debugger.Tests {
           ChainIndex="1"
           HasSymbols="True"
           MethodInfo="static void Debugger.Tests.StackFrame_Callstack.Main()"
-          NextStatement="StackFrame_Callstack.cs:16,4-16,11"
+          NextStatement="StackFrame_Callstack.cs:12,4-12,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
-    <DebuggingPaused>StepComplete StackFrame_Callstack.cs:21,4-21,11</DebuggingPaused>
+    <DebuggingPaused>StepComplete StackFrame_Callstack.cs:17,4-17,11</DebuggingPaused>
     <Callstack>
       <Item>
         <StackFrame
@@ -90,7 +90,7 @@ namespace Debugger.Tests {
           FrameIndex="1"
           HasSymbols="True"
           MethodInfo="static void Debugger.Tests.StackFrame_Callstack.Sub1()"
-          NextStatement="StackFrame_Callstack.cs:21,4-21,11"
+          NextStatement="StackFrame_Callstack.cs:17,4-17,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
@@ -98,18 +98,18 @@ namespace Debugger.Tests {
           ChainIndex="1"
           HasSymbols="True"
           MethodInfo="static void Debugger.Tests.StackFrame_Callstack.Main()"
-          NextStatement="StackFrame_Callstack.cs:16,4-16,11"
+          NextStatement="StackFrame_Callstack.cs:12,4-12,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
-    <DebuggingPaused>StepComplete StackFrame_Callstack.cs:16,4-16,11</DebuggingPaused>
+    <DebuggingPaused>StepComplete StackFrame_Callstack.cs:12,4-12,11</DebuggingPaused>
     <Callstack>
       <Item>
         <StackFrame
           ChainIndex="1"
           HasSymbols="True"
           MethodInfo="static void Debugger.Tests.StackFrame_Callstack.Main()"
-          NextStatement="StackFrame_Callstack.cs:16,4-16,11"
+          NextStatement="StackFrame_Callstack.cs:12,4-12,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
index ce6298edfa..de7527dadb 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
@@ -66,7 +66,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_Lifetime.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break StackFrame_Lifetime.cs:22,4-22,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Lifetime.cs:18,4-18,40</DebuggingPaused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="1"
@@ -74,10 +74,10 @@ namespace Debugger.Tests {
         FrameIndex="1"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.Function(Int32 i)"
-        NextStatement="StackFrame_Lifetime.cs:22,4-22,40"
+        NextStatement="StackFrame_Lifetime.cs:18,4-18,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
-    <DebuggingPaused>Break StackFrame_Lifetime.cs:29,4-29,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Lifetime.cs:25,4-25,40</DebuggingPaused>
     <Old_StackFrame>
       <StackFrame
         ArgumentCount="1"
@@ -85,7 +85,7 @@ namespace Debugger.Tests {
         FrameIndex="1"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.Function(Int32 i)"
-        NextStatement="StackFrame_Lifetime.cs:23,4-23,18"
+        NextStatement="StackFrame_Lifetime.cs:19,4-19,18"
         Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
@@ -94,10 +94,10 @@ namespace Debugger.Tests {
         FrameIndex="2"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.SubFunction()"
-        NextStatement="StackFrame_Lifetime.cs:29,4-29,40"
+        NextStatement="StackFrame_Lifetime.cs:25,4-25,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
-    <DebuggingPaused>Break StackFrame_Lifetime.cs:24,4-24,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Lifetime.cs:20,4-20,40</DebuggingPaused>
     <Old_StackFrame>
       <StackFrame
         ArgumentCount="1"
@@ -105,7 +105,7 @@ namespace Debugger.Tests {
         FrameIndex="1"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.Function(Int32 i)"
-        NextStatement="StackFrame_Lifetime.cs:24,4-24,40"
+        NextStatement="StackFrame_Lifetime.cs:20,4-20,40"
         Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
@@ -115,16 +115,16 @@ namespace Debugger.Tests {
         FrameIndex="1"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.Function(Int32 i)"
-        NextStatement="StackFrame_Lifetime.cs:24,4-24,40"
+        NextStatement="StackFrame_Lifetime.cs:20,4-20,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
-    <DebuggingPaused>Break StackFrame_Lifetime.cs:17,4-17,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Lifetime.cs:13,4-13,40</DebuggingPaused>
     <Main>
       <StackFrame
         ChainIndex="1"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.Main()"
-        NextStatement="StackFrame_Lifetime.cs:17,4-17,40"
+        NextStatement="StackFrame_Lifetime.cs:13,4-13,40"
         Thread="Thread Name =  Suspended = False" />
     </Main>
     <Old_StackFrame>
@@ -143,7 +143,7 @@ namespace Debugger.Tests {
         ChainIndex="1"
         HasSymbols="True"
         MethodInfo="static void Debugger.Tests.StackFrame_Lifetime.Main()"
-        NextStatement="StackFrame_Lifetime.cs:17,4-17,40"
+        NextStatement="StackFrame_Lifetime.cs:13,4-13,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
     <ProcessExited />
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
index 24f9d0d65d..1edc275a26 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
@@ -26,9 +26,9 @@ namespace Debugger.Tests {
 		{
 			StartTest();
 			
-			Assert.IsNotNull(process.SelectedStackFrame.CanSetIP("StackFrame_SetIP.cs", 16, 0));
+			Assert.IsNotNull(process.SelectedStackFrame.CanSetIP("StackFrame_SetIP.cs", 12, 0));
 			Assert.IsNull(process.SelectedStackFrame.CanSetIP("StackFrame_SetIP.cs", 100, 0));
-			process.SelectedStackFrame.SetIP("StackFrame_SetIP.cs", 16, 0);
+			process.SelectedStackFrame.SetIP("StackFrame_SetIP.cs", 12, 0);
 			process.Continue();
 			Assert.AreEqual("1\r\n1\r\n", log);
 			
@@ -50,10 +50,10 @@ namespace Debugger.Tests {
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>1\r\n</LogMessage>
-    <DebuggingPaused>Break StackFrame_SetIP.cs:17,4-17,40</DebuggingPaused>
-    <DebuggingPaused>SetIP StackFrame_SetIP.cs:16,4-16,44</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_SetIP.cs:13,4-13,40</DebuggingPaused>
+    <DebuggingPaused>SetIP StackFrame_SetIP.cs:12,4-12,44</DebuggingPaused>
     <LogMessage>1\r\n</LogMessage>
-    <DebuggingPaused>Break StackFrame_SetIP.cs:17,4-17,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_SetIP.cs:13,4-13,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Tests.cs
index cebecd6d1d..bbd7013d2a 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Tests.cs
@@ -57,7 +57,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break StackFrame_Tests.cs:17,5-17,41</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Tests.cs:13,5-13,41</DebuggingPaused>
     <Loop1>
       <Item>
         <LocalVariable
@@ -72,7 +72,7 @@ namespace Debugger.Tests {
           Value="10" />
       </Item>
     </Loop1>
-    <DebuggingPaused>Break StackFrame_Tests.cs:20,5-20,41</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Tests.cs:16,5-16,41</DebuggingPaused>
     <Loop2>
       <Item>
         <LocalVariable
@@ -87,7 +87,7 @@ namespace Debugger.Tests {
           Value="20" />
       </Item>
     </Loop2>
-    <DebuggingPaused>Break StackFrame_Tests.cs:23,4-23,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Tests.cs:19,4-19,40</DebuggingPaused>
     <None>
       <Item>
         <LocalVariable
@@ -96,7 +96,7 @@ namespace Debugger.Tests {
           Value="0" />
       </Item>
     </None>
-    <DebuggingPaused>Break StackFrame_Tests.cs:27,4-27,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_Tests.cs:23,4-23,40</DebuggingPaused>
     <NewVarDefined>
       <Item>
         <LocalVariable
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
index ff1b6d2825..3bb9833307 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
@@ -94,7 +94,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_VariablesLifetime.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:25,4-25,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:21,4-21,40</DebuggingPaused>
     <argument>
       <Value
         AsString="1"
@@ -113,7 +113,7 @@ namespace Debugger.Tests {
         PrimitiveValue="3"
         Type="System.Int32" />
     </_x0040_class>
-    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:34,4-34,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:30,4-30,40</DebuggingPaused>
     <argument>
       <Value
         AsString="{Exception: Value is no longer valid}"
@@ -144,7 +144,7 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </localInSubFunction>
-    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:27,4-27,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:23,4-23,40</DebuggingPaused>
     <argument>
       <Value
         AsString="{Exception: Value is no longer valid}"
@@ -177,7 +177,7 @@ namespace Debugger.Tests {
         PrimitiveValue="{Exception: Value is no longer valid}"
         Type="System.Int32" />
     </localInSubFunction>
-    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:34,4-34,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:30,4-30,40</DebuggingPaused>
     <argument>
       <Value
         AsString="{Exception: Value is no longer valid}"
@@ -216,7 +216,7 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </localInSubFunction_x0028_new_x0029_>
-    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:19,4-19,40</DebuggingPaused>
+    <DebuggingPaused>Break StackFrame_VariablesLifetime.cs:15,4-15,40</DebuggingPaused>
     <argument>
       <Value
         AsString="{Exception: Value is no longer valid}"
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
index 7f00329675..9c46a2a19d 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
@@ -62,7 +62,7 @@ namespace Debugger.Tests {
         RuntimeValue="null" />
     </ThreadStartedEvent>
     <ModuleLoaded>Thread_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break Thread_Tests.cs:17,4-17,40</DebuggingPaused>
+    <DebuggingPaused>Break Thread_Tests.cs:13,4-13,40</DebuggingPaused>
     <Thread>
       <Thread
         Callstack="{static void Debugger.Tests.Thread_Tests.Main()}"
@@ -75,7 +75,7 @@ namespace Debugger.Tests {
         RuntimeValue="{System.Threading.Thread}"
         SelectedStackFrame="static void Debugger.Tests.Thread_Tests.Main()" />
     </Thread>
-    <DebuggingPaused>Break Thread_Tests.cs:19,4-19,40</DebuggingPaused>
+    <DebuggingPaused>Break Thread_Tests.cs:15,4-15,40</DebuggingPaused>
     <Thread>
       <Thread
         Callstack="{static void Debugger.Tests.Thread_Tests.Main()}"
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
index c468572f02..bbb5523d3b 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
@@ -62,7 +62,7 @@ namespace Debugger.Tests {
     <ProcessStarted />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Value_Tests.exe (Has symbols)</ModuleLoaded>
-    <DebuggingPaused>Break Value_Tests.cs:31,4-31,40</DebuggingPaused>
+    <DebuggingPaused>Break Value_Tests.cs:27,4-27,40</DebuggingPaused>
     <LocalVariables>
       <Item>
         <LocalVariable
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
index 477005821f..d32fa7f838 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
@@ -43,7 +43,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>Hello world!\r\n</LogMessage>
-    <DebuggingPaused>Break _HelloWorldTest.cs:18,4-18,40</DebuggingPaused>
+    <DebuggingPaused>Break _HelloWorldTest.cs:14,4-14,40</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>