Merge pull request #1592 from gewarren/gewarren-datatools0313

Fix two GH issues

Author: Lisaco88

docs/data-tools/codesnippet/.gitignore

@@ -0,0 +1,63 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc

docs/data-tools/codesnippet/CSharp/SimpleDataApp/App.config

@@ -3,7 +3,7 @@
     <configSections>
     </configSections>
     <connectionStrings>
-        <add name="SimpleDataAppCS.Properties.Settings.connStr" connectionString="Data Source=(localdb)\ProjectsV13;Initial Catalog=Sales;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False" />
+        <add name="SimpleDataAppCS.Properties.Settings.connString" connectionString="Data Source=(localdb)\ProjectsV13;Initial Catalog=Sales;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False" />
     </connectionStrings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />

docs/data-tools/codesnippet/CSharp/SimpleDataApp/FillOrCancel.cs

@@ -22,24 +22,24 @@ public FillOrCancel()
         /// </summary>
         private bool IsOrderIDValid()
         {
-            // Check for input in the Order ID text box.  
+            // Check for input in the Order ID text box.
             if (txtOrderID.Text == "")
             {
                 MessageBox.Show("Please specify the Order ID.");
                 return false;
             }
 
-            // Check for characters other than integers.  
+            // Check for characters other than integers.
             else if (Regex.IsMatch(txtOrderID.Text, @"^\D*$"))
             {
-                // Show message and clear input.  
+                // Show message and clear input.
                 MessageBox.Show("Customer ID must contain only numbers.");
                 txtOrderID.Clear();
                 return false;
             }
             else
             {
-                // Convert the text in the text box to an integer to send to the database.  
+                // Convert the text in the text box to an integer to send to the database.
                 parsedOrderID = Int32.Parse(txtOrderID.Text);
                 return true;
             }
@@ -48,43 +48,42 @@ private bool IsOrderIDValid()
 
         //<Snippet2>
         /// <summary>
-        /// Executes a t-SQL SELECT statement to obtain
-        /// order data for a specified order ID, then
-        /// displays it in the DataGridView on the form.
+        /// Executes a t-SQL SELECT statement to obtain order data for a specified
+        /// order ID, then displays it in the DataGridView on the form.
         /// </summary>
         private void btnFindByOrderID_Click(object sender, EventArgs e)
         {
             if (IsOrderIDValid())
             {
-                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connStr))
+                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connString))
                 {
-                    // Define a t-SQL query string that has a parameter for orderID.  
+                    // Define a t-SQL query string that has a parameter for orderID.
                     const string sql = "SELECT * FROM Sales.Orders WHERE orderID = @orderID";
 
-                    // Create a SqlCommand object.  
+                    // Create a SqlCommand object.
                     using (SqlCommand sqlCommand = new SqlCommand(sql, connection))
                     {
-                        // Define the @orderID parameter and set its value.  
+                        // Define the @orderID parameter and set its value.
                         sqlCommand.Parameters.Add(new SqlParameter("@orderID", SqlDbType.Int));
                         sqlCommand.Parameters["@orderID"].Value = parsedOrderID;
 
                         try
                         {
                             connection.Open();
 
-                            // Run the query by calling ExecuteReader().  
+                            // Run the query by calling ExecuteReader().
                             using (SqlDataReader dataReader = sqlCommand.ExecuteReader())
                             {
-                                // Create a data table to hold the retrieved data.  
+                                // Create a data table to hold the retrieved data.
                                 DataTable dataTable = new DataTable();
 
-                                // Load the data from SqlDataReader into the data table.  
+                                // Load the data from SqlDataReader into the data table.
                                 dataTable.Load(dataReader);
 
-                                // Display the data from the data table in the data grid view.  
+                                // Display the data from the data table in the data grid view.
                                 this.dgvCustomerOrders.DataSource = dataTable;
 
-                                // Close the SqlDataReader.  
+                                // Close the SqlDataReader.
                                 dataReader.Close();
                             }
                         }
@@ -94,7 +93,7 @@ private void btnFindByOrderID_Click(object sender, EventArgs e)
                         }
                         finally
                         {
-                            // Close the connection.  
+                            // Close the connection.
                             connection.Close();
                         }
                     }
@@ -110,10 +109,10 @@ private void btnCancelOrder_Click(object sender, EventArgs e)
         {
             if (IsOrderIDValid())
             {
-                // Create the connection.  
-                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connStr))
+                // Create the connection.
+                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connString))
                 {
-                    // Create the SqlCommand object and identify it as a stored procedure.  
+                    // Create the SqlCommand object and identify it as a stored procedure.
                     using (SqlCommand sqlCommand = new SqlCommand("Sales.uspCancelOrder", connection))
                     {
                         sqlCommand.CommandType = CommandType.StoredProcedure;
@@ -124,10 +123,10 @@ private void btnCancelOrder_Click(object sender, EventArgs e)
 
                         try
                         {
-                            // Open the connection.  
+                            // Open the connection.
                             connection.Open();
 
-                            // Run the command to execute the stored procedure.  
+                            // Run the command to execute the stored procedure.
                             sqlCommand.ExecuteNonQuery();
                         }
                         catch
@@ -136,7 +135,7 @@ private void btnCancelOrder_Click(object sender, EventArgs e)
                         }
                         finally
                         {
-                            // Close connection.  
+                            // Close connection.
                             connection.Close();
                         }
                     }
@@ -152,19 +151,19 @@ private void btnFillOrder_Click(object sender, EventArgs e)
         {
             if (IsOrderIDValid())
             {
-                // Create the connection.  
-                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connStr))
+                // Create the connection.
+                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connString))
                 {
-                    // Create command and identify it as a stored procedure.  
+                    // Create command and identify it as a stored procedure.
                     using (SqlCommand sqlCommand = new SqlCommand("Sales.uspFillOrder", connection))
                     {
                         sqlCommand.CommandType = CommandType.StoredProcedure;
 
-                        // Add the order ID input parameter for the stored procedure.  
+                        // Add the order ID input parameter for the stored procedure.
                         sqlCommand.Parameters.Add(new SqlParameter("@orderID", SqlDbType.Int));
                         sqlCommand.Parameters["@orderID"].Value = parsedOrderID;
 
-                        // Add the filled date input parameter for the stored procedure.  
+                        // Add the filled date input parameter for the stored procedure.
                         sqlCommand.Parameters.Add(new SqlParameter("@FilledDate", SqlDbType.DateTime, 8));
                         sqlCommand.Parameters["@FilledDate"].Value = dtpFillDate.Value;
 
@@ -181,7 +180,7 @@ private void btnFillOrder_Click(object sender, EventArgs e)
                         }
                         finally
                         {
-                            // Close the connection.  
+                            // Close the connection.
                             connection.Close();
                         }
                     }

docs/data-tools/codesnippet/CSharp/SimpleDataApp/NewCustomer.cs

@@ -13,7 +13,7 @@ public NewCustomer()
         }
 
         //<Snippet1>
-        // Storage for IDENTITY values returned from database.  
+        // Storage for IDENTITY values returned from database.
         private int parsedCustomerID;
         private int orderID;
 
@@ -38,21 +38,21 @@ private bool IsCustomerNameValid()
         /// </summary>
         private bool IsOrderDataValid()
         {
-            // Verify that CustomerID is present.  
+            // Verify that CustomerID is present.
             if (txtCustomerID.Text == "")
             {
                 MessageBox.Show("Please create customer account before placing order.");
                 return false;
             }
-            // Verify that Amount isn't 0.   
+            // Verify that Amount isn't 0.
             else if ((numOrderAmount.Value < 1))
             {
                 MessageBox.Show("Please specify an order amount.");
                 return false;
             }
             else
             {
-                // Order can be submitted.  
+                // Order can be submitted.
                 return true;
             }
         }
@@ -78,30 +78,30 @@ private void btnCreateAccount_Click(object sender, EventArgs e)
         {
             if (IsCustomerNameValid())
             {
-                // Create the connection.  
-                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connStr))
+                // Create the connection.
+                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connString))
                 {
-                    // Create a SqlCommand, and identify it as a stored procedure.  
+                    // Create a SqlCommand, and identify it as a stored procedure.
                     using (SqlCommand sqlCommand = new SqlCommand("Sales.uspNewCustomer", connection))
                     {
                         sqlCommand.CommandType = CommandType.StoredProcedure;
 
-                        // Add input parameter for the stored procedure and specify what to use as its value.  
+                        // Add input parameter for the stored procedure and specify what to use as its value.
                         sqlCommand.Parameters.Add(new SqlParameter("@CustomerName", SqlDbType.NVarChar, 40));
                         sqlCommand.Parameters["@CustomerName"].Value = txtCustomerName.Text;
 
-                        // Add the output parameter.  
+                        // Add the output parameter.
                         sqlCommand.Parameters.Add(new SqlParameter("@CustomerID", SqlDbType.Int));
                         sqlCommand.Parameters["@CustomerID"].Direction = ParameterDirection.Output;
 
                         try
                         {
                             connection.Open();
 
-                            // Run the stored procedure.  
+                            // Run the stored procedure.
                             sqlCommand.ExecuteNonQuery();
 
-                            // Customer ID is an IDENTITY value from the database.   
+                            // Customer ID is an IDENTITY value from the database.
                             this.parsedCustomerID = (int)sqlCommand.Parameters["@CustomerID"].Value;
 
                             // Put the Customer ID value into the read-only text box.
@@ -125,47 +125,47 @@ private void btnCreateAccount_Click(object sender, EventArgs e)
         /// </summary>
         private void btnPlaceOrder_Click(object sender, EventArgs e)
         {
-            // Ensure the required input is present.  
+            // Ensure the required input is present.
             if (IsOrderDataValid())
             {
-                // Create the connection.  
-                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connStr))
+                // Create the connection.
+                using (SqlConnection connection = new SqlConnection(Properties.Settings.Default.connString))
                 {
-                    // Create SqlCommand and identify it as a stored procedure.  
+                    // Create SqlCommand and identify it as a stored procedure.
                     using (SqlCommand sqlCommand = new SqlCommand("Sales.uspPlaceNewOrder", connection))
                     {
                         sqlCommand.CommandType = CommandType.StoredProcedure;
 
-                        // Add the @CustomerID input parameter, which was obtained from uspNewCustomer.  
+                        // Add the @CustomerID input parameter, which was obtained from uspNewCustomer.
                         sqlCommand.Parameters.Add(new SqlParameter("@CustomerID", SqlDbType.Int));
                         sqlCommand.Parameters["@CustomerID"].Value = this.parsedCustomerID;
 
-                        // Add the @OrderDate input parameter.  
+                        // Add the @OrderDate input parameter.
                         sqlCommand.Parameters.Add(new SqlParameter("@OrderDate", SqlDbType.DateTime, 8));
                         sqlCommand.Parameters["@OrderDate"].Value = dtpOrderDate.Value;
 
-                        // Add the @Amount order amount input parameter.  
+                        // Add the @Amount order amount input parameter.
                         sqlCommand.Parameters.Add(new SqlParameter("@Amount", SqlDbType.Int));
                         sqlCommand.Parameters["@Amount"].Value = numOrderAmount.Value;
 
                         // Add the @Status order status input parameter.
-                        // For a new order, the status is always O (open).  
+                        // For a new order, the status is always O (open).
                         sqlCommand.Parameters.Add(new SqlParameter("@Status", SqlDbType.Char, 1));
                         sqlCommand.Parameters["@Status"].Value = "O";
 
-                        // Add the return value for the stored procedure, which is  the order ID.  
+                        // Add the return value for the stored procedure, which is  the order ID.
                         sqlCommand.Parameters.Add(new SqlParameter("@RC", SqlDbType.Int));
                         sqlCommand.Parameters["@RC"].Direction = ParameterDirection.ReturnValue;
 
                         try
                         {
-                            //Open connection.  
+                            //Open connection.
                             connection.Open();
 
-                            // Run the stored procedure.  
+                            // Run the stored procedure.
                             sqlCommand.ExecuteNonQuery();
 
-                            // Display the order number.  
+                            // Display the order number.
                             this.orderID = (int)sqlCommand.Parameters["@RC"].Value;
                             MessageBox.Show("Order number " + this.orderID + " has been submitted.");
                         }