From c1a7a7626de04a239494ffe8545dce2be96a89c2 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 25 Jan 2014 22:06:09 +0100
Subject: [PATCH] Adjust line numbers in debugger tests to changed license
 header length.

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

diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
index ff84492c99..f167484683 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
@@ -77,10 +77,10 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>AppDomain_Tests.exe (Has symbols)</ModuleLoaded>
-    <Paused>AppDomain_Tests.cs:13,4-13,40</Paused>
+    <Paused>AppDomain_Tests.cs:28,4-28,40</Paused>
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>AppDomain_Tests.exe (Has symbols)</ModuleLoaded>
-    <Paused>AppDomain_Tests.cs:26,4-26,40</Paused>
+    <Paused>AppDomain_Tests.cs:41,4-41,40</Paused>
     <AppDomainName>myDomain Id=2</AppDomainName>
     <OtherDomainEqual>False</OtherDomainEqual>
     <AppDomain1-ID>1</AppDomain1-ID>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
index 26b0617eca..653f5ad42a 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
@@ -47,8 +47,8 @@ namespace Debugger.Tests {
 			
 			string filename = CurrentStackFrame.NextStatement.Filename;
 			
-			Breakpoint breakpoint1 = debugger.AddBreakpoint(filename, 14);
-			Breakpoint breakpoint2 = debugger.AddBreakpoint(filename, 15);
+			Breakpoint breakpoint1 = debugger.AddBreakpoint(filename, 29);
+			Breakpoint breakpoint2 = debugger.AddBreakpoint(filename, 30);
 			
 			Assert.IsTrue(breakpoint1.IsSet);
 			Assert.IsTrue(breakpoint2.IsSet);
@@ -78,37 +78,37 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Breakpoint_Tests.exe (Has symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <Paused>Breakpoint_Tests.cs:12,4-12,40</Paused>
+    <Paused>Breakpoint_Tests.cs:27,4-27,40</Paused>
     <Breakpoint1>
       <Breakpoint
         IsEnabled="True"
         IsSet="True"
-        Line="14" />
+        Line="29" />
     </Breakpoint1>
     <Breakpoint2>
       <Breakpoint
         IsEnabled="True"
         IsSet="True"
-        Line="15" />
+        Line="30" />
     </Breakpoint2>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>Main 1\r\n</LogMessage>
-    <Paused>Breakpoint_Tests.cs:14,4-14,49</Paused>
+    <Paused>Breakpoint_Tests.cs:29,4-29,49</Paused>
     <LogMessage>Main 2\r\n</LogMessage>
-    <Paused>Breakpoint_Tests.cs:16,4-16,49</Paused>
+    <Paused>Breakpoint_Tests.cs:31,4-31,49</Paused>
     <LogMessage>Main 3\r\n</LogMessage>
-    <Paused>Breakpoint_Tests.cs:17,4-17,40</Paused>
+    <Paused>Breakpoint_Tests.cs:32,4-32,40</Paused>
     <Exited />
     <Breakpoint1>
       <Breakpoint
         IsEnabled="True"
-        Line="14" />
+        Line="29" />
     </Breakpoint1>
     <Breakpoint2>
       <Breakpoint
         IsEnabled="True"
-        Line="15" />
+        Line="30" />
     </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 33fdd14666..df5b3fe6ce 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
@@ -60,7 +60,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_DebuggeeKilled.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_DebuggeeKilled.cs:12,4-12,40</Paused>
+    <Paused>ControlFlow_DebuggeeKilled.cs:27,4-27,40</Paused>
     <Exited />
   </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 77d2bef1f3..56e3a68109 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
@@ -71,7 +71,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_MainThreadExit.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_MainThreadExit.cs:20,4-20,40</Paused>
+    <Paused>ControlFlow_MainThreadExit.cs:35,4-35,40</Paused>
     <ThreadsBeforeExit
       Capacity="4"
       Count="2">
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
index 7b31468b7f..7ee16bda9d 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
@@ -218,78 +218,78 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_Stepping.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_Stepping.cs:98,4-98,40</Paused>
+    <Paused>ControlFlow_Stepping.cs:113,4-113,40</Paused>
     <Log>Starting run with JMC=True</Log>
-    <Paused>ControlFlow_Stepping.cs:100,4-100,15</Paused>
-    <Paused>ControlFlow_Stepping.cs:23,27-23,28</Paused>
-    <Paused>ControlFlow_Stepping.cs:100,4-100,15</Paused>
-    <Paused>ControlFlow_Stepping.cs:101,4-101,36</Paused>
-    <Paused>ControlFlow_Stepping.cs:26,25-26,26</Paused>
-    <Paused>ControlFlow_Stepping.cs:101,4-101,36</Paused>
-    <Paused>ControlFlow_Stepping.cs:102,4-102,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:30,8-30,9</Paused>
-    <Paused>ControlFlow_Stepping.cs:102,4-102,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:103,4-103,26</Paused>
-    <Paused>ControlFlow_Stepping.cs:104,4-104,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:105,4-105,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:115,4-115,15</Paused>
+    <Paused>ControlFlow_Stepping.cs:38,27-38,28</Paused>
+    <Paused>ControlFlow_Stepping.cs:115,4-115,15</Paused>
+    <Paused>ControlFlow_Stepping.cs:116,4-116,36</Paused>
+    <Paused>ControlFlow_Stepping.cs:41,25-41,26</Paused>
+    <Paused>ControlFlow_Stepping.cs:116,4-116,36</Paused>
+    <Paused>ControlFlow_Stepping.cs:117,4-117,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:45,8-45,9</Paused>
+    <Paused>ControlFlow_Stepping.cs:117,4-117,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:118,4-118,26</Paused>
+    <Paused>ControlFlow_Stepping.cs:119,4-119,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:120,4-120,14</Paused>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <Paused>ControlFlow_Stepping.cs:58,3-58,4</Paused>
-    <Paused>ControlFlow_Stepping.cs:59,4-59,46</Paused>
+    <Paused>ControlFlow_Stepping.cs:73,3-73,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:74,4-74,46</Paused>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>ZigZag2</LogMessage>
-    <Paused>ControlFlow_Stepping.cs:60,4-60,14</Paused>
-    <Paused>ControlFlow_Stepping.cs:58,3-58,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:75,4-75,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:73,3-73,4</Paused>
     <LogMessage>ZigZag2</LogMessage>
-    <Paused>ControlFlow_Stepping.cs:105,4-105,14</Paused>
-    <Paused>ControlFlow_Stepping.cs:106,4-106,35</Paused>
-    <Paused>ControlFlow_Stepping.cs:87,50-87,51</Paused>
-    <Paused>ControlFlow_Stepping.cs:90,50-90,51</Paused>
-    <Paused>ControlFlow_Stepping.cs:106,4-106,35</Paused>
-    <Paused>ControlFlow_Stepping.cs:107,3-107,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:120,4-120,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:121,4-121,35</Paused>
+    <Paused>ControlFlow_Stepping.cs:102,50-102,51</Paused>
+    <Paused>ControlFlow_Stepping.cs:105,50-105,51</Paused>
+    <Paused>ControlFlow_Stepping.cs:121,4-121,35</Paused>
+    <Paused>ControlFlow_Stepping.cs:122,3-122,4</Paused>
     <Log>Starting run with JMC=True</Log>
-    <Paused>ControlFlow_Stepping.cs:100,4-100,15</Paused>
-    <Paused>ControlFlow_Stepping.cs:23,27-23,28</Paused>
-    <Paused>ControlFlow_Stepping.cs:100,4-100,15</Paused>
-    <Paused>ControlFlow_Stepping.cs:101,4-101,36</Paused>
-    <Paused>ControlFlow_Stepping.cs:26,25-26,26</Paused>
-    <Paused>ControlFlow_Stepping.cs:101,4-101,36</Paused>
-    <Paused>ControlFlow_Stepping.cs:102,4-102,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:30,8-30,9</Paused>
-    <Paused>ControlFlow_Stepping.cs:102,4-102,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:103,4-103,26</Paused>
-    <Paused>ControlFlow_Stepping.cs:104,4-104,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:105,4-105,14</Paused>
-    <Paused>ControlFlow_Stepping.cs:58,3-58,4</Paused>
-    <Paused>ControlFlow_Stepping.cs:59,4-59,46</Paused>
+    <Paused>ControlFlow_Stepping.cs:115,4-115,15</Paused>
+    <Paused>ControlFlow_Stepping.cs:38,27-38,28</Paused>
+    <Paused>ControlFlow_Stepping.cs:115,4-115,15</Paused>
+    <Paused>ControlFlow_Stepping.cs:116,4-116,36</Paused>
+    <Paused>ControlFlow_Stepping.cs:41,25-41,26</Paused>
+    <Paused>ControlFlow_Stepping.cs:116,4-116,36</Paused>
+    <Paused>ControlFlow_Stepping.cs:117,4-117,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:45,8-45,9</Paused>
+    <Paused>ControlFlow_Stepping.cs:117,4-117,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:118,4-118,26</Paused>
+    <Paused>ControlFlow_Stepping.cs:119,4-119,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:120,4-120,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:73,3-73,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:74,4-74,46</Paused>
     <LogMessage>ZigZag2</LogMessage>
-    <Paused>ControlFlow_Stepping.cs:60,4-60,14</Paused>
-    <Paused>ControlFlow_Stepping.cs:58,3-58,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:75,4-75,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:73,3-73,4</Paused>
     <LogMessage>ZigZag2</LogMessage>
-    <Paused>ControlFlow_Stepping.cs:105,4-105,14</Paused>
-    <Paused>ControlFlow_Stepping.cs:106,4-106,35</Paused>
-    <Paused>ControlFlow_Stepping.cs:87,50-87,51</Paused>
-    <Paused>ControlFlow_Stepping.cs:90,50-90,51</Paused>
-    <Paused>ControlFlow_Stepping.cs:106,4-106,35</Paused>
-    <Paused>ControlFlow_Stepping.cs:107,3-107,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:120,4-120,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:121,4-121,35</Paused>
+    <Paused>ControlFlow_Stepping.cs:102,50-102,51</Paused>
+    <Paused>ControlFlow_Stepping.cs:105,50-105,51</Paused>
+    <Paused>ControlFlow_Stepping.cs:121,4-121,35</Paused>
+    <Paused>ControlFlow_Stepping.cs:122,3-122,4</Paused>
     <Log>Starting run with JMC=False</Log>
-    <Paused>ControlFlow_Stepping.cs:100,4-100,15</Paused>
-    <Paused>ControlFlow_Stepping.cs:101,4-101,36</Paused>
-    <Paused>ControlFlow_Stepping.cs:26,25-26,26</Paused>
-    <Paused>ControlFlow_Stepping.cs:101,4-101,36</Paused>
-    <Paused>ControlFlow_Stepping.cs:102,4-102,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:30,8-30,9</Paused>
-    <Paused>ControlFlow_Stepping.cs:102,4-102,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:103,4-103,26</Paused>
-    <Paused>ControlFlow_Stepping.cs:104,4-104,21</Paused>
-    <Paused>ControlFlow_Stepping.cs:105,4-105,14</Paused>
+    <Paused>ControlFlow_Stepping.cs:115,4-115,15</Paused>
+    <Paused>ControlFlow_Stepping.cs:116,4-116,36</Paused>
+    <Paused>ControlFlow_Stepping.cs:41,25-41,26</Paused>
+    <Paused>ControlFlow_Stepping.cs:116,4-116,36</Paused>
+    <Paused>ControlFlow_Stepping.cs:117,4-117,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:45,8-45,9</Paused>
+    <Paused>ControlFlow_Stepping.cs:117,4-117,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:118,4-118,26</Paused>
+    <Paused>ControlFlow_Stepping.cs:119,4-119,21</Paused>
+    <Paused>ControlFlow_Stepping.cs:120,4-120,14</Paused>
     <LogMessage>ZigZag2</LogMessage>
     <LogMessage>ZigZag2</LogMessage>
-    <Paused>ControlFlow_Stepping.cs:106,4-106,35</Paused>
-    <Paused>ControlFlow_Stepping.cs:87,50-87,51</Paused>
-    <Paused>ControlFlow_Stepping.cs:90,50-90,51</Paused>
-    <Paused>ControlFlow_Stepping.cs:106,4-106,35</Paused>
-    <Paused>ControlFlow_Stepping.cs:107,3-107,4</Paused>
+    <Paused>ControlFlow_Stepping.cs:121,4-121,35</Paused>
+    <Paused>ControlFlow_Stepping.cs:102,50-102,51</Paused>
+    <Paused>ControlFlow_Stepping.cs:105,50-105,51</Paused>
+    <Paused>ControlFlow_Stepping.cs:121,4-121,35</Paused>
+    <Paused>ControlFlow_Stepping.cs:122,3-122,4</Paused>
     <Exited />
   </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 d8d3d227d7..a80aba461c 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
@@ -56,12 +56,12 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminatePausedProcess.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_TerminatePausedProcess.cs:12,4-12,40</Paused>
+    <Paused>ControlFlow_TerminatePausedProcess.cs:27,4-27,40</Paused>
     <Exited />
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminatePausedProcess.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_TerminatePausedProcess.cs:12,4-12,40</Paused>
+    <Paused>ControlFlow_TerminatePausedProcess.cs:27,4-27,40</Paused>
     <Exited />
   </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 5c75505097..9dfb7e4306 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
@@ -68,15 +68,15 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminateRunningProcess.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_TerminateRunningProcess.cs:16,4-16,40</Paused>
-    <Paused>ControlFlow_TerminateRunningProcess.cs:17,4-17,26</Paused>
+    <Paused>ControlFlow_TerminateRunningProcess.cs:31,4-31,40</Paused>
+    <Paused>ControlFlow_TerminateRunningProcess.cs:32,4-32,26</Paused>
     <Log>Calling terminate</Log>
     <Exited />
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>ControlFlow_TerminateRunningProcess.exe (Has symbols)</ModuleLoaded>
-    <Paused>ControlFlow_TerminateRunningProcess.cs:16,4-16,40</Paused>
-    <Paused>ControlFlow_TerminateRunningProcess.cs:17,4-17,26</Paused>
+    <Paused>ControlFlow_TerminateRunningProcess.cs:31,4-31,40</Paused>
+    <Paused>ControlFlow_TerminateRunningProcess.cs:32,4-32,26</Paused>
     <Log>Calling terminate</Log>
     <Exited />
   </Test>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
index e1133a77db..4400160339 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
@@ -110,7 +110,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>DebugType_CompilerGeneratedClasses.exe (Has symbols)</ModuleLoaded>
-    <Paused>DebugType_CompilerGeneratedClasses.cs:34,5-34,41</Paused>
+    <Paused>DebugType_CompilerGeneratedClasses.cs:49,5-49,41</Paused>
     <YieldLocalVariables>
       <Item>
         <LocalVariable
@@ -167,7 +167,7 @@ namespace Debugger.Tests {
           Value="{Debugger.Tests.DebugType_CompilerGeneratedClasses}" />
       </Item>
     </YieldLocalVariables>
-    <Paused>DebugType_CompilerGeneratedClasses.cs:53,6-53,42</Paused>
+    <Paused>DebugType_CompilerGeneratedClasses.cs:68,6-68,42</Paused>
     <OutterDelegateLocalVariables>
       <Item>
         <LocalVariable
@@ -224,7 +224,7 @@ namespace Debugger.Tests {
           Value="{Debugger.Tests.DebugType_CompilerGeneratedClasses}" />
       </Item>
     </OutterDelegateLocalVariables>
-    <Paused>DebugType_CompilerGeneratedClasses.cs:50,7-50,43</Paused>
+    <Paused>DebugType_CompilerGeneratedClasses.cs:65,7-65,43</Paused>
     <InnterDelegateLocalVariables>
       <Item>
         <LocalVariable
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs
index 275ed35b4f..df3ce6d2f1 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/DynamicCode.cs
@@ -92,8 +92,8 @@ namespace Debugger.Tests {
     <ModuleLoaded>DynamicllyGeneratedAssembly (No symbols)</ModuleLoaded>
     <ModuleLoaded>ISymWrapper.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <Paused>DynamicCode.cs:42,4-42,40</Paused>
-    <Paused>DynamicCode.cs:43,4-43,73</Paused>
+    <Paused>DynamicCode.cs:57,4-57,40</Paused>
+    <Paused>DynamicCode.cs:58,4-58,73</Paused>
     <Paused>Source.txt:1,1-1,100</Paused>
     <Exited />
   </Test>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
index 66af014e45..621fc51615 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
@@ -65,7 +65,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Exception_Custom.exe (Has symbols)</ModuleLoaded>
     <ExceptionThrown>Debugger.Tests.MyException</ExceptionThrown>
-    <Paused>Exception_Custom.cs:23,5-23,39</Paused>
+    <Paused>Exception_Custom.cs:38,5-38,39</Paused>
     <Exited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
index b46e0a8d81..b971fdb6f6 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
@@ -84,7 +84,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Process_MemoryReadWrite.exe (Has symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
-    <Paused>Process_MemoryReadWrite.cs:14,4-14,40</Paused>
+    <Paused>Process_MemoryReadWrite.cs:29,4-29,40</Paused>
     <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 b36b566eb4..407c88d818 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
@@ -68,14 +68,14 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_Callstack.exe (Has symbols)</ModuleLoaded>
-    <Paused>StackFrame_Callstack.cs:22,4-22,40</Paused>
+    <Paused>StackFrame_Callstack.cs:37,4-37,40</Paused>
     <Callstack>
       <Item>
         <StackFrame
           ChainIndex="1"
           FrameIndex="2"
           MethodInfo="[Method Debugger.Tests.StackFrame_Callstack.Sub2():System.Void]"
-          NextStatement="StackFrame_Callstack.cs:22,4-22,40"
+          NextStatement="StackFrame_Callstack.cs:37,4-37,40"
           Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
@@ -83,42 +83,42 @@ namespace Debugger.Tests {
           ChainIndex="1"
           FrameIndex="1"
           MethodInfo="[Method Debugger.Tests.StackFrame_Callstack.Sub1():System.Void]"
-          NextStatement="StackFrame_Callstack.cs:17,4-17,11"
+          NextStatement="StackFrame_Callstack.cs:32,4-32,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
         <StackFrame
           ChainIndex="1"
           MethodInfo="[Method Debugger.Tests.StackFrame_Callstack.Main():System.Void]"
-          NextStatement="StackFrame_Callstack.cs:12,4-12,11"
+          NextStatement="StackFrame_Callstack.cs:27,4-27,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
-    <Paused>StackFrame_Callstack.cs:17,4-17,11</Paused>
+    <Paused>StackFrame_Callstack.cs:32,4-32,11</Paused>
     <Callstack>
       <Item>
         <StackFrame
           ChainIndex="1"
           FrameIndex="1"
           MethodInfo="[Method Debugger.Tests.StackFrame_Callstack.Sub1():System.Void]"
-          NextStatement="StackFrame_Callstack.cs:17,4-17,11"
+          NextStatement="StackFrame_Callstack.cs:32,4-32,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
         <StackFrame
           ChainIndex="1"
           MethodInfo="[Method Debugger.Tests.StackFrame_Callstack.Main():System.Void]"
-          NextStatement="StackFrame_Callstack.cs:12,4-12,11"
+          NextStatement="StackFrame_Callstack.cs:27,4-27,11"
           Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
-    <Paused>StackFrame_Callstack.cs:12,4-12,11</Paused>
+    <Paused>StackFrame_Callstack.cs:27,4-27,11</Paused>
     <Callstack>
       <Item>
         <StackFrame
           ChainIndex="1"
           MethodInfo="[Method Debugger.Tests.StackFrame_Callstack.Main():System.Void]"
-          NextStatement="StackFrame_Callstack.cs:12,4-12,11"
+          NextStatement="StackFrame_Callstack.cs:27,4-27,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 6452649325..18ba980776 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
@@ -81,24 +81,24 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_Lifetime.exe (Has symbols)</ModuleLoaded>
-    <Paused>StackFrame_Lifetime.cs:18,4-18,40</Paused>
+    <Paused>StackFrame_Lifetime.cs:33,4-33,40</Paused>
     <SelectedStackFrame>
       <StackFrame
         ArgumentCount="1"
         ChainIndex="1"
         FrameIndex="1"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.Function(i:System.Int32):System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:18,4-18,40"
+        NextStatement="StackFrame_Lifetime.cs:33,4-33,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
-    <Paused>StackFrame_Lifetime.cs:25,4-25,40</Paused>
+    <Paused>StackFrame_Lifetime.cs:40,4-40,40</Paused>
     <Old_StackFrame>
       <StackFrame
         ArgumentCount="1"
         ChainIndex="1"
         FrameIndex="1"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.Function(i:System.Int32):System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:19,4-19,18"
+        NextStatement="StackFrame_Lifetime.cs:34,4-34,18"
         Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
@@ -106,17 +106,17 @@ namespace Debugger.Tests {
         ChainIndex="1"
         FrameIndex="2"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.SubFunction():System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:25,4-25,40"
+        NextStatement="StackFrame_Lifetime.cs:40,4-40,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
-    <Paused>StackFrame_Lifetime.cs:20,4-20,40</Paused>
+    <Paused>StackFrame_Lifetime.cs:35,4-35,40</Paused>
     <Old_StackFrame>
       <StackFrame
         ArgumentCount="1"
         ChainIndex="1"
         FrameIndex="1"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.Function(i:System.Int32):System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:20,4-20,40"
+        NextStatement="StackFrame_Lifetime.cs:35,4-35,40"
         Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
@@ -125,15 +125,15 @@ namespace Debugger.Tests {
         ChainIndex="1"
         FrameIndex="1"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.Function(i:System.Int32):System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:20,4-20,40"
+        NextStatement="StackFrame_Lifetime.cs:35,4-35,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
-    <Paused>StackFrame_Lifetime.cs:13,4-13,40</Paused>
+    <Paused>StackFrame_Lifetime.cs:28,4-28,40</Paused>
     <Main>
       <StackFrame
         ChainIndex="1"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.Main():System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:13,4-13,40"
+        NextStatement="StackFrame_Lifetime.cs:28,4-28,40"
         Thread="Thread Name =  Suspended = False" />
     </Main>
     <Old_StackFrame>
@@ -150,7 +150,7 @@ namespace Debugger.Tests {
       <StackFrame
         ChainIndex="1"
         MethodInfo="[Method Debugger.Tests.StackFrame_Lifetime.Main():System.Void]"
-        NextStatement="StackFrame_Lifetime.cs:13,4-13,40"
+        NextStatement="StackFrame_Lifetime.cs:28,4-28,40"
         Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
     <Exited />
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
index b26aa62462..e511d620e9 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
@@ -67,9 +67,9 @@ namespace Debugger.Tests {
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>1\r\n</LogMessage>
-    <Paused>StackFrame_SetIP.cs:13,4-13,40</Paused>
+    <Paused>StackFrame_SetIP.cs:28,4-28,40</Paused>
     <LogMessage>1\r\n</LogMessage>
-    <Paused>StackFrame_SetIP.cs:13,4-13,40</Paused>
+    <Paused>StackFrame_SetIP.cs:28,4-28,40</Paused>
     <Exited />
   </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 48a4a54c67..00c4c14694 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Tests.cs
@@ -72,7 +72,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_Tests.exe (Has symbols)</ModuleLoaded>
-    <Paused>StackFrame_Tests.cs:13,5-13,41</Paused>
+    <Paused>StackFrame_Tests.cs:28,5-28,41</Paused>
     <Loop1>
       <Item>
         <LocalVariable
@@ -87,7 +87,7 @@ namespace Debugger.Tests {
           Value="10" />
       </Item>
     </Loop1>
-    <Paused>StackFrame_Tests.cs:16,5-16,41</Paused>
+    <Paused>StackFrame_Tests.cs:31,5-31,41</Paused>
     <Loop2>
       <Item>
         <LocalVariable
@@ -102,7 +102,7 @@ namespace Debugger.Tests {
           Value="20" />
       </Item>
     </Loop2>
-    <Paused>StackFrame_Tests.cs:19,4-19,40</Paused>
+    <Paused>StackFrame_Tests.cs:34,4-34,40</Paused>
     <None>
       <Item>
         <LocalVariable
@@ -111,7 +111,7 @@ namespace Debugger.Tests {
           Value="0" />
       </Item>
     </None>
-    <Paused>StackFrame_Tests.cs:23,4-23,40</Paused>
+    <Paused>StackFrame_Tests.cs:38,4-38,40</Paused>
     <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 ffe4ef06d3..fc006c7609 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
@@ -109,7 +109,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>StackFrame_VariablesLifetime.exe (Has symbols)</ModuleLoaded>
-    <Paused>StackFrame_VariablesLifetime.cs:21,4-21,40</Paused>
+    <Paused>StackFrame_VariablesLifetime.cs:36,4-36,40</Paused>
     <argument>
       <Value
         PrimitiveValue="1"
@@ -125,7 +125,7 @@ namespace Debugger.Tests {
         PrimitiveValue="3"
         Type="System.Int32" />
     </_x0040_class>
-    <Paused>StackFrame_VariablesLifetime.cs:30,4-30,40</Paused>
+    <Paused>StackFrame_VariablesLifetime.cs:45,4-45,40</Paused>
     <argument>
       <Value
         IsInvalid="True"
@@ -152,7 +152,7 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </localInSubFunction>
-    <Paused>StackFrame_VariablesLifetime.cs:23,4-23,40</Paused>
+    <Paused>StackFrame_VariablesLifetime.cs:38,4-38,40</Paused>
     <argument>
       <Value
         IsInvalid="True"
@@ -181,7 +181,7 @@ namespace Debugger.Tests {
         PrimitiveValue="{Exception: Value is no longer valid}"
         Type="System.Int32" />
     </localInSubFunction>
-    <Paused>StackFrame_VariablesLifetime.cs:30,4-30,40</Paused>
+    <Paused>StackFrame_VariablesLifetime.cs:45,4-45,40</Paused>
     <argument>
       <Value
         IsInvalid="True"
@@ -215,7 +215,7 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </localInSubFunction_x0028_new_x0029_>
-    <Paused>StackFrame_VariablesLifetime.cs:15,4-15,40</Paused>
+    <Paused>StackFrame_VariablesLifetime.cs:30,4-30,40</Paused>
     <argument>
       <Value
         IsInvalid="True"
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
index e05eec8278..95f48a7b77 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
@@ -61,7 +61,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Thread_Tests.exe (Has symbols)</ModuleLoaded>
-    <Paused>Thread_Tests.cs:12,4-12,40</Paused>
+    <Paused>Thread_Tests.cs:27,4-27,40</Paused>
     <Thread>
       <Thread
         Callstack="{[Method Debugger.Tests.Thread_Tests.Main():System.Void]}"
@@ -72,7 +72,7 @@ namespace Debugger.Tests {
         Priority="Normal"
         RuntimeValue="null" />
     </Thread>
-    <Paused>Thread_Tests.cs:15,4-15,40</Paused>
+    <Paused>Thread_Tests.cs:30,4-30,40</Paused>
     <Thread>
       <Thread
         Callstack="{[Method Debugger.Tests.Thread_Tests.Main():System.Void]}"
@@ -83,7 +83,7 @@ namespace Debugger.Tests {
         Priority="AboveNormal"
         RuntimeValue="{System.Threading.Thread}" />
     </Thread>
-    <Paused>Thread_Tests.cs:17,4-17,40</Paused>
+    <Paused>Thread_Tests.cs:32,4-32,40</Paused>
     <Thread>
       <Thread
         Callstack="{[Method Debugger.Tests.Thread_Tests.Main():System.Void]}"
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
index 6e5a708c58..b0ed7ceb5c 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
@@ -77,7 +77,7 @@ namespace Debugger.Tests {
     <Started />
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>Value_Tests.exe (Has symbols)</ModuleLoaded>
-    <Paused>Value_Tests.cs:27,4-27,40</Paused>
+    <Paused>Value_Tests.cs:42,4-42,40</Paused>
     <LocalVariables>
       <Item>
         <LocalVariable
diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
index 1cdf111657..fbeb228d6f 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
@@ -58,7 +58,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>Hello world!\r\n</LogMessage>
-    <Paused>_HelloWorldTest.cs:14,4-14,40</Paused>
+    <Paused>_HelloWorldTest.cs:29,4-29,40</Paused>
     <Exited />
   </Test>
 </DebuggerTests>