Skip to content

Commit 16ab1ba

Browse files
authored
Merge pull request #699 from MicrosoftDocs/master
merge to live
2 parents a070cc6 + cb2fde7 commit 16ab1ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1176
-12
lines changed

docs/data-tools/add-new-data-sources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ In the context of .NET data tools in Visual Studio, the term *data source* refer
8383

8484
- WCF Data Services. For more information, see [Overview](/dotnet/framework/data/wcf/wcf-data-services-overview).
8585

86-
- WCF data services. For more information, see [Windows Communication Foundation Services and WCF Data Services in Visual Studio](../data-tools/windows-communication-foundation-services-and-wcf-data-services-in-visual-studio.md).
86+
- WCF services. For more information, see [Windows Communication Foundation Services and WCF Data Services in Visual Studio](../data-tools/windows-communication-foundation-services-and-wcf-data-services-in-visual-studio.md).
8787

8888
- Web services.
8989

docs/data-tools/create-a-simple-data-application-with-wpf-and-entity-framework-6.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ translation.priority.mt:
2222
# Create a simple data application with WPF and Entity Framework 6
2323
This walkthough shows how to create a basic "forms over data" application in Visual Studio with SQL Server LocalDB, the Northwind database, Entity Framework 6, and Windows Presentation Foundation. It shows how to do basic databinding with a master-detail view, and it also has a custom "Binding Navigator" with buttons for "Move Next," "Move Previous," "Move to beginning," "Move to end," "Update" and "Delete."
2424

25-
This article focuses on using data tools in Visual Studio, and does not attempt to explain the underlying technologies in any depth. It assumes that you have a basic familiarity with XAML, Entity Framework, and SQL. This example also does not demonstrate MVVM architecture, which is standard for WPF applications. However, you can copy this code into your own MVVM application with very few modifications.
25+
This article focuses on using data tools in Visual Studio, and does not attempt to explain the underlying technologies in any depth. It assumes that you have a basic familiarity with XAML, Entity Framework, and SQL. This example also does not demonstrate Model-View-View Model (MVVM) architecture, which is standard for WPF applications. However, you can copy this code into your own MVVM application with very few modifications.
2626

2727
## Install and connect to Northwind
2828
This example uses SQL Server Express LocalDB and the Northwind sample database. It should work with other SQL database products just as well if the ADO.NET data provider for that product supports Entity Framework.

docs/data-tools/n-tier-data-applications-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ translation.priority.ht:
3838

3939
Visual Studio contains several features to help developers create n-tier applications:
4040

41-
- The datasetprovides a **DataSet Project** property that enables you to separate the dataset (data entity layer) and `TableAdapter`s (data access layer) into discrete projects.
41+
- The dataset provides a **DataSet Project** property that enables you to separate the dataset (data entity layer) and TableAdapters (data access layer) into discrete projects.
4242

4343
- The [LINQ to SQL Tools in Visual Studio](../data-tools/linq-to-sql-tools-in-visual-studio2.md) provides settings to generate the DataContext and data classes into separate namespaces. This enables logical separation of the data access and data entity tiers.
4444

docs/data-tools/query-datasets.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ translation.priority.mt:
2121
- "tr-tr"
2222
---
2323
# Query datasets
24-
To search for specific records in a dataset, use the FindBy method on the DataTable, write your own foreach loop over the table's rows collection, or use [LINQ to DataSet](/dotnet/framework/data/adonet/linq-to-dataset). LINQ to DataSet.
24+
To search for specific records in a dataset, use the FindBy method on the DataTable, write your own foreach statement to loop over the table's Rows collection, or use [LINQ to DataSet](/dotnet/framework/data/adonet/linq-to-dataset).
2525

2626
## Dataset case sensitivity
27-
Within a dataset, table and column names are case-insensitive by default — that is, a table in a dataset called "Customers" can also be referred to as "customers." This matches the naming conventions in many databases, including SQL Server.In SQL Server, the default behavior is that the names of data elements cannot be distinguished only by case.
27+
Within a dataset, table and column names are case-insensitive by default — that is, a table in a dataset called "Customers" can also be referred to as "customers." This matches the naming conventions in many databases, including SQL Server. In SQL Server, the default behavior is that the names of data elements cannot be distinguished only by case.
2828

2929
> [!NOTE]
3030
> Unlike datasets, XML documents are case-sensitive, so the names of data elements defined in schemas are case-sensitive. For example, schema protocol allows the schema to define a table called "Customers" and a different table called "customers." This can result in name collisions when a schema that contains elements that differ only by case is used to generate a dataset class.
@@ -51,11 +51,11 @@ To search for specific records in a dataset, use the FindBy method on the DataT
5151
[!code-csharp[VbRaddataEditing#19](../data-tools/codesnippet/CSharp/query-datasets_2.cs)]
5252
[!code-vb[VbRaddataEditing#19](../data-tools/codesnippet/VisualBasic/query-datasets_2.vb)]
5353

54-
## Findrows by column values
54+
## Find rows by column values
5555

5656
#### To find rows based on the values in any column
5757

58-
- Data tables are created with the<xref:System.Data.DataTable.Select%2A> method,which returns an array of <xref:System.Data.DataRow>s based on the expression passed to the <xref:System.Data.DataTable.Select%2A> method. For more information about creating valid expressions, see the "Expression Syntax" section of the page about the <xref:System.Data.DataColumn.Expression%2A> property.
58+
- Data tables are created with the <xref:System.Data.DataTable.Select%2A> method, which returns an array of <xref:System.Data.DataRow>s based on the expression passed to the <xref:System.Data.DataTable.Select%2A> method. For more information about creating valid expressions, see the "Expression Syntax" section of the page about the <xref:System.Data.DataColumn.Expression%2A> property.
5959

6060
The following example shows how to use the <xref:System.Data.DataTable.Select%2A> method of the <xref:System.Data.DataTable> to locate specific rows.
6161

@@ -65,20 +65,20 @@ To search for specific records in a dataset, use the FindBy method on the DataT
6565
## Access related records
6666
When tables in a dataset are related, a <xref:System.Data.DataRelation> object can make the related records available in another table. For example, a dataset containing `Customers` and `Orders` tables can be made available.
6767

68-
You can use a <xref:System.Data.DataRelation> object to locate related records by calling the <xref:System.Data.DataRow.GetChildRows%2A> method of a <xref:System.Data.DataRow> in the parent table.This method returns an array of related child records. Or you can call the <xref:System.Data.DataRow.GetParentRow%2A> method of a <xref:System.Data.DataRow> in the child table.This method returns a single <xref:System.Data.DataRow> from the parent table.
68+
You can use a <xref:System.Data.DataRelation> object to locate related records by calling the <xref:System.Data.DataRow.GetChildRows%2A> method of a <xref:System.Data.DataRow> in the parent table. This method returns an array of related child records. Or you can call the <xref:System.Data.DataRow.GetParentRow%2A> method of a <xref:System.Data.DataRow> in the child table. This method returns a single <xref:System.Data.DataRow> from the parent table.
6969

7070
This page provides examples using typed datasets. For information about navigating relationships in untyped datasets, see [Navigating DataRelations](/dotnet/framework/data/adonet/dataset-datatable-dataview/navigating-datarelations).
7171

7272
> [!NOTE]
7373
> If you are working in a Windows Forms application and using the data-binding features to display data, the designer-generated form might provide enough functionality for your application. For more information, see [Bind controls to data in Visual Studio](../data-tools/bind-controls-to-data-in-visual-studio.md). Specifically, see [Relationships in Datasets](relationships-in-datasets.md).
7474
75-
The following code examples demonstrate how to navigate up and down relationships in typed datasets. The code examples use typed <xref:System.Data.DataRow>s (`NorthwindDataSet.OrdersRow`) and the generated `FindBy`*PrimaryKey* (`FindByCustomerID`) methods to locate a desired row and return the related records. The examples compile and run correctly only if you have:
75+
The following code examples demonstrate how to navigate up and down relationships in typed datasets. The code examples use typed <xref:System.Data.DataRow>s (`NorthwindDataSet.OrdersRow`) and the generated FindBy*PrimaryKey* (`FindByCustomerID`) methods to locate a desired row and return the related records. The examples compile and run correctly only if you have:
7676

7777
- An instance of a dataset named `NorthwindDataSet` with a `Customers` table.
7878

7979
- An `Orders` table.
8080

81-
- A relationship named `FK_Orders_Customers`relating the two tables available to the scope of your code
81+
- A relationship named `FK_Orders_Customers`relating the two tables.
8282

8383
Additionally, both tables need to be filled with data for any records to be returned.
8484

docs/debugger/using-breakpoints.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ You can set breakpoints when you want to stop debugger execution, perhaps to see
166166

167167
![Breakpoint when changed](../debugger/media/breakpointwhenchanged.png "BreakpointWhenChanged")
168168

169-
The behavior of the When changed field is different for different programming languages. If you choose **When changed** for native code, the debugger doesn't consider the first evaluation of the condition to be a change, so the breakpoint won't be hit on the first evaluation. If you choose **When changed** for managed code, he breakpoint is hit on the first evaluation after **When changed** is selected.
169+
The behavior of the When changed field is different for different programming languages. If you choose **When changed** for native code, the debugger doesn't consider the first evaluation of the condition to be a change, so the breakpoint won't be hit on the first evaluation. If you choose **When changed** for managed code, the breakpoint is hit on the first evaluation after **When changed** is selected.
170170

171171
If you set a breakpoint condition with invalid syntax, a warning message appears. If you specify a breakpoint condition with valid syntax but invalid semantics, a warning message appears the first time the breakpoint is hit. In either case, the debugger breaks execution when the invalid breakpoint is hit. The breakpoint is skipped only if the condition is valid and evaluates to `false`.
172172

@@ -192,7 +192,7 @@ You can set breakpoints when you want to stop debugger execution, perhaps to see
192192
Note that Object IDs create weak references, and do not prevent the object from being garbage collected. They are valid only for the current debugging session.
193193

194194
## Hit Count
195-
If you suspect that a loop in your code starts misbehaving after a certain number of iterations, you can set a breakpoint to stop execution after a specified number of hits to the to the associated line of code, rather than being forced to repeatedly press **F5** to reach the iteration level.
195+
If you suspect that a loop in your code starts misbehaving after a certain number of iterations, you can set a breakpoint to stop execution after a specified number of hits to the associated line of code, rather than being forced to repeatedly press **F5** to reach the iteration level.
196196

197197
In the **Breakpoint Settings** window, set the condition to **Hit Count**. You can then specify the number of iterations. In the following example, we set the breakpoint to hit on every other iteration:
198198

docs/test/TOC.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#### [Troubleshooting Code Coverage](troubleshooting-code-coverage.md)
4747
### [Using emulators to isolate unit tests for Sharepoint 2010 applications](using-emulators-to-isolate-unit-tests-for-sharepoint-2010-applications.md)
4848
## [Use Live Unit Testing in Visual Studio 2017 Enterprise Edition](live-unit-testing.md)
49+
### [Get started with Live Unit Testing](live-unit-testing-start.md)
4950
### [Live Unit Testing FAQ](live-unit-testing-faq.md)
5051
## [Use UI Automation To Test Your Code](use-ui-automation-to-test-your-code.md)
5152
### [Walkthrough: Creating, Editing and Maintaining a Coded UI Test](walkthrough-creating-editing-and-maintaining-a-coded-ui-test.md)

0 commit comments

Comments
 (0)