PDB XML format cleanup

Remove unnecessary data and implementation details from XML produced by PdbToXml. Update PDB tests accordingly.
The removed data include sizes and versions of CDI blobs, counts of elements (redundant since the elements themselves are included in the XML), hidden sequence point line/columns, etc.

This change only affects tests. (changeset 1395517)

Src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncEHTests.cs

@@ -530,12 +530,12 @@ public static void Main()
 
             v.VerifyPdb("Test.G", @"
 <symbols>
-  <entryPoint declaringType=""Test"" methodName=""Main"" parameterNames="""" />
+  <entryPoint declaringType=""Test"" methodName=""Main"" />
   <methods>
-    <method containingType=""Test"" name=""G"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""2"">
-        <forwardIterator version=""4"" kind=""ForwardIterator"" size=""24"" name=""&lt;G&gt;d__1"" />
-        <encLocalSlotMap version=""4"" kind=""EditAndContinueLocalSlotMap"" size=""28"">
+    <method containingType=""Test"" name=""G"">
+      <customDebugInfo>
+        <forwardIterator name=""&lt;G&gt;d__1"" />
+        <encLocalSlotMap>
           <slot kind=""0"" offset=""15"" />
           <slot kind=""22"" offset=""33"" />
           <slot kind=""23"" offset=""33"" />
@@ -545,7 +545,7 @@ public static void Main()
           <slot kind=""28"" offset=""156"" ordinal=""1"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencepoints total=""0"" />
+      <sequencePoints />
       <locals />
     </method>
   </methods>

Src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenAsyncLocalsTests.cs

@@ -263,9 +263,9 @@ public async Task M(IDisposable disposable)
 <symbols>
   <methods>
     <method containingType=""C"" name=""M"" parameterNames=""disposable"">
-      <customDebugInfo version=""4"" count=""2"">
-        <forwardIterator version=""4"" kind=""ForwardIterator"" size=""24"" name=""&lt;M&gt;d__3"" />
-        <encLocalSlotMap version=""4"" kind=""EditAndContinueLocalSlotMap"" size=""64"">
+      <customDebugInfo>
+        <forwardIterator name=""&lt;M&gt;d__3"" />
+        <encLocalSlotMap>
           <slot kind=""6"" offset=""11"" />
           <slot kind=""8"" offset=""11"" />
           <slot kind=""0"" offset=""11"" />
@@ -287,7 +287,7 @@ public async Task M(IDisposable disposable)
           <slot kind=""2"" offset=""410"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencepoints total=""0"" />
+      <sequencePoints />
       <locals />
     </method>
   </methods>

Src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueStateMachineTests.cs

@@ -237,18 +237,18 @@ static void M()
   </files>
   <methods>
     <method token=""0x600000f"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""1"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""5"">
-        <entry il_offset=""0x0"" hidden=""true"" start_row=""16707566"" start_column=""0"" end_row=""16707566"" end_column=""0"" file_ref=""1"" />
-        <entry il_offset=""0x21"" start_row=""9"" start_column=""5"" end_row=""9"" end_column=""6"" file_ref=""1"" />
-        <entry il_offset=""0x22"" start_row=""10"" start_column=""9"" end_row=""10"" end_column=""24"" file_ref=""1"" />
-        <entry il_offset=""0x34"" hidden=""true"" start_row=""16707566"" start_column=""0"" end_row=""16707566"" end_column=""0"" file_ref=""1"" />
-        <entry il_offset=""0x3b"" start_row=""11"" start_column=""5"" end_row=""11"" end_column=""6"" file_ref=""1"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" hidden=""true"" document=""1"" />
+        <entry offset=""0x21"" startLine=""9"" startColumn=""5"" endLine=""9"" endColumn=""6"" document=""1"" />
+        <entry offset=""0x22"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""24"" document=""1"" />
+        <entry offset=""0x34"" hidden=""true"" document=""1"" />
+        <entry offset=""0x3b"" startLine=""11"" startColumn=""5"" endLine=""11"" endColumn=""6"" document=""1"" />
+      </sequencePoints>
       <locals />
       <scope startOffset=""0x0"" endOffset=""0x3f"">
         <namespace name=""System.Collections.Generic"" />

Src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs

@@ -1632,16 +1632,16 @@ .maxstack  4
   </files>
   <methods>
     <method token=""0x6000001"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""3"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""1"" />
-        <entry il_offset=""0x1"" start_row=""6"" start_column=""9"" end_row=""6"" end_column=""40"" file_ref=""1"" />
-        <entry il_offset=""0x18"" start_row=""7"" start_column=""5"" end_row=""7"" end_column=""6"" file_ref=""1"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""1"" />
+        <entry offset=""0x1"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""40"" document=""1"" />
+        <entry offset=""0x18"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""1"" />
+      </sequencePoints>
       <locals>
         <local name=""a"" il_index=""0"" il_start=""0x0"" il_end=""0x19"" attributes=""0"" />
       </locals>
@@ -3170,20 +3170,20 @@ .maxstack  1
 <symbols>
   <methods>
     <method token=""0x6000003"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""7"">
-        <entry il_offset=""0x0"" start_row=""9"" start_column=""5"" end_row=""9"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""10"" start_column=""9"" end_row=""10"" end_column=""19"" file_ref=""0"" />
-        <entry il_offset=""0x7"" start_row=""11"" start_column=""9"" end_row=""11"" end_column=""22"" file_ref=""0"" />
-        <entry il_offset=""0xd"" start_row=""12"" start_column=""9"" end_row=""12"" end_column=""24"" file_ref=""0"" />
-        <entry il_offset=""0x14"" start_row=""13"" start_column=""9"" end_row=""13"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x1c"" start_row=""14"" start_column=""9"" end_row=""14"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x23"" start_row=""15"" start_column=""5"" end_row=""15"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""9"" startColumn=""5"" endLine=""9"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""19"" document=""0"" />
+        <entry offset=""0x7"" startLine=""11"" startColumn=""9"" endLine=""11"" endColumn=""22"" document=""0"" />
+        <entry offset=""0xd"" startLine=""12"" startColumn=""9"" endLine=""12"" endColumn=""24"" document=""0"" />
+        <entry offset=""0x14"" startLine=""13"" startColumn=""9"" endLine=""13"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x1c"" startLine=""14"" startColumn=""9"" endLine=""14"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x23"" startLine=""15"" startColumn=""5"" endLine=""15"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <local name=""z"" il_index=""3"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
         <local name=""y"" il_index=""1"" il_start=""0x0"" il_end=""0x24"" attributes=""0"" />
@@ -3229,19 +3229,19 @@ .maxstack  1
 <symbols>
   <methods>
     <method token=""0x6000003"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""6"">
-        <entry il_offset=""0x0"" start_row=""9"" start_column=""5"" end_row=""9"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""10"" start_column=""9"" end_row=""10"" end_column=""24"" file_ref=""0"" />
-        <entry il_offset=""0x8"" start_row=""11"" start_column=""9"" end_row=""11"" end_column=""19"" file_ref=""0"" />
-        <entry il_offset=""0xe"" start_row=""12"" start_column=""9"" end_row=""12"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x16"" start_row=""13"" start_column=""9"" end_row=""13"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x1d"" start_row=""14"" start_column=""5"" end_row=""14"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""9"" startColumn=""5"" endLine=""9"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""24"" document=""0"" />
+        <entry offset=""0x8"" startLine=""11"" startColumn=""9"" endLine=""11"" endColumn=""19"" document=""0"" />
+        <entry offset=""0xe"" startLine=""12"" startColumn=""9"" endLine=""12"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x16"" startLine=""13"" startColumn=""9"" endLine=""13"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x1d"" startLine=""14"" startColumn=""5"" endLine=""14"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <local name=""x"" il_index=""5"" il_start=""0x0"" il_end=""0x1e"" attributes=""0"" />
         <local name=""z"" il_index=""3"" il_start=""0x0"" il_end=""0x1e"" attributes=""0"" />
@@ -3287,19 +3287,19 @@ .maxstack  1
 <symbols>
   <methods>
     <method token=""0x6000004"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""6"">
-        <entry il_offset=""0x0"" start_row=""16"" start_column=""5"" end_row=""16"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""17"" start_column=""9"" end_row=""17"" end_column=""24"" file_ref=""0"" />
-        <entry il_offset=""0x7"" start_row=""18"" start_column=""9"" end_row=""18"" end_column=""24"" file_ref=""0"" />
-        <entry il_offset=""0xd"" start_row=""19"" start_column=""9"" end_row=""19"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x14"" start_row=""20"" start_column=""9"" end_row=""20"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x1b"" start_row=""21"" start_column=""5"" end_row=""21"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""16"" startColumn=""5"" endLine=""16"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""17"" startColumn=""9"" endLine=""17"" endColumn=""24"" document=""0"" />
+        <entry offset=""0x7"" startLine=""18"" startColumn=""9"" endLine=""18"" endColumn=""24"" document=""0"" />
+        <entry offset=""0xd"" startLine=""19"" startColumn=""9"" endLine=""19"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x14"" startLine=""20"" startColumn=""9"" endLine=""20"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x1b"" startLine=""21"" startColumn=""5"" endLine=""21"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <local name=""c"" il_index=""2"" il_start=""0x0"" il_end=""0x1c"" attributes=""0"" />
         <local name=""b"" il_index=""1"" il_start=""0x0"" il_end=""0x1c"" attributes=""0"" />
@@ -3377,17 +3377,17 @@ .maxstack  1
 <symbols>
   <methods>
     <method token=""0x6000002"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""4"">
-        <entry il_offset=""0x0"" start_row=""4"" start_column=""5"" end_row=""4"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""5"" start_column=""9"" end_row=""5"" end_column=""19"" file_ref=""0"" />
-        <entry il_offset=""0x3"" start_row=""6"" start_column=""9"" end_row=""6"" end_column=""30"" file_ref=""0"" />
-        <entry il_offset=""0x9"" start_row=""7"" start_column=""5"" end_row=""7"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""4"" startColumn=""5"" endLine=""4"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""5"" startColumn=""9"" endLine=""5"" endColumn=""19"" document=""0"" />
+        <entry offset=""0x3"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""30"" document=""0"" />
+        <entry offset=""0x9"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <local name=""a"" il_index=""2"" il_start=""0x0"" il_end=""0xa"" attributes=""0"" />
         <local name=""b"" il_index=""1"" il_start=""0x0"" il_end=""0xa"" attributes=""0"" />

Src/Compilers/CSharp/Test/Emit/PDB/CSharpPDBTestBase.cs

@@ -42,14 +42,14 @@ public static bool CheckIfSpanWithinSequencePoints(TextSpan span, string source,
             var doc = new XmlDocument();
             doc.LoadXml(pdb);
 
-            foreach (XmlNode entry in doc.GetElementsByTagName("sequencepoints"))
+            foreach (XmlNode entry in doc.GetElementsByTagName("sequencePoints"))
             {
                 foreach (XmlElement item in entry.ChildNodes)
                 {
-                    if (startRow.ToString() == item.GetAttribute("start_row") &&
-                        startColumn.ToString() == item.GetAttribute("start_column") &&
-                        endRow.ToString() == item.GetAttribute("end_row") &&
-                        endColumn.ToString() == item.GetAttribute("end_column"))
+                    if (startRow.ToString() == item.GetAttribute("startLine") &&
+                        startColumn.ToString() == item.GetAttribute("startColumn") &&
+                        endRow.ToString() == item.GetAttribute("endLine") &&
+                        endColumn.ToString() == item.GetAttribute("endColumn"))
                     {
                         return true;
                     }

Src/Compilers/CSharp/Test/Emit/PDB/CheckSumTest.cs

@@ -40,26 +40,26 @@ public void ChecksumAlgorithms()
     <file id=""2"" name=""sha256.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" checkSumAlgorithmId=""8829d00f-11b8-4213-878b-770e8597ac16"" checkSum=""83, 31, 5B, 52,  8, 2D, 68, 54, 14, 88,  E, E3, 3A, 5E, B7, 83, 86, 53, 83, B4, 5A, 3F, 36, 9E, 5F, 1B, 60, 33, 27,  A, 8A, EC, "" />
   </files>
   <methods>
-    <method containingType=""C1"" name="".ctor"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C1"" name="".ctor"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""1"" start_column=""19"" end_row=""1"" end_column=""30"" file_ref=""1"" />
-        <entry il_offset=""0x6"" start_row=""1"" start_column=""33"" end_row=""1"" end_column=""34"" file_ref=""1"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""1"" startColumn=""19"" endLine=""1"" endColumn=""30"" document=""1"" />
+        <entry offset=""0x6"" startLine=""1"" startColumn=""33"" endLine=""1"" endColumn=""34"" document=""1"" />
+      </sequencePoints>
       <locals />
     </method>
-    <method containingType=""C256"" name="".ctor"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <forward version=""4"" kind=""ForwardInfo"" size=""12"" declaringType=""C1"" methodName="".ctor"" parameterNames="""" />
+    <method containingType=""C256"" name="".ctor"">
+      <customDebugInfo>
+        <forward declaringType=""C1"" methodName="".ctor"" />
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""1"" start_column=""21"" end_row=""1"" end_column=""34"" file_ref=""2"" />
-        <entry il_offset=""0x6"" start_row=""1"" start_column=""37"" end_row=""1"" end_column=""38"" file_ref=""2"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""1"" startColumn=""21"" endLine=""1"" endColumn=""34"" document=""2"" />
+        <entry offset=""0x6"" startLine=""1"" startColumn=""37"" endLine=""1"" endColumn=""38"" document=""2"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -245,17 +245,17 @@ static void Main()
     <file id=""4"" name=""a.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" checkSumAlgorithmId=""ff1816ec-aa5e-4d10-87f7-6f4963833460"" checkSum=""F0, C4, 23, 63, A5, 89, B9, 29, AF, 94,  7, 85, 2F, 3A, 40, D3, 70, 14, 8F, 9B, "" />
   </files>
   <methods>
-    <method containingType=""C"" name=""Main"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""Main"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""3"">
-        <entry il_offset=""0x0"" start_row=""112"" start_column=""9"" end_row=""112"" end_column=""23"" file_ref=""1"" />
-        <entry il_offset=""0x6"" start_row=""112"" start_column=""9"" end_row=""112"" end_column=""24"" file_ref=""2"" />
-        <entry il_offset=""0xc"" start_row=""19"" start_column=""5"" end_row=""19"" end_column=""6"" file_ref=""3"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""112"" startColumn=""9"" endLine=""112"" endColumn=""23"" document=""1"" />
+        <entry offset=""0x6"" startLine=""112"" startColumn=""9"" endLine=""112"" endColumn=""24"" document=""2"" />
+        <entry offset=""0xc"" startLine=""19"" startColumn=""5"" endLine=""19"" endColumn=""6"" document=""3"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -287,16 +287,16 @@ void M()
     <file id=""1"" name=""b:\base\b.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" checkSumAlgorithmId=""ff1816ec-aa5e-4d10-87f7-6f4963833460"" checkSum="" 5, 25, 26, AE, 53, A0, 54, 46, AC, A6, 1D, 8A, 3B, 1E, 3F, C3, 43, 39, FB, 59, "" />
   </files>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""1"" />
-        <entry il_offset=""0x1"" start_row=""6"" start_column=""5"" end_row=""6"" end_column=""6"" file_ref=""1"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""1"" />
+        <entry offset=""0x1"" startLine=""6"" startColumn=""5"" endLine=""6"" endColumn=""6"" document=""1"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -328,16 +328,16 @@ class C { void M() { } }
     <file id=""1"" name=""a\..\a.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" checkSumAlgorithmId=""406ea660-64cf-4c82-b6f0-42d48172a799"" checkSum=""AB,  0, 7F, 1D, 23, D5, "" />
   </files>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""10"" start_column=""20"" end_row=""10"" end_column=""21"" file_ref=""1"" />
-        <entry il_offset=""0x1"" start_row=""10"" start_column=""22"" end_row=""10"" end_column=""23"" file_ref=""1"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""10"" startColumn=""20"" endLine=""10"" endColumn=""21"" document=""1"" />
+        <entry offset=""0x1"" startLine=""10"" startColumn=""22"" endLine=""10"" endColumn=""23"" document=""1"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -383,22 +383,22 @@ void M()
     <file id=""3"" name=""q:\absolute\file.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" />
   </files>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""8"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""1"" />
-        <entry il_offset=""0x1"" start_row=""6"" start_column=""9"" end_row=""6"" end_column=""13"" file_ref=""1"" />
-        <entry il_offset=""0x8"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""2"" />
-        <entry il_offset=""0xf"" start_row=""2"" start_column=""9"" end_row=""2"" end_column=""13"" file_ref=""2"" />
-        <entry il_offset=""0x16"" start_row=""3"" start_column=""9"" end_row=""3"" end_column=""13"" file_ref=""2"" />
-        <entry il_offset=""0x1d"" start_row=""4"" start_column=""9"" end_row=""4"" end_column=""13"" file_ref=""2"" />
-        <entry il_offset=""0x24"" start_row=""5"" start_column=""9"" end_row=""5"" end_column=""13"" file_ref=""3"" />
-        <entry il_offset=""0x2b"" start_row=""6"" start_column=""5"" end_row=""6"" end_column=""6"" file_ref=""3"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""1"" />
+        <entry offset=""0x1"" startLine=""6"" startColumn=""9"" endLine=""6"" endColumn=""13"" document=""1"" />
+        <entry offset=""0x8"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""2"" />
+        <entry offset=""0xf"" startLine=""2"" startColumn=""9"" endLine=""2"" endColumn=""13"" document=""2"" />
+        <entry offset=""0x16"" startLine=""3"" startColumn=""9"" endLine=""3"" endColumn=""13"" document=""2"" />
+        <entry offset=""0x1d"" startLine=""4"" startColumn=""9"" endLine=""4"" endColumn=""13"" document=""2"" />
+        <entry offset=""0x24"" startLine=""5"" startColumn=""9"" endLine=""5"" endColumn=""13"" document=""3"" />
+        <entry offset=""0x2b"" startLine=""6"" startColumn=""5"" endLine=""6"" endColumn=""6"" document=""3"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -452,22 +452,22 @@ void M()
     <file id=""6"" name=""b:\base\e.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" checkSumAlgorithmId=""406ea660-64cf-4c82-b6f0-42d48172a799"" checkSum=""AB,  0, 7F, 1D, 23, D9, "" />
   </files>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""8"">
-        <entry il_offset=""0x0"" start_row=""10"" start_column=""5"" end_row=""10"" end_column=""6"" file_ref=""1"" />
-        <entry il_offset=""0x1"" start_row=""11"" start_column=""9"" end_row=""11"" end_column=""13"" file_ref=""1"" />
-        <entry il_offset=""0x8"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""2"" />
-        <entry il_offset=""0xf"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""3"" />
-        <entry il_offset=""0x16"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""4"" />
-        <entry il_offset=""0x1d"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""5"" />
-        <entry il_offset=""0x24"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""6"" />
-        <entry il_offset=""0x2b"" start_row=""2"" start_column=""5"" end_row=""2"" end_column=""6"" file_ref=""6"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""1"" />
+        <entry offset=""0x1"" startLine=""11"" startColumn=""9"" endLine=""11"" endColumn=""13"" document=""1"" />
+        <entry offset=""0x8"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""2"" />
+        <entry offset=""0xf"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""3"" />
+        <entry offset=""0x16"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""4"" />
+        <entry offset=""0x1d"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""5"" />
+        <entry offset=""0x24"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""6"" />
+        <entry offset=""0x2b"" startLine=""2"" startColumn=""5"" endLine=""2"" endColumn=""6"" document=""6"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -511,20 +511,20 @@ void M()
     <file id=""4"" name=""b.cs"" language=""3f5162f8-07c6-11d3-9053-00c04fa302a1"" languageVendor=""994b45c4-e6e9-11d2-903f-00c04fa302a1"" documentType=""5a869d0b-6611-11d3-bd2a-0000f80849bd"" />
   </files>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""6"">
-        <entry il_offset=""0x0"" start_row=""6"" start_column=""5"" end_row=""6"" end_column=""6"" file_ref=""1"" />
-        <entry il_offset=""0x1"" start_row=""7"" start_column=""9"" end_row=""7"" end_column=""13"" file_ref=""1"" />
-        <entry il_offset=""0x8"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""2"" />
-        <entry il_offset=""0xf"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""3"" />
-        <entry il_offset=""0x16"" start_row=""1"" start_column=""9"" end_row=""1"" end_column=""13"" file_ref=""4"" />
-        <entry il_offset=""0x1d"" start_row=""2"" start_column=""5"" end_row=""2"" end_column=""6"" file_ref=""4"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""6"" startColumn=""5"" endLine=""6"" endColumn=""6"" document=""1"" />
+        <entry offset=""0x1"" startLine=""7"" startColumn=""9"" endLine=""7"" endColumn=""13"" document=""1"" />
+        <entry offset=""0x8"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""2"" />
+        <entry offset=""0xf"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""3"" />
+        <entry offset=""0x16"" startLine=""1"" startColumn=""9"" endLine=""1"" endColumn=""13"" document=""4"" />
+        <entry offset=""0x1d"" startLine=""2"" startColumn=""5"" endLine=""2"" endColumn=""6"" document=""4"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>

Src/Compilers/CSharp/Test/Emit/PDB/PDBConstantTests.cs

@@ -30,18 +30,18 @@ void M()
             CompileAndVerify(text, options: TestOptions.DebugDll).VerifyPdb("C.M", @"
 <symbols>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""4"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""7"" start_column=""9"" end_row=""7"" end_column=""10"" file_ref=""0"" />
-        <entry il_offset=""0x2"" start_row=""9"" start_column=""9"" end_row=""9"" end_column=""10"" file_ref=""0"" />
-        <entry il_offset=""0x3"" start_row=""10"" start_column=""5"" end_row=""10"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""7"" startColumn=""9"" endLine=""7"" endColumn=""10"" document=""0"" />
+        <entry offset=""0x2"" startLine=""9"" startColumn=""9"" endLine=""9"" endColumn=""10"" document=""0"" />
+        <entry offset=""0x3"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <constant name=""x"" value=""1"" type=""Int32"" />
         <constant name=""y"" value=""2"" type=""Int32"" />
@@ -83,16 +83,16 @@ void M(Action a)
 <symbols>
   <methods>
     <method containingType=""C"" name=""M"" parameterNames=""a"">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""1"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""3"">
-        <entry il_offset=""0x0"" start_row=""7"" start_column=""5"" end_row=""7"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""9"" start_column=""9"" end_row=""15"" end_column=""12"" file_ref=""0"" />
-        <entry il_offset=""0x27"" start_row=""16"" start_column=""5"" end_row=""16"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""9"" startColumn=""9"" endLine=""15"" endColumn=""12"" document=""0"" />
+        <entry offset=""0x27"" startLine=""16"" startColumn=""5"" endLine=""16"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <constant name=""x"" value=""1"" type=""Int32"" />
       </locals>
@@ -101,16 +101,16 @@ void M(Action a)
         <constant name=""x"" value=""1"" type=""Int32"" />
       </scope>
     </method>
-    <method containingType=""C+&lt;&gt;c"" name=""&lt;M&gt;b__0_0"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <forward version=""4"" kind=""ForwardInfo"" size=""12"" declaringType=""C"" methodName=""M"" parameterNames=""a"" />
+    <method containingType=""C+&lt;&gt;c"" name=""&lt;M&gt;b__0_0"">
+      <customDebugInfo>
+        <forward declaringType=""C"" methodName=""M"" parameterNames=""a"" />
       </customDebugInfo>
-      <sequencepoints total=""4"">
-        <entry il_offset=""0x0"" start_row=""10"" start_column=""9"" end_row=""10"" end_column=""10"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""12"" start_column=""13"" end_row=""12"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x2"" start_row=""14"" start_column=""13"" end_row=""14"" end_column=""14"" file_ref=""0"" />
-        <entry il_offset=""0x5"" start_row=""15"" start_column=""9"" end_row=""15"" end_column=""10"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""10"" document=""0"" />
+        <entry offset=""0x1"" startLine=""12"" startColumn=""13"" endLine=""12"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x2"" startLine=""14"" startColumn=""13"" endLine=""14"" endColumn=""14"" document=""0"" />
+        <entry offset=""0x5"" startLine=""15"" startColumn=""9"" endLine=""15"" endColumn=""10"" document=""0"" />
+      </sequencePoints>
       <locals>
         <constant name=""y"" value=""2"" type=""Int32"" />
         <constant name=""z"" value=""3"" type=""Int32"" />
@@ -165,35 +165,35 @@ IEnumerable<int> M()
             v.VerifyPdb("C+<M>d__0.MoveNext", @"
 <symbols>
   <methods>
-    <method containingType=""C+&lt;M&gt;d__0"" name=""MoveNext"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""3"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C+&lt;M&gt;d__0"" name=""MoveNext"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""1"" />
         </using>
-        <hoistedLocalScopes version=""4"" kind=""StateMachineHoistedLocalScopes"" size=""20"" count=""1"">
+        <hoistedLocalScopes>
           <slot startOffset=""0x22"" endOffset=""0x6a"" />
         </hoistedLocalScopes>
-        <encLocalSlotMap version=""4"" kind=""EditAndContinueLocalSlotMap"" size=""16"">
+        <encLocalSlotMap>
           <slot kind=""27"" offset=""0"" />
           <slot kind=""temp"" />
           <slot kind=""temp"" />
           <slot kind=""1"" offset=""37"" />
         </encLocalSlotMap>
       </customDebugInfo>
-      <sequencepoints total=""12"">
-        <entry il_offset=""0x0"" hidden=""true"" start_row=""16707566"" start_column=""0"" end_row=""16707566"" end_column=""0"" file_ref=""0"" />
-        <entry il_offset=""0x21"" start_row=""7"" start_column=""5"" end_row=""7"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x22"" start_row=""9"" start_column=""14"" end_row=""9"" end_column=""23"" file_ref=""0"" />
-        <entry il_offset=""0x29"" hidden=""true"" start_row=""16707566"" start_column=""0"" end_row=""16707566"" end_column=""0"" file_ref=""0"" />
-        <entry il_offset=""0x2b"" start_row=""10"" start_column=""9"" end_row=""10"" end_column=""10"" file_ref=""0"" />
-        <entry il_offset=""0x2c"" start_row=""12"" start_column=""13"" end_row=""12"" end_column=""36"" file_ref=""0"" />
-        <entry il_offset=""0x45"" hidden=""true"" start_row=""16707566"" start_column=""0"" end_row=""16707566"" end_column=""0"" file_ref=""0"" />
-        <entry il_offset=""0x4c"" start_row=""13"" start_column=""9"" end_row=""13"" end_column=""10"" file_ref=""0"" />
-        <entry il_offset=""0x4d"" start_row=""9"" start_column=""33"" end_row=""9"" end_column=""36"" file_ref=""0"" />
-        <entry il_offset=""0x5d"" start_row=""9"" start_column=""25"" end_row=""9"" end_column=""31"" file_ref=""0"" />
-        <entry il_offset=""0x68"" hidden=""true"" start_row=""16707566"" start_column=""0"" end_row=""16707566"" end_column=""0"" file_ref=""0"" />
-        <entry il_offset=""0x6b"" start_row=""14"" start_column=""5"" end_row=""14"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" hidden=""true"" document=""0"" />
+        <entry offset=""0x21"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x22"" startLine=""9"" startColumn=""14"" endLine=""9"" endColumn=""23"" document=""0"" />
+        <entry offset=""0x29"" hidden=""true"" document=""0"" />
+        <entry offset=""0x2b"" startLine=""10"" startColumn=""9"" endLine=""10"" endColumn=""10"" document=""0"" />
+        <entry offset=""0x2c"" startLine=""12"" startColumn=""13"" endLine=""12"" endColumn=""36"" document=""0"" />
+        <entry offset=""0x45"" hidden=""true"" document=""0"" />
+        <entry offset=""0x4c"" startLine=""13"" startColumn=""9"" endLine=""13"" endColumn=""10"" document=""0"" />
+        <entry offset=""0x4d"" startLine=""9"" startColumn=""33"" endLine=""9"" endColumn=""36"" document=""0"" />
+        <entry offset=""0x5d"" startLine=""9"" startColumn=""25"" endLine=""9"" endColumn=""31"" document=""0"" />
+        <entry offset=""0x68"" hidden=""true"" document=""0"" />
+        <entry offset=""0x6b"" startLine=""14"" startColumn=""5"" endLine=""14"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <constant name=""x"" value=""1"" type=""Int32"" />
         <constant name=""y"" value=""2"" type=""Int32"" />
@@ -232,16 +232,16 @@ void M()
                 CompileAndVerify(text, options: TestOptions.DebugDll).VerifyPdb("C.M", @"
 <symbols>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""10"" start_column=""5"" end_row=""10"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""10"" startColumn=""5"" endLine=""10"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <constant name=""o"" value=""0"" type=""Int32"" />
         <constant name=""s"" value=""hello"" type=""String"" />
@@ -311,16 +311,16 @@ void M()
             CompileAndVerify(text, options: TestOptions.DebugDll).VerifyPdb("C.M", @"
 <symbols>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""43"" start_column=""5"" end_row=""43"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""43"" startColumn=""5"" endLine=""43"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals />
     </method>
   </methods>
@@ -344,16 +344,16 @@ void M()
                 CompileAndVerify(text, options: TestOptions.DebugDll).VerifyPdb("C.M", @"
 <symbols>
   <methods>
-    <method containingType=""C"" name=""M"" parameterNames="""">
-      <customDebugInfo version=""4"" count=""1"">
-        <using version=""4"" kind=""UsingInfo"" size=""12"" namespaceCount=""1"">
+    <method containingType=""C"" name=""M"">
+      <customDebugInfo>
+        <using>
           <namespace usingCount=""0"" />
         </using>
       </customDebugInfo>
-      <sequencepoints total=""2"">
-        <entry il_offset=""0x0"" start_row=""5"" start_column=""5"" end_row=""5"" end_column=""6"" file_ref=""0"" />
-        <entry il_offset=""0x1"" start_row=""7"" start_column=""5"" end_row=""7"" end_column=""6"" file_ref=""0"" />
-      </sequencepoints>
+      <sequencePoints>
+        <entry offset=""0x0"" startLine=""5"" startColumn=""5"" endLine=""5"" endColumn=""6"" document=""0"" />
+        <entry offset=""0x1"" startLine=""7"" startColumn=""5"" endLine=""7"" endColumn=""6"" document=""0"" />
+      </sequencePoints>
       <locals>
         <constant name=""d"" value=""1.5"" type=""Decimal"" />
       </locals>

Src/Compilers/Test/Utilities/VisualBasic/BasicTestBase.vb

@@ -516,11 +516,12 @@ Public MustInherit Class BasicTestBaseBase
 
     Public Shared Shadows Function GetSequencePoints(pdbXml As XElement) As XElement
         Return <sequencePoints>
-                   <%= From entry In pdbXml.<methods>.<method>.<sequencepoints>.<entry>
-                       Select <entry start_row=<%= entry.@start_row %>
-                                  start_column=<%= entry.@start_column %>
-                                  end_row=<%= entry.@end_row %>
-                                  end_column=<%= entry.@end_column %>/> %>
+                   <%= From entry In pdbXml.<methods>.<method>.<sequencePoints>.<entry>
+                       Select <entry
+                                  startLine=<%= entry.@startLine %>
+                                  startColumn=<%= entry.@startColumn %>
+                                  endLine=<%= entry.@endLine %>
+                                  endColumn=<%= entry.@endColumn %>/> %>
                </sequencePoints>
     End Function
 

Src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenVBCore.vb

@@ -2562,17 +2562,17 @@ End Class
     <entryPoint declaringType="Program" methodName="Main" parameterNames="args"/>
     <methods>
         <method containingType="Program" name="Main" parameterNames="args">
-            <customDebugInfo version="4" count="1">
-                <encLocalSlotMap version="4" kind="EditAndContinueLocalSlotMap" size="12">
+            <customDebugInfo>
+                <encLocalSlotMap>
                     <slot kind="0" offset="4"/>
                 </encLocalSlotMap>
             </customDebugInfo>
-            <sequencepoints total="4">
-                <entry il_offset="0x0" start_row="5" start_column="5" end_row="5" end_column="38" file_ref="1"/>
-                <entry il_offset="0x1" start_row="6" start_column="13" end_row="6" end_column="31" file_ref="1"/>
-                <entry il_offset="0x4" start_row="7" start_column="9" end_row="7" end_column="32" file_ref="1"/>
-                <entry il_offset="0x10" start_row="8" start_column="5" end_row="8" end_column="12" file_ref="1"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" startLine="5" startColumn="5" endLine="5" endColumn="38" document="1"/>
+                <entry offset="0x1" startLine="6" startColumn="13" endLine="6" endColumn="31" document="1"/>
+                <entry offset="0x4" startLine="7" startColumn="9" endLine="7" endColumn="32" document="1"/>
+                <entry offset="0x10" startLine="8" startColumn="5" endLine="8" endColumn="12" document="1"/>
+            </sequencePoints>
             <locals>
                 <local name="ch" il_index="0" il_start="0x0" il_end="0x11" attributes="0"/>
             </locals>

Src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueStateMachineTests.vb

@@ -355,13 +355,13 @@ End Class
     </files>
     <methods>
         <method token="0x600000e">
-            <sequencepoints total="5">
-                <entry il_offset="0x0" hidden="true" start_row="16707566" start_column="0" end_row="16707566" end_column="0" file_ref="1"/>
-                <entry il_offset="0x23" start_row="6" start_column="5" end_row="6" end_column="53" file_ref="1"/>
-                <entry il_offset="0x24" start_row="6" start_column="5" end_row="6" end_column="53" file_ref="1"/>
-                <entry il_offset="0x25" start_row="7" start_column="9" end_row="7" end_column="16" file_ref="1"/>
-                <entry il_offset="0x40" start_row="8" start_column="5" end_row="8" end_column="17" file_ref="1"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" hidden="true" document="1"/>
+                <entry offset="0x23" startLine="6" startColumn="5" endLine="6" endColumn="53" document="1"/>
+                <entry offset="0x24" startLine="6" startColumn="5" endLine="6" endColumn="53" document="1"/>
+                <entry offset="0x25" startLine="7" startColumn="9" endLine="7" endColumn="16" document="1"/>
+                <entry offset="0x40" startLine="8" startColumn="5" endLine="8" endColumn="17" document="1"/>
+            </sequencePoints>
             <locals/>
             <scope startOffset="0x0" endOffset="0x42">
                 <namespace name="System.Collections.Generic" importlevel="file"/>
@@ -664,26 +664,26 @@ End Class
     </files>
     <methods>
         <method token="0x6000004">
-            <sequencepoints total="9">
-                <entry il_offset="0x0" hidden="true" start_row="16707566" start_column="0" end_row="16707566" end_column="0" file_ref="1"/>
-                <entry il_offset="0x7" hidden="true" start_row="16707566" start_column="0" end_row="16707566" end_column="0" file_ref="1"/>
-                <entry il_offset="0xf" start_row="3" start_column="5" end_row="3" end_column="43" file_ref="1"/>
-                <entry il_offset="0x10" start_row="4" start_column="9" end_row="4" end_column="33" file_ref="1"/>
-                <entry il_offset="0x7d" start_row="5" start_column="9" end_row="5" end_column="17" file_ref="1"/>
-                <entry il_offset="0x81" hidden="true" start_row="16707566" start_column="0" end_row="16707566" end_column="0" file_ref="1"/>
-                <entry il_offset="0x89" hidden="true" start_row="16707566" start_column="0" end_row="16707566" end_column="0" file_ref="1"/>
-                <entry il_offset="0xa6" start_row="6" start_column="5" end_row="6" end_column="17" file_ref="1"/>
-                <entry il_offset="0xb0" hidden="true" start_row="16707566" start_column="0" end_row="16707566" end_column="0" file_ref="1"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" hidden="true" document="1"/>
+                <entry offset="0x7" hidden="true" document="1"/>
+                <entry offset="0xf" startLine="3" startColumn="5" endLine="3" endColumn="43" document="1"/>
+                <entry offset="0x10" startLine="4" startColumn="9" endLine="4" endColumn="33" document="1"/>
+                <entry offset="0x7d" startLine="5" startColumn="9" endLine="5" endColumn="17" document="1"/>
+                <entry offset="0x81" hidden="true" document="1"/>
+                <entry offset="0x89" hidden="true" document="1"/>
+                <entry offset="0xa6" startLine="6" startColumn="5" endLine="6" endColumn="17" document="1"/>
+                <entry offset="0xb0" hidden="true" document="1"/>
+            </sequencePoints>
             <locals/>
             <scope startOffset="0x0" endOffset="0xbe">
                 <namespace name="System.Threading.Tasks" importlevel="file"/>
                 <currentnamespace name=""/>
             </scope>
-            <async-info>
-                <kickoff-method token="0x6000002"/>
+            <asyncInfo>
+                <kickoffMethod token="0x6000002"/>
                 <await yield="0x33" resume="0x4f" token="0x6000004"/>
-            </async-info>
+            </asyncInfo>
         </method>
     </methods>
 </symbols>.ToString)

Src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueTests.vb

@@ -1420,15 +1420,15 @@ End Class
 <symbols>
     <methods>
         <method token="0x6000004">
-            <sequencepoints total="7">
-                <entry il_offset="0x0" start_row="8" start_column="5" end_row="8" end_column="30" file_ref="0"/>
-                <entry il_offset="0x1" start_row="9" start_column="13" end_row="9" end_column="25" file_ref="0"/>
-                <entry il_offset="0x7" start_row="10" start_column="13" end_row="10" end_column="31" file_ref="0"/>
-                <entry il_offset="0xd" start_row="11" start_column="13" end_row="11" end_column="30" file_ref="0"/>
-                <entry il_offset="0x14" start_row="12" start_column="9" end_row="12" end_column="13" file_ref="0"/>
-                <entry il_offset="0x21" start_row="13" start_column="9" end_row="13" end_column="13" file_ref="0"/>
-                <entry il_offset="0x28" start_row="14" start_column="5" end_row="14" end_column="12" file_ref="0"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" startLine="8" startColumn="5" endLine="8" endColumn="30" document="0"/>
+                <entry offset="0x1" startLine="9" startColumn="13" endLine="9" endColumn="25" document="0"/>
+                <entry offset="0x7" startLine="10" startColumn="13" endLine="10" endColumn="31" document="0"/>
+                <entry offset="0xd" startLine="11" startColumn="13" endLine="11" endColumn="30" document="0"/>
+                <entry offset="0x14" startLine="12" startColumn="9" endLine="12" endColumn="13" document="0"/>
+                <entry offset="0x21" startLine="13" startColumn="9" endLine="13" endColumn="13" document="0"/>
+                <entry offset="0x28" startLine="14" startColumn="5" endLine="14" endColumn="12" document="0"/>
+            </sequencePoints>
             <locals>
                 <local name="z" il_index="3" il_start="0x0" il_end="0x29" attributes="0"/>
                 <local name="y" il_index="1" il_start="0x0" il_end="0x29" attributes="0"/>
@@ -1475,14 +1475,14 @@ End Class
 <symbols>
     <methods>
         <method token="0x6000004">
-            <sequencepoints total="6">
-                <entry il_offset="0x0" start_row="8" start_column="5" end_row="8" end_column="30" file_ref="0"/>
-                <entry il_offset="0x1" start_row="9" start_column="13" end_row="9" end_column="30" file_ref="0"/>
-                <entry il_offset="0x8" start_row="10" start_column="13" end_row="10" end_column="25" file_ref="0"/>
-                <entry il_offset="0xe" start_row="11" start_column="9" end_row="11" end_column="13" file_ref="0"/>
-                <entry il_offset="0x1b" start_row="12" start_column="9" end_row="12" end_column="13" file_ref="0"/>
-                <entry il_offset="0x22" start_row="13" start_column="5" end_row="13" end_column="12" file_ref="0"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" startLine="8" startColumn="5" endLine="8" endColumn="30" document="0"/>
+                <entry offset="0x1" startLine="9" startColumn="13" endLine="9" endColumn="30" document="0"/>
+                <entry offset="0x8" startLine="10" startColumn="13" endLine="10" endColumn="25" document="0"/>
+                <entry offset="0xe" startLine="11" startColumn="9" endLine="11" endColumn="13" document="0"/>
+                <entry offset="0x1b" startLine="12" startColumn="9" endLine="12" endColumn="13" document="0"/>
+                <entry offset="0x22" startLine="13" startColumn="5" endLine="13" endColumn="12" document="0"/>
+            </sequencePoints>
             <locals>
                 <local name="x" il_index="5" il_start="0x0" il_end="0x23" attributes="0"/>
                 <local name="z" il_index="3" il_start="0x0" il_end="0x23" attributes="0"/>
@@ -1535,14 +1535,14 @@ End Class
 <symbols>
     <methods>
         <method token="0x6000005">
-            <sequencepoints total="6">
-                <entry il_offset="0x0" start_row="14" start_column="5" end_row="14" end_column="19" file_ref="0"/>
-                <entry il_offset="0x1" start_row="15" start_column="13" end_row="15" end_column="30" file_ref="0"/>
-                <entry il_offset="0x7" start_row="16" start_column="13" end_row="16" end_column="30" file_ref="0"/>
-                <entry il_offset="0xd" start_row="17" start_column="9" end_row="17" end_column="13" file_ref="0"/>
-                <entry il_offset="0x19" start_row="18" start_column="9" end_row="18" end_column="13" file_ref="0"/>
-                <entry il_offset="0x25" start_row="19" start_column="5" end_row="19" end_column="12" file_ref="0"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" startLine="14" startColumn="5" endLine="14" endColumn="19" document="0"/>
+                <entry offset="0x1" startLine="15" startColumn="13" endLine="15" endColumn="30" document="0"/>
+                <entry offset="0x7" startLine="16" startColumn="13" endLine="16" endColumn="30" document="0"/>
+                <entry offset="0xd" startLine="17" startColumn="9" endLine="17" endColumn="13" document="0"/>
+                <entry offset="0x19" startLine="18" startColumn="9" endLine="18" endColumn="13" document="0"/>
+                <entry offset="0x25" startLine="19" startColumn="5" endLine="19" endColumn="12" document="0"/>
+            </sequencePoints>
             <locals>
                 <local name="c" il_index="2" il_start="0x0" il_end="0x26" attributes="0"/>
                 <local name="b" il_index="1" il_start="0x0" il_end="0x26" attributes="0"/>
@@ -1626,12 +1626,12 @@ End Class
 <symbols>
     <methods>
         <method token="0x6000002">
-            <sequencepoints total="4">
-                <entry il_offset="0x0" start_row="2" start_column="5" end_row="2" end_column="19" file_ref="0"/>
-                <entry il_offset="0x1" start_row="3" start_column="13" end_row="3" end_column="18" file_ref="0"/>
-                <entry il_offset="0x3" start_row="4" start_column="13" end_row="4" end_column="29" file_ref="0"/>
-                <entry il_offset="0x9" start_row="5" start_column="5" end_row="5" end_column="12" file_ref="0"/>
-            </sequencepoints>
+            <sequencePoints>
+                <entry offset="0x0" startLine="2" startColumn="5" endLine="2" endColumn="19" document="0"/>
+                <entry offset="0x1" startLine="3" startColumn="13" endLine="3" endColumn="18" document="0"/>
+                <entry offset="0x3" startLine="4" startColumn="13" endLine="4" endColumn="29" document="0"/>
+                <entry offset="0x9" startLine="5" startColumn="5" endLine="5" endColumn="12" document="0"/>
+            </sequencePoints>
             <locals>
                 <local name="a" il_index="2" il_start="0x0" il_end="0xa" attributes="0"/>
                 <local name="b" il_index="1" il_start="0x0" il_end="0xa" attributes="0"/>

Src/Test/Utilities/TestBase.cs

@@ -694,12 +694,12 @@ public static string GetPdbXml(Compilation compilation, string qualifiedMethodNa
             var doc = new XmlDocument();
             doc.LoadXml(pdbXml);
 
-            foreach (XmlNode entry in doc.GetElementsByTagName("sequencepoints"))
+            foreach (XmlNode entry in doc.GetElementsByTagName("sequencePoints"))
             {
                 foreach (XmlElement item in entry.ChildNodes)
                 {
                     yield return KeyValuePair.Create(
-                        Convert.ToInt32(item.GetAttribute("il_offset"), 16),
+                        Convert.ToInt32(item.GetAttribute("offset"), 16),
                         (item.GetAttribute("hidden") == "true") ? "~" : "-");
                 }
             }