Batch 29 fixes (dotnet#5421)

mairaw · web-flow · commit a14c4bc02e08 · 2021-03-12T09:29:34.000-05:00
* Fix sample output

* one more fix

* fix one more output
diff --git a/samples/snippets/cpp/VS_Snippets_CLR/InnerEx/CPP/innerex.cpp b/samples/snippets/cpp/VS_Snippets_CLR/InnerEx/CPP/innerex.cpp
@@ -48,5 +48,6 @@ int main()
 //    In catch block of Main method.
 //    Caught: Error in CatchInner caused by calling the ThrowInner method.
 //    Inner exception: AppException: Exception in ThrowInner method.
+//       at Example.ThrowInner()
 //       at Example.CatchInner()
 //</Snippet1>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR/InnerEx/CS/innerex.cs b/samples/snippets/csharp/VS_Snippets_CLR/InnerEx/CS/innerex.cs
@@ -45,5 +45,6 @@ public void CatchInner()
 //    In catch block of Main method.
 //    Caught: Error in CatchInner caused by calling the ThrowInner method.
 //    Inner exception: AppException: Exception in ThrowInner method.
+//       at Example.ThrowInner()
 //       at Example.CatchInner()
 // </Snippet1>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR/Regex_Words/CS/words.cs b/samples/snippets/csharp/VS_Snippets_CLR/Regex_Words/CS/words.cs
@@ -47,5 +47,5 @@ public static void Main ()
 //          The the quick brown fox  fox jumps over the lazy dog dog.
 //       'The' repeated at positions 0 and 4
 //       'fox' repeated at positions 20 and 25
-//       'dog' repeated at positions 50 and 54
+//       'dog' repeated at positions 49 and 53
 // </snippet0>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR/string.toupper1/CS/toupper.cs b/samples/snippets/csharp/VS_Snippets_CLR/string.toupper1/CS/toupper.cs
@@ -34,6 +34,6 @@ public static void ShowCodePoints(string varName, string s)
 // This example displays the following output:
 //       str1 = indigo: 0069 006e 0064 0069 0067 006f
 //       str2 = INDIGO: 0049 004e 0044 0049 0047 004f
-//       str3 = INDIGO: 0130 004e 0044 0130 0047 004f
+//       str3 = İNDİGO: 0130 004e 0044 0130 0047 004f
 //       str2 is not equal to str3.
 // </Snippet1>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Linq.Enumerable/CS/enumerable.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Linq.Enumerable/CS/enumerable.cs
@@ -694,7 +694,7 @@ static void ElementAtEx1()
             Console.WriteLine("The name chosen at random is '{0}'.", name);
 
             /*
-             This code produces the following sample output:
+             This code produces output similar to the following:
 
              The name chosen at random is 'Ito, Shu'.
             */
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.RegularExpressions.GroupCollection/cs/Example1.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.RegularExpressions.GroupCollection/cs/Example1.cs
@@ -25,10 +25,10 @@ public static void Main()
    }
 }
 // The example displays the following output:
-//       r: Microsoft
-//       r: Excel
-//       r: Access
-//       r: Outlook
-//       r: PowerPoint
-//       T: Silverlight
+//       ®: Microsoft
+//       ®: Excel
+//       ®: Access
+//       ®: Outlook
+//       ®: PowerPoint
+//       ™: Silverlight
 // </Snippet1>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.RegularExpressions.Match.Class/cs/Match2.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.RegularExpressions.Match.Class/cs/Match2.cs
@@ -23,9 +23,9 @@ public static void Main()
    }
 }
 // The example displays the following output:
-//    'Console.Write' found in the source code at position 115.
+//    'Console.Write' found in the source code at position 112.
 //    'Console.Write' found in the source code at position 184.
-//    'Console.WriteLine' found in the source code at position 211.
+//    'Console.WriteLine' found in the source code at position 207.
 // </Snippet2>
 
 internal class Test
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.RegularExpressions.Match.Class/cs/Match3.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.Text.RegularExpressions.Match.Class/cs/Match3.cs
@@ -25,9 +25,9 @@ public static void Main()
    }
 }
 // The example displays the following output:
-//    'Console.Write' found in the source code at position 115.
+//    'Console.Write' found in the source code at position 112.
 //    'Console.Write' found in the source code at position 184.
-//    'Console.WriteLine' found in the source code at position 211.
+//    'Console.WriteLine' found in the source code at position 207.
 // </Snippet3>
 
 internal class Test
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.char.toupper/cs/toupper1.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.char.toupper/cs/toupper1.cs
@@ -16,6 +16,6 @@ public static void Main()
 //       E --> E (Same Character)
 //       6 --> 6 (Same Character)
 //       , --> , (Same Character)
-//       ? --> ?
+//       ж --> Ж
 //       ä --> Ä
 // </Snippet1>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/cs/example2.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/cs/example2.cs
@@ -29,11 +29,11 @@ public static void Main()
    }
 }
 // The example displays the following output:
-//       D: Tuesday, July 09, 2013
-//       F: Tuesday, July 09, 2013 12:00:00 AM
-//       f: Tuesday, July 09, 2013 12:00 AM
+//       D: Tuesday, July 9, 2013
+//       F: Tuesday, July 9, 2013 12:00:00 AM
+//       f: Tuesday, July 9, 2013 12:00 AM
 //
 //       D: Tu 09-Jul-2013
-//       F: Tuesday, July 09, 2013 12:00:00 AM
+//       F: Tuesday, July 9, 2013 12:00:00 AM
 //       f: Tu 09-Jul-2013 12:00 AM
 // </Snippet13>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/cs/example3.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/cs/example3.cs
@@ -20,6 +20,6 @@ public static void Main()
    }
 }
 // The example displays the following output:
-//       Before modifying DateSeparator property: 18/08/2013 00:00
-//       After modifying the DateSeparator property: 18-08-2013 00:00
+//       Before modifying DateSeparator property: 28/08/2013 00:00
+//       After modifying the DateSeparator property: 28-08-2013 00:00
 // </Snippet12>
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/cs/formatprovider1.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/cs/formatprovider1.cs
@@ -21,7 +21,7 @@ public class Example
 {
    public static void Main()
    {
-      DateTime dateValue = new DateTime(2013, 5, 28, 12, 30, 0);
+      DateTime dateValue = new DateTime(2013, 5, 28, 13, 30, 0);
       string value = dateValue.ToString("F", new CurrentCultureFormatProvider());
       Console.WriteLine(value);
       Console.WriteLine();
diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.math.round.overload/cs/midpoint1.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.math.round.overload/cs/midpoint1.cs
@@ -14,7 +14,7 @@ public static void Main()
                            Math.Round(value, MidpointRounding.AwayFromZero));
       // The example displays the following output:
       //       Value      Default    ToEven     AwayFromZero
-      //       12         12         12         12
+      //       12.0       12         12         12
       //       12.1       12         12         12
       //       12.2       12         12         12
       //       12.3       12         12         12
@@ -24,7 +24,7 @@ public static void Main()
       //       12.7       13         13         13
       //       12.8       13         13         13
       //       12.9       13         13         13
-      //       13         13         13         13
+      //       13.0       13         13         13
       // </Snippet5>
    }
 }
diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR/InnerEx/VB/innerex.vb b/samples/snippets/visualbasic/VS_Snippets_CLR/InnerEx/VB/innerex.vb
@@ -39,5 +39,6 @@ End Class
 '    In catch block of Main method.
 '    Caught: Error in CatchInner caused by calling the ThrowInner method.
 '    Inner exception: AppException: Exception in ThrowInner method.
+'       at Example.ThrowInner()
 '       at Example.CatchInner()
 ' </Snippet1>
diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR/Regex_Words/VB/words.vb b/samples/snippets/visualbasic/VS_Snippets_CLR/Regex_Words/VB/words.vb
@@ -44,6 +44,6 @@ End Module
 '          The the quick brown fox  fox jumps over the lazy dog dog.
 '       'The' repeated at positions 0 and 4
 '       'fox' repeated at positions 20 and 25
-'       'dog' repeated at positions 50 and 54
+'       'dog' repeated at positions 49 and 53
 ' </Snippet0>
 
diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Linq.Enumerable/VB/Enumerable.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Linq.Enumerable/VB/Enumerable.vb
@@ -728,7 +728,7 @@ Namespace SequenceExamples
             ' Display the output.
             Console.WriteLine($"The name chosen at random is {name}")
 
-            ' This code produces the following output:
+            ' This code produces output similar to the following:
             '
             ' The name chosen at random is Ito, Shu
             ' </Snippet28>
diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.GroupCollection/vb/Example1.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.GroupCollection/vb/Example1.vb
@@ -24,13 +24,10 @@ Module Example
    End Sub
 End Module
 ' The example displays the following output:
-'       r: Microsoft
-'       r: Excel
-'       r: Access
-'       r: Outlook
-'       r: PowerPoint
-'       T: Silverlight
+'       ®: Microsoft
+'       ®: Excel
+'       ®: Access
+'       ®: Outlook
+'       ®: PowerPoint
+'       ™: Silverlight
 ' </Snippet1>
-
-
-
diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/vb/example2.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.globalization.datetimeformatinfo.class/vb/example2.vb
@@ -30,11 +30,11 @@ Module Example
    End Sub
 End Module
 ' The example displays the following output:
-'       D: Tuesday, July 09, 2013
-'       F: Tuesday, July 09, 2013 12:00:00 AM
-'       f: Tuesday, July 09, 2013 12:00 AM
-'       
+'       D: Tuesday, July 9, 2013
+'       F: Tuesday, July 9, 2013 12:00:00 AM
+'       f: Tuesday, July 9, 2013 12:00 AM
+'
 '       D: Tu 09-Jul-2013
-'       F: Tuesday, July 09, 2013 12:00:00 AM
+'       F: Tuesday, July 9, 2013 12:00:00 AM
 '       f: Tu 09-Jul-2013 12:00 AM
 ' </Snippet13>
diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.math.round.overload/vb/midpoint1.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.math.round.overload/vb/midpoint1.vb
@@ -26,5 +26,5 @@ End Module
 '       12.7       13         13         13
 '       12.8       13         13         13
 '       12.9       13         13         13
-'       13         13         13         13
+'       13.0       13         13         13
 ' </Snippet5>

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ public static void Main()`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`// The example displays the following output:`
`26`		`-// 'Console.Write' found in the source code at position 115.`
	`26`	`+// 'Console.Write' found in the source code at position 112.`
`27`	`27`	`// 'Console.Write' found in the source code at position 184.`
`28`		`-// 'Console.WriteLine' found in the source code at position 211.`
	`28`	`+// 'Console.WriteLine' found in the source code at position 207.`
`29`	`29`	`// </Snippet2>`
`30`	`30`
`31`	`31`	`internal class Test`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ public static void Main()`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`// The example displays the following output:`
`28`		`-// 'Console.Write' found in the source code at position 115.`
	`28`	`+// 'Console.Write' found in the source code at position 112.`
`29`	`29`	`// 'Console.Write' found in the source code at position 184.`
`30`		`-// 'Console.WriteLine' found in the source code at position 211.`
	`30`	`+// 'Console.WriteLine' found in the source code at position 207.`
`31`	`31`	`// </Snippet3>`
`32`	`32`
`33`	`33`	`internal class Test`