Skip to content

Update Live with current Master #14278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Sep 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e47d1a5
[framework] Remove redundant path segments (part 8) (#14037)
nemrism Sep 6, 2019
9c69241
[framework] Remove redundant path segments (part 9) (#14038)
nemrism Sep 6, 2019
25ae789
[framework] Remove redundant path segments (part 10) (#14039)
nemrism Sep 6, 2019
1ab0cd3
[framework] Remove redundant path segments (part 11) (#14043)
nemrism Sep 6, 2019
3cb3c35
[framework] Remove redundant path segments (part 12) (#14044)
nemrism Sep 6, 2019
ba72afc
[framework] Remove redundant path segments (part 13) (#14047)
nemrism Sep 6, 2019
93eaad8
[framework] Remove redundant path segments (part 14) (#14049)
nemrism Sep 6, 2019
27183d0
[framework] Remove redundant path segments (part 15) (#14051)
nemrism Sep 6, 2019
af2659b
Fix image branding and red squiggles (#14255)
mvelosop Sep 6, 2019
1b9012a
Remove redundant use of string interpolation in linq to xml doc (#14256)
mungojam Sep 6, 2019
15d5ceb
Fix documentation for TLS in 4.7 Framework (#14239)
davidsh Sep 6, 2019
b715e37
remove links to ado.net dev center (#14098)
mairaw Sep 6, 2019
1510515
remove links to ado.net dev center - Part 1 (#14097)
mairaw Sep 6, 2019
5ade7bd
fix links to not redirect and removed dupe entry (#14192)
mairaw Sep 6, 2019
06da8ea
Markdig changes (#14250)
mairaw Sep 6, 2019
530d262
remove legacy link (#14241)
mairaw Sep 6, 2019
c031ee0
Update syntax with correct element name (#14252)
nemrism Sep 6, 2019
4de32c6
Clarified content, linked to System.String (#14213)
Sep 6, 2019
5d53e6f
Update local-functions.md (#14262)
jacobwells97 Sep 6, 2019
a741e06
Fix link to core download (#14267)
Thraka Sep 6, 2019
31aa9a4
Renamed docker article (#14271)
Thraka Sep 6, 2019
2ead92a
make tutorial be 2019 only (#14268)
mairaw Sep 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 10 additions & 5 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@
"source_path": "docs/core/docker/building-net-docker-images.md",
"redirect_url": "/aspnet/core/host-and-deploy/docker/building-net-docker-images"
},
{
"source_path": "docs/core/docker/index.md",
"redirect_url": "/dotnet/core/docker/introduction",
"redirect_document_id": false
},
{
"source_path": "docs/core/docker/intro-net-docker.md",
"redirect_url": "/dotnet/core/docker/introduction",
"redirect_document_id": false
},
{
"source_path": "docs/core/getting-started.md",
"redirect_url": "/dotnet/core/get-started",
Expand Down Expand Up @@ -3184,11 +3194,6 @@
"redirect_url": "/visualstudio/vb6/vb6-support",
"redirect_document_id": true
},
{
"source_path": "docs/core/docker/index.md",
"redirect_url": "/dotnet/core/docker/intro-net-docker",
"redirect_document_id": false
},
{
"source_path": "docs/fsharp/using-fsharp-on-azure/using-fsharp-on-azure-service-fabric.md",
"redirect_url": "/dotnet/fsharp/using-fsharp-on-azure/index",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ In the meantime, if any platform or service in Azure still doesn't support .NET
[https://docs.microsoft.com/dotnet/core/porting/index](../../../core/porting/index.md)

- **.NET Core on Docker Guide**
[https://docs.microsoft.com/dotnet/core/docker/intro-net-docker](../../../core/docker/intro-net-docker.md)
[https://docs.microsoft.com/dotnet/core/docker/introduction](../../../core/docker/introduction.md)

- **.NET Components Overview**
[https://docs.microsoft.com/dotnet/standard/components](../../../standard/components.md)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/core/tools/dotnet-add-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ms.date: 06/26/2019

## Description

The `dotnet add reference` command provides a convenient option to add project references to a project. After running the command, the [`<ProjectReference>`](/visualstudio/msbuild/common-msbuild-project-items) elements are added to the project file.
The `dotnet add reference` command provides a convenient option to add project references to a project. After running the command, the `<ProjectReference>` elements are added to the project file.

```xml
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ However, local functions can't be declared inside an expression-bodied member.
> [!NOTE]
> In some cases, you can use a lambda expression to implement functionality also supported by a local function. For a comparison, see [Local functions compared to Lambda expressions](../../local-functions-vs-lambdas.md).

Local functions make the intent of your code clear. Anyone reading you code can see that the method is not callable except by the containing method. For team projects, they also make it impossible for another developer to mistakenly call the method directly from elsewhere in the class or struct.
Local functions make the intent of your code clear. Anyone reading your code can see that the method is not callable except by the containing method. For team projects, they also make it impossible for another developer to mistakenly call the method directly from elsewhere in the class or struct.

## Local function syntax

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var filename = "PurchaseOrder.xml";
var currentDirectory = Directory.GetCurrentDirectory();
var purchaseOrderFilepath = Path.Combine(currentDirectory, filename);

XElement purchaseOrder = XElement.Load($"{purchaseOrderFilepath}");
XElement purchaseOrder = XElement.Load(purchaseOrderFilepath);

IEnumerable<string> partNos = from item in purchaseOrder.Descendants("Item")
select (string) item.Attribute("PartNumber");
Expand All @@ -55,7 +55,7 @@ var filename = "PurchaseOrder.xml";
var currentDirectory = Directory.GetCurrentDirectory();
var purchaseOrderFilepath = Path.Combine(currentDirectory, filename);

XElement purchaseOrder = XElement.Load($"{purchaseOrderFilepath}");
XElement purchaseOrder = XElement.Load(purchaseOrderFilepath);

IEnumerable<XElement> pricesByPartNos = from item in purchaseOrder.Descendants("Item")
where (int) item.Element("Quantity") * (decimal) item.Element("USPrice") > 100
Expand Down
2 changes: 1 addition & 1 deletion docs/csharp/tutorials/working-with-linq.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This tutorial has multiple steps. After each step, you can run the application a

## Prerequisites

You’ll need to setup your machine to run .NET core. You can find the installation instructions on the [.NET Core](https://www.microsoft.com/net/core) page. You can run this application on Windows, Ubuntu Linux, OS X or in a Docker container. You’ll need to install your favorite code editor. The descriptions below use [Visual Studio Code](https://code.visualstudio.com/) which is an open source, cross platform editor. However, you can use whatever tools you are comfortable with.
You’ll need to setup your machine to run .NET core. You can find the installation instructions on the [.NET Core Download](https://dotnet.microsoft.com/download) page. You can run this application on Windows, Ubuntu Linux, OS X or in a Docker container. You’ll need to install your favorite code editor. The descriptions below use [Visual Studio Code](https://code.visualstudio.com/) which is an open source, cross platform editor. However, you can use whatever tools you are comfortable with.

## Create the Application

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Specifies a digest type credential used when authenticating the client to a serv
## Syntax

```xml
<digest impersonationLevel="Identification/Impersonation/Delegation/Anonymous/None" />
<httpDigest impersonationLevel="Identification/Impersonation/Delegation/Anonymous/None" />
```

## Attributes and Elements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ dev_langs:
ms.assetid: 307d2809-208b-4cf8-b6a9-5d16f15fc16c
---
# Adding Existing Constraints to a DataSet
The **Fill** method of the **DataAdapter** fills a <xref:System.Data.DataSet> only with table columns and rows from a data source; though constraints are commonly set by the data source, the **Fill** method does not add this schema information to the **DataSet** by default. To populate a **DataSet** with existing primary key constraint information from a data source, you can either call the **FillSchema** method of the **DataAdapter**, or set the **MissingSchemaAction** property of the **DataAdapter** to **AddWithKey** before calling **Fill**. This will ensure that primary key constraints in the **DataSet** reflect those at the data source. Foreign key constraint information is not included and must be created explicitly, as shown in [DataTable Constraints](../../../../docs/framework/data/adonet/dataset-datatable-dataview/datatable-constraints.md).
The **Fill** method of the **DataAdapter** fills a <xref:System.Data.DataSet> only with table columns and rows from a data source; though constraints are commonly set by the data source, the **Fill** method does not add this schema information to the **DataSet** by default. To populate a **DataSet** with existing primary key constraint information from a data source, you can either call the **FillSchema** method of the **DataAdapter**, or set the **MissingSchemaAction** property of the **DataAdapter** to **AddWithKey** before calling **Fill**. This will ensure that primary key constraints in the **DataSet** reflect those at the data source. Foreign key constraint information is not included and must be created explicitly, as shown in [DataTable Constraints](./dataset-datatable-dataview/datatable-constraints.md).

Adding schema information to a **DataSet** before filling it with data ensures that primary key constraints are included with the <xref:System.Data.DataTable> objects in the **DataSet**. As a result, when additional calls to fill the **DataSet** are made, the primary key column information is used to match new rows from the data source with current rows in each **DataTable**, and current data in the tables is overwritten with data from the data source. Without the schema information, the new rows from the data source are appended to the **DataSet**, resulting in duplicate rows.

> [!NOTE]
> If a column in a data source is identified as auto-incrementing, the **FillSchema** method, or the **Fill** method with a **MissingSchemaAction** of **AddWithKey**, creates a **DataColumn** with an **AutoIncrement** property set to `true`. However, you will need to set the **AutoIncrementStep** and **AutoIncrementSeed** values yourself. For more information about auto-incrementing columns, see [Creating AutoIncrement Columns](../../../../docs/framework/data/adonet/dataset-datatable-dataview/creating-autoincrement-columns.md).
> If a column in a data source is identified as auto-incrementing, the **FillSchema** method, or the **Fill** method with a **MissingSchemaAction** of **AddWithKey**, creates a **DataColumn** with an **AutoIncrement** property set to `true`. However, you will need to set the **AutoIncrementStep** and **AutoIncrementSeed** values yourself. For more information about auto-incrementing columns, see [Creating AutoIncrement Columns](./dataset-datatable-dataview/creating-autoincrement-columns.md).

Using **FillSchema** or setting the **MissingSchemaAction** to **AddWithKey** requires extra processing at the data source to determine primary key column information. This additional processing can hinder performance. If you know the primary key information at design time, we recommend that you explicitly specify the primary key column or columns in order to achieve optimal performance. For information about explicitly setting primary key information for a table, see [Defining Primary Keys](../../../../docs/framework/data/adonet/dataset-datatable-dataview/defining-primary-keys.md).
Using **FillSchema** or setting the **MissingSchemaAction** to **AddWithKey** requires extra processing at the data source to determine primary key column information. This additional processing can hinder performance. If you know the primary key information at design time, we recommend that you explicitly specify the primary key column or columns in order to achieve optimal performance. For information about explicitly setting primary key information for a table, see [Defining Primary Keys](./dataset-datatable-dataview/defining-primary-keys.md).

The following code example shows how to add schema information to a **DataSet** using **FillSchema**.

Expand Down Expand Up @@ -56,7 +56,7 @@ custAdapter.Fill(custDataSet, "Customers");

## See also

- [DataAdapters and DataReaders](../../../../docs/framework/data/adonet/dataadapters-and-datareaders.md)
- [DataSets, DataTables, and DataViews](../../../../docs/framework/data/adonet/dataset-datatable-dataview/index.md)
- [Retrieving and Modifying Data in ADO.NET](../../../../docs/framework/data/adonet/retrieving-and-modifying-data.md)
- [ADO.NET Managed Providers and DataSet Developer Center](https://go.microsoft.com/fwlink/?LinkId=217917)
- [DataAdapters and DataReaders](dataadapters-and-datareaders.md)
- [DataSets, DataTables, and DataViews](./dataset-datatable-dataview/index.md)
- [Retrieving and Modifying Data in ADO.NET](retrieving-and-modifying-data.md)
- [ADO.NET Overview](ado-net-overview.md)
Loading