Batch 30 sample fixes (dotnet#5418)

* Batch 30 sample fixes

* restore some changes

* Make VB match C# version

Author: mairaw

samples/snippets/cpp/VS_Snippets_CLR/GetCustomAttributes/CPP/custattrs.cpp

@@ -251,8 +251,8 @@ namespace CustAttrs5CS
 
 /*
  * Output:
+ * Parameter args for method ParamArrayAndDesc has the ParamArray attribute.
  * Parameter args for method ParamArrayAndDesc has a description attribute.
  * The description is: "This argument is a ParamArray"
- * Parameter args for method ParamArrayAndDesc has the ParamArray attribute.
  */
 // </Snippet5>

samples/snippets/csharp/VS_Snippets_CLR/GetCustomAttributes/CS/ca5.cs

@@ -48,8 +48,8 @@ static void Main(string[] args) {
 
 /*
  * Output:
+ * Parameter args for method ParamArrayAndDesc has the ParamArray attribute.
  * Parameter args for method ParamArrayAndDesc has a description attribute.
  * The description is: "This argument is a ParamArray"
- * Parameter args for method ParamArrayAndDesc has the ParamArray attribute.
  */
 // </Snippet5>

samples/snippets/csharp/VS_Snippets_CLR_System/system.Single.Parse/CS/parse3.cs

@@ -7,69 +7,87 @@ public class Example
     public static void Main()
     {
       // Define an array of string values.
-      string[] values = { " 987.654E-2", " 987,654E-2",  "(98765,43210)", 
+      string[] values = { " 987.654E-2", " 987,654E-2",  "(98765,43210)",
                           "9,876,543.210", "9.876.543,210",  "98_76_54_32,19" };
       // Create a custom culture based on the invariant culture.
       CultureInfo ci = new CultureInfo("");
       ci.NumberFormat.NumberGroupSizes = new int[] { 2 };
       ci.NumberFormat.NumberGroupSeparator = "_";
-      
+
       // Define an array of format providers.
       CultureInfo[] providers = { new CultureInfo("en-US"),
-                                  new CultureInfo("nl-NL"), ci };       
-      
+                                  new CultureInfo("nl-NL"), ci };
+
       // Define an array of styles.
       NumberStyles[] styles = { NumberStyles.Currency, NumberStyles.Float };
-      
+
       // Iterate the array of format providers.
       foreach (CultureInfo provider in providers)
       {
-         Console.WriteLine("Parsing using the {0} culture:", 
+         Console.WriteLine("Parsing using the {0} culture:",
                            provider.Name == String.Empty ? "Invariant" : provider.Name);
          // Parse each element in the array of string values.
          foreach (string value in values)
          {
             foreach (NumberStyles style in styles)
             {
                try {
-                  float number = Single.Parse(value, style, provider);            
-                  Console.WriteLine("   {0} ({1}) -> {2}", 
+                  float number = Single.Parse(value, style, provider);
+                  Console.WriteLine("   {0} ({1}) -> {2}",
                                     value, style, number);
                }
                catch (FormatException) {
                   Console.WriteLine("   '{0}' is invalid using {1}.", value, style);
                }
                catch (OverflowException) {
                   Console.WriteLine("   '{0}' is out of the range of a Single.", value);
-               } 
-            }            
-         }         
+               }
+            }
+         }
          Console.WriteLine();
       }
-   }   
-} 
+   }
+}
 // The example displays the following output:
-//       Parsing using the en-US culture:
-//       The format of // 987.654E-2// is invalid.
-//       The format of // 987,654E-2// is invalid.
-//       (98765,43210) (Currency) -> -9.876543E+09
-//       9,876,543.210 (Currency) -> 9876543
-//       The format of '9.876.543,210// is invalid.
-//       The format of '98_76_54_32,19// is invalid.
-//       
-//       Parsing using the nl-NL culture:
-//       The format of // 987.654E-2// is invalid.
-//       The format of // 987,654E-2// is invalid.
-//       (98765,43210) (Currency) -> -98765.43
-//       The format of '9,876,543.210// is invalid.
-//       9.876.543,210 (Currency) -> 9876543
-//       The format of '98_76_54_32,19// is invalid.
-//       
-//       Parsing using the Invariant culture:
-//       The format of // 987.654E-2// is invalid.
-//       The format of // 987,654E-2// is invalid.
-//       (98765,43210) (Currency) -> -9.876543E+09
-//       9,876,543.210 (Currency) -> 9876543
-//       The format of '9.876.543,210// is invalid.
-//       98_76_54_32,19 (Currency) -> 9.876543E+09
+// Parsing using the en-US culture:
+//    ' 987.654E-2' is invalid using Currency.
+//     987.654E-2 (Float) -> 9.87654
+//    ' 987,654E-2' is invalid using Currency.
+//    ' 987,654E-2' is invalid using Float.
+//    (98765,43210) (Currency) -> -9.876543E+09
+//    '(98765,43210)' is invalid using Float.
+//    9,876,543.210 (Currency) -> 9876543
+//    '9,876,543.210' is invalid using Float.
+//    '9.876.543,210' is invalid using Currency.
+//    '9.876.543,210' is invalid using Float.
+//    '98_76_54_32,19' is invalid using Currency.
+//    '98_76_54_32,19' is invalid using Float.
+//
+// Parsing using the nl-NL culture:
+//    ' 987.654E-2' is invalid using Currency.
+//    ' 987.654E-2' is invalid using Float.
+//    ' 987,654E-2' is invalid using Currency.
+//     987,654E-2 (Float) -> 9.87654
+//    (98765,43210) (Currency) -> -98765.43
+//    '(98765,43210)' is invalid using Float.
+//    '9,876,543.210' is invalid using Currency.
+//    '9,876,543.210' is invalid using Float.
+//    9.876.543,210 (Currency) -> 9876543
+//    '9.876.543,210' is invalid using Float.
+//    '98_76_54_32,19' is invalid using Currency.
+//    '98_76_54_32,19' is invalid using Float.
+//
+// Parsing using the Invariant culture:
+//    ' 987.654E-2' is invalid using Currency.
+//     987.654E-2 (Float) -> 9.87654
+//    ' 987,654E-2' is invalid using Currency.
+//    ' 987,654E-2' is invalid using Float.
+//    (98765,43210) (Currency) -> -9.876543E+09
+//    '(98765,43210)' is invalid using Float.
+//    9,876,543.210 (Currency) -> 9876543
+//    '9,876,543.210' is invalid using Float.
+//    '9.876.543,210' is invalid using Currency.
+//    '9.876.543,210' is invalid using Float.
+//    98_76_54_32,19 (Currency) -> 9.876543E+09
+//    '98_76_54_32,19' is invalid using Float.
 // </Snippet4>

samples/snippets/csharp/VS_Snippets_CLR_System/system.array.rank/cs/rank1.cs

@@ -18,7 +18,7 @@ public static void Main()
    }
 }
 // The example displays the following output:
-//       System.Int32[]: 1 dimension
-//       System.Int32[,]: 2 dimension
-//       System.Int32[][]: 1 dimension
+//       System.Int32[]: 1 dimension(s)
+//       System.Int32[,]: 2 dimension(s)
+//       System.Int32[][]: 1 dimension(s)
 // </Snippet1>

samples/snippets/csharp/VS_Snippets_CLR_System/system.single.tryparse/cs/tryparse1.cs

@@ -14,40 +14,40 @@ private static void DefaultTryParse()
       // <Snippet1>
       string value;
       float number;
-      
+
       // Parse a floating-point value with a thousands separator.
       value = "1,643.57";
       if (Single.TryParse(value, out number))
          Console.WriteLine(number);
       else
-         Console.WriteLine("Unable to parse '{0}'.", value);      
-      
-      // Parse a floating-point value with a currency symbol and a 
+         Console.WriteLine("Unable to parse '{0}'.", value);
+
+      // Parse a floating-point value with a currency symbol and a
       // thousands separator.
       value = "$1,643.57";
       if (Single.TryParse(value, out number))
          Console.WriteLine(number);
       else
-         Console.WriteLine("Unable to parse '{0}'.", value);   
-      
+         Console.WriteLine("Unable to parse '{0}'.", value);
+
       // Parse value in exponential notation.
       value = "-1.643e6";
       if (Single.TryParse(value, out number))
          Console.WriteLine(number);
       else
-         Console.WriteLine("Unable to parse '{0}'.", value);   
-      
+         Console.WriteLine("Unable to parse '{0}'.", value);
+
       // Parse a negative integer value.
       value = "-168934617882109132";
       if (Single.TryParse(value, out number))
          Console.WriteLine(number);
       else
-         Console.WriteLine("Unable to parse '{0}'.", value);   
+         Console.WriteLine("Unable to parse '{0}'.", value);
       // The example displays the following output:
       //       1643.57
       //       Unable to parse '$1,643.57'.
       //       -164300
-      //       -1.68934617882109E+17
+      //       -1.689346E+17
       // </Snippet1>
    }
 
@@ -58,34 +58,34 @@ private static void TryParseWithConstraints()
       System.Globalization.NumberStyles style;
       System.Globalization.CultureInfo culture;
       float number;
-      
+
       // Parse currency value using en-GB culture.
       value = "£1,097.63";
-      style = System.Globalization.NumberStyles.Number | 
+      style = System.Globalization.NumberStyles.Number |
               System.Globalization.NumberStyles.AllowCurrencySymbol;
       culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-GB");
       if (Single.TryParse(value, style, culture, out number))
          Console.WriteLine("Converted '{0}' to {1}.", value, number);
       else
          Console.WriteLine("Unable to convert '{0}'.", value);
-      
+
       value = "1345,978";
       style = System.Globalization.NumberStyles.AllowDecimalPoint;
       culture = System.Globalization.CultureInfo.CreateSpecificCulture("fr-FR");
       if (Single.TryParse(value, style, culture, out number))
          Console.WriteLine("Converted '{0}' to {1}.", value, number);
       else
          Console.WriteLine("Unable to convert '{0}'.", value);
-      
+
       value = "1.345,978";
-      style = System.Globalization.NumberStyles.AllowDecimalPoint | 
+      style = System.Globalization.NumberStyles.AllowDecimalPoint |
               System.Globalization.NumberStyles.AllowThousands;
       culture = System.Globalization.CultureInfo.CreateSpecificCulture("es-ES");
       if (Single.TryParse(value, style, culture, out number))
          Console.WriteLine("Converted '{0}' to {1}.", value, number);
       else
          Console.WriteLine("Unable to convert '{0}'.", value);
-      
+
       value = "1 345,978";
       if (Single.TryParse(value, style, culture, out number))
          Console.WriteLine("Converted '{0}' to {1}.", value, number);
@@ -96,6 +96,6 @@ private static void TryParseWithConstraints()
       //       Converted '1345,978' to 1345.978.
       //       Converted '1.345,978' to 1345.978.
       //       Unable to convert '1 345,978'.
-      // </Snippet2>   
+      // </Snippet2>
    }
 }

samples/snippets/visualbasic/VS_Snippets_CLR/GetCustomAttributes/VB/ca5.vb

@@ -26,23 +26,23 @@ Module DemoModule
                 ' Convert the attribute to access its data.
                 Dim paAttr As ParamArrayAttribute = _
                     CType(attr, ParamArrayAttribute)
-                Console.WriteLine("Parameter {0} has the " + _
-                    "ParamArray attribute.", pInfo(0).Name)
+                Console.WriteLine("Parameter {0} for method {1} has the " + _
+                    "ParamArray attribute.", pInfo(0).Name, mInfo.Name)
             ' Check for the Description attribute.
             ElseIf TypeOf attr Is DescriptionAttribute Then
                 ' Convert the attribute to access its data.
                 Dim descAttr As DescriptionAttribute = _
                     CType(attr, DescriptionAttribute)
-                Console.WriteLine("Parameter {0} has a description " + _
-                    "attribute. The description is:", pInfo(0).Name)
+                Console.WriteLine("Parameter {0} for method {1} has a description " + _
+                    "attribute. The description is:", pInfo(0).Name, mInfo.Name)
                 Console.WriteLine(descAttr.Description)
             End If
         Next
     End Sub
 End Module
 
 ' Output:
-' Parameter args has a description attribute. The description is:
+' Parameter args for method ParamArrayAndDesc has the ParamArray attribute.
+' Parameter args for method ParamArrayAndDesc has a description attribute. The description is:
 ' This argument is a ParamArray
-' Parameter args has the ParamArray attribute.
 ' </Snippet5>

samples/snippets/visualbasic/VS_Snippets_CLR_System/system.array.rank/vb/rank1.vb

@@ -4,21 +4,21 @@ Option Strict On
 ' <Snippet1>
 Module Example
    Public Sub Main()
-      Dim array1(9) As Integer 
-      Dim array2(9,2) As Integer  
-      Dim array3(9)() As Integer 
-      
-      Console.WriteLine("{0}: {1} dimension(s)", 
+      Dim array1(9) As Integer
+      Dim array2(9,2) As Integer
+      Dim array3(9)() As Integer
+
+      Console.WriteLine("{0}: {1} dimension(s)",
                         array1.ToString(), array1.Rank)
-      Console.WriteLine("{0}: {1} dimension(s)", 
+      Console.WriteLine("{0}: {1} dimension(s)",
                         array2.ToString(), array2.Rank)
-      Console.WriteLine("{0}: {1} dimension(s)", 
+      Console.WriteLine("{0}: {1} dimension(s)",
                         array3.ToString(), array3.Rank)
    End Sub
 End Module
 ' The example displays the following output:
-'       System.Int32[]: 1 dimension
-'       System.Int32[,]: 2 dimension
-'       System.Int32[][]: 1 dimension
+'       System.Int32[]: 1 dimension(s)
+'       System.Int32[,]: 2 dimension(s)
+'       System.Int32[][]: 1 dimension(s)
 ' </Snippet1>