Merged main into live

mijacobs · mijacobs · commit a696e23156f9 · 2024-07-29T18:02:37.000Z
diff --git a/docs/code-quality/static-code-analysis-for-managed-code-overview.md b/docs/code-quality/static-code-analysis-for-managed-code-overview.md
@@ -71,5 +71,5 @@ You can use the integrated features of the build system to run the analysis tool
 ## Related content
 
 - [Overview of .NET Compiler Platform-based analyzers](../code-quality/roslyn-analyzers-overview.md)
-- [Using Rule Sets to Group Code Analysis Rules](/previous-versions/visualstudio/visual-studio-2019//code-quality/using-rule-sets-to-group-code-analysis-rules.md)
+- [Using Rule Sets to Group Code Analysis Rules](/previous-versions/visualstudio/visual-studio-2019/code-quality/using-rule-sets-to-group-code-analysis-rules)
 - [How to: Enable and Disable Automatic Code Analysis](../code-quality/how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md)
diff --git a/docs/data-tools/entity-data-model-tools-in-visual-studio.md b/docs/data-tools/entity-data-model-tools-in-visual-studio.md
@@ -11,7 +11,7 @@ ms.subservice: data-tools
 
 # Entity Framework Tools in Visual Studio
 
-Entity Framework is an object-relational mapping technology that enables .NET developers to work with relational data by using domain-specific objects. It eliminates the need for most of the data-access code that developers usually need to write. Entity Framework is the recommended object-relational mapping (ORM) modeling technology for new .NET applications.
+Entity Framework is an object-relational mapping (ORM) technology that enables .NET developers to work with relational data by using domain-specific objects. It eliminates the need for most of the data-access code that developers usually need to write. Entity Framework is the recommended object-relational mapping (ORM) modeling technology for new .NET applications.
 
 Entity Framework Tools are designed to help you build Entity Framework (EF) applications. The complete documentation for Entity Framework is here: [Overview - EF 6](/ef/ef6/).
 
diff --git a/docs/data-tools/how-to-add-update-or-remove-a-wcf-data-service-reference.md b/docs/data-tools/how-to-add-update-or-remove-a-wcf-data-service-reference.md
@@ -31,11 +31,11 @@ The WCF tools are not installed with the .NET workload; use the Visual Studio In
 
 ### To add a reference to an external service (.NET Framework projects)
 
-1. In **Solution Explorer**, right-click the name of the project to which you want to add the service, and then click **Add Service Reference**.
+1. In **Solution Explorer**, right-click the name of the project to which you want to add the service, and then select **Add Service Reference**.
 
    The **Add Service Reference** dialog box appears.
 
-1. In the **Address** box, enter the URL for the service, and then click **Go** to search for the service. If the service implements user name and password security, you might be prompted for a user name and password. You can also choose a service in your own solution. Choose the **Discover** button, and then choose **Services in Solution**.
+1. In the **Address** box, enter the URL for the service, and then select **Go** to search for the service. If the service implements user name and password security, you might be prompted for a user name and password. You can also choose a service in your own solution. Choose the **Discover** button, and then choose **Services in Solution**.
 
     > [!NOTE]
     > You should only reference services from a trusted source. Adding references from an untrusted source might compromise security.
@@ -64,7 +64,7 @@ The WCF tools are not installed with the .NET workload; use the Visual Studio In
 
    ![Screenshot of WCF Web Service Provider dialog box](media/vs-2019/configure-wcf-web-service-reference-dialog.png)
 
-1. In the **URI** box, enter the URL for the service, and then click **Go** to search for the service. If the service implements user name and password security, you might be prompted for a user name and password.
+1. In the **URI** box, enter the URL for the service, and then select **Go** to search for the service. If the service implements user name and password security, you might be prompted for a user name and password.
 
     > [!NOTE]
     > You should only reference services from a trusted source. Adding references from an untrusted source might compromise security.
@@ -83,7 +83,7 @@ The WCF tools are not installed with the .NET workload; use the Visual Studio In
 
 ### To add a reference to a service in the current solution (.NET Framework projects)
 
-1. In **Solution Explorer**, right-click the name of the project to which you want to add the service, and then click **Add Service Reference**.
+1. In **Solution Explorer**, right-click the name of the project to which you want to add the service, and then select **Add Service Reference**.
 
     The **Add Service Reference** dialog box appears.
 
@@ -128,7 +128,7 @@ The Entity Data Model for a WCF Data Services sometimes changes. When this happe
 ### To update a service reference
 
 :::moniker range="<=vs-2019"
-- In **Solution Explorer**, right-click the service reference and then click **Update Service Reference**.
+- In **Solution Explorer**, right-click the service reference, and then select **Update Service Reference**.
 
      A progress dialog box displays while the reference is updated from its original location, and the service client is regenerated to reflect any changes in the metadata.
 :::moniker-end
@@ -138,7 +138,7 @@ For .NET Core projects, use the `dotnet-svcutil` tool. See [dotnet-svcutil](/dot
 
 For .NET Framework projects:
 
-- In **Solution Explorer**, expand the **Connected Services** node, right-click the service reference, and then click **Update Service Reference**.
+- In **Solution Explorer**, expand the **Connected Services** node, right-click the service reference, and then select **Update Service Reference**.
 
      A progress dialog box displays while the reference is updated from its original location, and the service client is regenerated to reflect any changes in the metadata.
 :::moniker-end
@@ -149,7 +149,7 @@ If a service reference is no longer being used, you can remove it from your solu
 
 ### To remove a service reference
 
-- In **Solution Explorer**, right-click the service reference and then click **Delete**.
+- In **Solution Explorer**, right-click the service reference, and then select **Delete**.
 
      The service client will be removed from the solution, and the metadata that describes the service will be removed from the *app.config* file.
 
diff --git a/docs/data-tools/how-to-add-validation-to-entity-classes.md b/docs/data-tools/how-to-add-validation-to-entity-classes.md
@@ -33,7 +33,7 @@ This procedure shows how to validate data when the value in a column changes. Be
 
 1. Open or create a new LINQ to SQL Classes file (*`.dbml`* file) in the **O/R Designer**. (Double-click the *`.dbml`* file in **Solution Explorer**.)
 
-2. In the **O/R Designer**, right-click the class for which you want to add validation and then click **View Code**.
+2. In the **O/R Designer**, right-click the class for which you want to add validation, and then select **View Code**.
 
      The Code Editor opens with a partial class for the selected entity class.
 
diff --git a/docs/data-tools/how-to-configure-inheritance-by-using-the-o-r-designer.md b/docs/data-tools/how-to-configure-inheritance-by-using-the-o-r-designer.md
@@ -25,10 +25,10 @@ Creating an object model that uses inheritance (and corresponds to relational da
 
 3. Drag a second copy of the table onto the **O/R Designer** and rename it. This is the derived class, or subclass.
 
-4. Click **Inheritance** in the **Object Relational Designer** tab of the **Toolbox**, and then click the subclass (the table you renamed) and connect it to the base class.
+4. Click **Inheritance** in the **Object Relational Designer** tab of the **Toolbox**, and then select the subclass (the table you renamed) and connect it to the base class.
 
     > [!NOTE]
-    > Click the **Inheritance** item in the **Toolbox** and release the mouse button, click the second copy of the class you created in step 3, and then click the first class you created in step 2. The arrow on the inheritance line points to the first class.
+    > Click the **Inheritance** item in the **Toolbox** and release the mouse button, click the second copy of the class you created in step 3, and then select the first class you created in step 2. The arrow on the inheritance line points to the first class.
 
 5. In each class, delete any object properties that you do not want to appear and that are not used for associations. You receive an error if you attempt to delete object properties used for associations: [`The property <property name> cannot be deleted because it is participating in the association <association name>`](../data-tools/the-property-property-name-cannot-be-deleted-because-it-is-participating-in-the-association-association-name.md).
 
diff --git a/docs/data-tools/how-to-connect-to-data-in-a-service.md b/docs/data-tools/how-to-connect-to-data-in-a-service.md
@@ -36,9 +36,9 @@ The WCF tools are not installed with the .NET workload; use the Visual Studio In
 
 1. On the **Data** menu, click **Add New Data Source**.
 
-2. Select **Service** on the **Choose a Data Source Type** page, and then click **Next**.
+2. Select **Service** on the **Choose a Data Source Type** page, and then select **Next**.
 
-3. Enter the address of the service you want to use, or click **Discover** to locate services in the current solution, and then click **Go**.
+3. Enter the address of the service you want to use, or click **Discover** to locate services in the current solution, and then select **Go**.
 
 4. Optionally, you can type a new **Namespace** in place of the default value.
 
diff --git a/docs/data-tools/how-to-create-an-association-relationship-between-linq-to-sql-classes-o-r-designer.md b/docs/data-tools/how-to-create-an-association-relationship-between-linq-to-sql-classes-o-r-designer.md
@@ -32,7 +32,7 @@ After you create an association, when you select the association in the **O/R De
 
 ## To create an association between entity classes
 
-1. Right-click the entity class that represents the parent class in the association, point to **Add**, and then click **Association**.
+1. Right-click the entity class that represents the parent class in the association, point to **Add**, and then select **Association**.
 
 2. Verify that the correct **Parent Class** is selected in the **Association Editor** dialog box.
 
diff --git a/docs/data-tools/how-to-create-linq-to-sql-classes-mapped-to-tables-and-views-o-r-designer.md b/docs/data-tools/how-to-create-linq-to-sql-classes-mapped-to-tables-and-views-o-r-designer.md
@@ -44,7 +44,7 @@ After you create entity classes by using the **O/R Designer**, you can create an
 
 3. In the **Data Sources** window, click **Add New Data Source**.
 
-4. Click **Object** on the **Choose a Data Source Type** page and then click **Next**.
+4. Click **Object** on the **Choose a Data Source Type** page, and then select **Next**.
 
 5. Expand the nodes and locate and select your class.
 
diff --git a/docs/data-tools/how-to-extend-code-generated-by-the-o-r-designer.md b/docs/data-tools/how-to-extend-code-generated-by-the-o-r-designer.md
@@ -21,7 +21,7 @@ Code generated by the **O/R Designer** is regenerated when changes are made to t
 
 1. Open or create a new LINQ to SQL Classes file (*`.dbml`* file) in the **O/R Designer**. (Double-click the *`.dbml`* file in **Solution Explorer** or **Database Explorer**.)
 
-2. In the **O/R Designer**, right-click the class for which you want to add validation and then click **View Code**.
+2. In the **O/R Designer**, right-click the class for which you want to add validation, and then select **View Code**.
 
      The Code Editor opens with a partial class for the selected entity class.
 
@@ -33,7 +33,7 @@ Code generated by the **O/R Designer** is regenerated when changes are made to t
 
 1. Open or create a new LINQ to SQL Classes file (*`.dbml`* file) in the **O/R Designer**. (Double-click the *`.dbml`* file in **Solution Explorer** or **Database Explorer**.)
 
-2. In the **O/R Designer**, right-click an empty area on the designer and then click **View Code**.
+2. In the **O/R Designer**, right-click an empty area on the designer, and then select **View Code**.
 
      The Code Editor opens with a partial class for the DataContext.
 
diff --git a/docs/data-tools/pass-data-between-forms.md b/docs/data-tools/pass-data-between-forms.md
@@ -81,23 +81,23 @@ This tutorial uses SQL Server Express LocalDB and the Northwind sample database.
 
 2. In the **Data Sources** window, select **Add New Data Source** to start the **Data Source Configuration** wizard.
 
-3. Select **Database** on the **Choose a Data Source Type** page, and then click **Next**.
+3. Select **Database** on the **Choose a Data Source Type** page, and then select **Next**.
 
-4. On the **Choose a database model** page, verify that **Dataset** is specified, and then click **Next**.
+4. On the **Choose a database model** page, verify that **Dataset** is specified, and then select **Next**.
 
 5. On the **Choose your Data Connection** page, do one of the following:
 
     - If a data connection to the Northwind sample database is available in the dropdown list, select it.
 
     - Select **New Connection** to launch the **Add/Modify Connection** dialog box.
 
-6. If your database requires a password and if the option to include sensitive data is enabled, select the option and then click **Next**.
+6. If your database requires a password and if the option to include sensitive data is enabled, select the option, and then select **Next**.
 
 7. On the **Save connection string to the Application Configuration file** page, click **Next**.
 
 8. On the **Choose your Database Objects** page, expand the **Tables** node.
 
-9. Select the **Customers** and **Orders** tables, and then click **Finish**.
+9. Select the **Customers** and **Orders** tables, and then select **Finish**.
 
      The **NorthwindDataSet** is added to your project, and the **Customers** and **Orders** tables appear in the **Data Sources** window.
 
@@ -135,9 +135,9 @@ Add a TableAdapter query to Form2 to load orders for the selected customer on Fo
 
 2. Right-click the **OrdersTableAdapter**, and select **Add Query**.
 
-3. Leave the default option of **Use SQL statements**, and then click **Next**.
+3. Leave the default option of **Use SQL statements**, and then select **Next**.
 
-4. Leave the default option of **SELECT which returns rows**, and then click **Next**.
+4. Leave the default option of **SELECT which returns rows**, and then select **Next**.
 
 5. Add a `WHERE` clause to the query, to return `Orders` based on the `CustomerID`. The query should be similar to the following:
 
@@ -154,7 +154,7 @@ Add a TableAdapter query to Form2 to load orders for the selected customer on Fo
 
 7. For the **Fill a DataTableMethod Name**, type `FillByCustomerID`.
 
-8. Clear the **Return a DataTable** option, and then click **Next**.
+8. Clear the **Return a DataTable** option, and then select **Next**.
 
 9. Click **Finish**.
 
@@ -175,7 +175,7 @@ Add a TableAdapter query to Form2 to load orders for the selected customer on Fo
 
 ## Create a method on Form1 to pass data and display Form2
 
-1. In **Form1**, right-click the Customer data grid, and then click **Properties**.
+1. In **Form1**, right-click the Customer data grid, and then select **Properties**.
 
 2. In the **Properties** window, click **Events**.
 
