Update Live with current Master

.openpublishing.redirection.json

@@ -941,7 +941,12 @@
             "source_path": "docs/standard/microservices-architecture/architect-microservice-container-applications/communication-between-microservices.md",
             "redirect_url": "/dotnet/standard/microservices-architecture/architect-microservice-container-applications/communication-in-microservice-architecture",
             "redirect_document_id": true
-        },  
+        },
+        {
+            "source_path": "docs/standard/parallel-programming/how-to-write-a-parallel-foreach-loop-with-thread-local-variables.md",
+            "redirect_url": "/dotnet/standard/parallel-programming/how-to-write-a-parallel-foreach-loop-with-partition-local-variables",
+            "redirect_document_id": true
+        },
         {
             "source_path": "docs/standard/serialization/marshal-by-value.md",
             "redirect_url": "/dotnet/standard/serialization-concepts"

docfx.json

@@ -95,7 +95,10 @@
       "ms.topic": "conceptual",
       "feedback_system": "GitHub",
       "feedback_github_repo": "dotnet/docs",
-      "feedback_product_url": "https://developercommunity.visualstudio.com/spaces/61/index.html" 
+      "feedback_product_url": "https://developercommunity.visualstudio.com/spaces/61/index.html",
+      "featureFlags": [
+        "enable_uhf_ppe"
+      ]
     },
     "fileMetadata": {
       "feedback_product_url": {

docs/core/deploying/runtime-patch-selection.md

@@ -7,7 +7,7 @@ ms.date: 05/31/2018
 ---
 # Self-contained deployment runtime roll forward
 
-.NET Core [self-contained application deployments](index.md) include both the .NET Core libraries and the .NET Core runtime. Starting in .NET Core SDK 2.1.300 (.NET Core 2.1), a self-contained application deployment [now publishes the highest patch runtime on your machine](https://github.com/dotnet/designs/pull/36). By default,[`dotnet publish`](../tools/dotnet-publish.md) for a self-contained deployment selects the latest version installed as part of the SDK on the publishing machine. This enables your deployed application to run with security fixes (and other fixes) available during `publish`. The application must be re-published to obtain a new patch. Self-contained applications are created by specifying `-r <RID>` on `dotnet publish` command or by specifying the [runtime identifier (RID)](../rid-catalog.md) in the project file (csproj / vbproj) or on the command line.
+.NET Core [self-contained application deployments](index.md) include both the .NET Core libraries and the .NET Core runtime. Starting in .NET Core SDK 2.1.300 (.NET Core 2.1), a self-contained application deployment [publishes the highest patch runtime on your machine](https://github.com/dotnet/designs/pull/36). By default, [`dotnet publish`](../tools/dotnet-publish.md) for a self-contained deployment selects the latest version installed as part of the SDK on the publishing machine. This enables your deployed application to run with security fixes (and other fixes) available during `publish`. The application must be re-published to obtain a new patch. Self-contained applications are created by specifying `-r <RID>` on `dotnet publish` command or by specifying the [runtime identifier (RID)](../rid-catalog.md) in the project file (csproj / vbproj) or on the command line.
 
 ## Patch version roll forward overview
 
@@ -22,15 +22,15 @@ ms.date: 05/31/2018
 
 Running `restore` as part of the `publish` operation may be undesirable for your scenario. To avoid `restore` during `publish` while creating self-contained applications, do the following:
 
-* Set the `RuntimeIdentifiers` property to a semicolon-separated list of all the [RIDs](../rid-catalog.md) to be published
-* Set the `TargetLatestRuntimePatch` property to `true`
+* Set the `RuntimeIdentifiers` property to a semicolon-separated list of all the [RIDs](../rid-catalog.md) to be published.
+* Set the `TargetLatestRuntimePatch` property to `true`.
 
 ## No-restore argument with dotnet publish options
 
 If you want to create both self-contained applications and [framework-dependent applications](index.md) with the same project file, and you want to use the `--no-restore` argument with `dotnet publish`, then choose one of the following:
 
-1. Prefer the framework-dependent behavior. If the application is framework-dependent, this is the default behavior. If the application is self-contained, and can use an unpatched 2.1.0 local runtime, set the `TargetLatestRuntimePatch` to `false` in the project file (csproj / vbproj).
+1. Prefer the framework-dependent behavior. If the application is framework-dependent, this is the default behavior. If the application is self-contained, and can use an unpatched 2.1.0 local runtime, set the `TargetLatestRuntimePatch` to `false` in the project file.
 
-2. Prefer the self-contained behavior. If the application is self-contained, this is the default behavior. If the application is framework-dependent, and requires the latest patch installed, set `TargetLatestRuntimePatch` to `true` in the project file (csproj / vbproj).
+2. Prefer the self-contained behavior. If the application is self-contained, this is the default behavior. If the application is framework-dependent, and requires the latest patch installed, set `TargetLatestRuntimePatch` to `true` in the project file.
 
-3. Take explicit control of the runtime framework version by setting `RuntimeFrameworkVersion` to the specific patch version in the project file (csproj / vbproj).
+3. Take explicit control of the runtime framework version by setting `RuntimeFrameworkVersion` to the specific patch version in the project file.

docs/core/tools/dotnet-run.md

@@ -197,9 +197,9 @@ Run the project in the current directory:
 
 Run the specified project:
 
-`dotnet run --project /projects/proj1/proj1.csproj`
+`dotnet run --project ./projects/proj1/proj1.csproj`
 
-Run the project in the current directory (the `--help` argument in this example is passed to the application, since the `--` argument is used):
+Run the project in the current directory (the `--help` argument in this example is passed to the application, since the blank `--` option is used):
 
 `dotnet run --configuration Release -- --help`
 

docs/csharp/programming-guide/concepts/linq/how-to-join-content-from-dissimilar-files-linq.md

@@ -1,14 +1,15 @@
 ---
 title: "How to: Join Content from Dissimilar Files (LINQ) (C#)"
-ms.date: 07/20/2015
+ms.date: 06/27/2018
 ms.assetid: aa2d12a6-70a9-492f-a6db-b2b850d46811
 ---
 # How to: Join Content from Dissimilar Files (LINQ) (C#)
+
 This example shows how to join data from two comma-delimited files that share a common value that is used as a matching key. This technique can be useful if you have to combine data from two spreadsheets, or from a spreadsheet and from a file that has another format, into a new file. You can modify the example to work with any kind of structured text.  
 
-### To create the data files  
+## To create the data files
 
-1.  Copy the following lines into a file that is named scores.csv and save it to your project folder. The file represents spreadsheet data. Column 1 is the student's ID, and columns 2 through 5 are test scores.  
+1.  Copy the following lines into a file that is named *scores.csv* and save it to your project folder. The file represents spreadsheet data. Column 1 is the student's ID, and columns 2 through 5 are test scores.  
 
     ```  
     111, 97, 92, 81, 60  
@@ -25,7 +26,7 @@ This example shows how to join data from two comma-delimited files that share a
     122, 94, 92, 91, 91  
     ```  
 
-2.  Copy the following lines into a file that is named names.csv and save it to your project folder. The file represents a spreadsheet that contains the student's last name, first name, and student ID.  
+2.  Copy the following lines into a file that is named *names.csv* and save it to your project folder. The file represents a spreadsheet that contains the student's last name, first name, and student ID.  
 
     ```  
     Omelchenko,Svetlana,111  
@@ -43,8 +44,12 @@ This example shows how to join data from two comma-delimited files that share a
     ```  
 
 ## Example  
-
-```csharp  
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
 class JoinStrings  
 {  
     static void Main()  
@@ -72,7 +77,7 @@ class JoinStrings
             let nameFields = name.Split(',')  
             from id in scores  
             let scoreFields = id.Split(',')  
-            where nameFields[2] == scoreFields[0]  
+            where Convert.ToInt32(nameFields[2]) == Convert.ToInt32(scoreFields[0])
             select nameFields[0] + "," + scoreFields[1] + "," + scoreFields[2]   
                    + "," + scoreFields[3] + "," + scoreFields[4];  
 
@@ -96,26 +101,32 @@ class JoinStrings
     }  
 }  
 /* Output:  
-Merge two spreadsheets:  
-Adams, 99, 82, 81, 79  
-Fakhouri, 99, 86, 90, 94  
-Feng, 93, 92, 80, 87  
-Garcia, 97, 89, 85, 82  
-Garcia, 35, 72, 91, 70  
-Garcia, 92, 90, 83, 78  
-Mortensen, 88, 94, 65, 91  
-O'Donnell, 75, 84, 91, 39  
-Omelchenko, 97, 92, 81, 60  
-Tucker, 68, 79, 88, 92  
-Tucker, 94, 92, 91, 91  
-Zabokritski, 96, 85, 91, 60  
-12 total names in list  
+Merge two spreadsheets:
+Omelchenko, 97, 92, 81, 60
+O'Donnell, 75, 84, 91, 39
+Mortensen, 88, 94, 65, 91
+Garcia, 97, 89, 85, 82
+Garcia, 35, 72, 91, 70
+Fakhouri, 99, 86, 90, 94
+Feng, 93, 92, 80, 87
+Garcia, 92, 90, 83, 78
+Tucker, 68, 79, 88, 92
+Adams, 99, 82, 81, 79
+Zabokritski, 96, 85, 91, 60
+Tucker, 94, 92, 91, 91
+12 total names in list
  */  
-```  
-
-## Compiling the Code  
- Create a project that targets the .NET Framework  version 3.5 or higher, with a reference to System.Core.dll and `using` directives for the System.Linq and System.IO namespaces.  
+```
+
+## Compiling the code
+
+Create and compile a project that targets one of the following options:
+
+- .NET Framework version 3.5 with a reference to System.Core.dll.
+- .NET Framework version 4.0 or higher.
+- .NET Core version 1.0 or higher.
 
-## See Also  
+## See also
+
  [LINQ and Strings (C#)](../../../../csharp/programming-guide/concepts/linq/linq-and-strings.md)  
  [LINQ and File Directories (C#)](../../../../csharp/programming-guide/concepts/linq/linq-and-file-directories.md)

docs/csharp/programming-guide/concepts/linq/how-to-populate-object-collections-from-multiple-sources-linq.md

@@ -137,7 +137,8 @@ foreach (var student in queryNamesScores2)
 
 Create and compile a project that targets one of the following options:
 
-- .NET Framework version 3.5 or higher with a reference to System.Core.dll.
+- .NET Framework version 3.5 with a reference to System.Core.dll.
+- .NET Framework version 4.0 or higher.
 - .NET Core version 1.0 or higher.
 
 ## See also

docs/framework/configure-apps/file-schema/network/proxy-element-network-settings.md

@@ -40,7 +40,7 @@ Defines a proxy server.
 |**Attribute**|**Description**|  
 |-------------------|---------------------|  
 |`autoDetect`|Specifies whether the proxy is automatically detected. The default value is `unspecified`.|  
-|`bypassonlocal`|Specifies whether the proxy is bypassed for local resources. Local resources include the local server (http://localhost, http://loopback, or http://127.0.0.1) and a URI without a period (http://webserver). The default value is `unspecified`.|  
+|`bypassonlocal`|Specifies whether the proxy is bypassed for local resources. Local resources include the local server (`http://localhost`, `http://loopback`, or `http://127.0.0.1`) and a URI without a period (`http://webserver`). The default value is `unspecified`.|  
 |`proxyaddress`|Specifies the proxy URI to use.|  
 |`scriptLocation`|Specifies the location of the configuration script.|  
 |`usesystemdefault`|Specifies whether to use Internet Explorer proxy settings. If set to `true`, subsequent attributes will override Internet Explorer proxy settings. The default value is `unspecified`.|  

docs/framework/configure-apps/file-schema/network/remove-element-for-webrequestmodules-network-settings.md

@@ -51,7 +51,7 @@ Removes a custom Web request module from the application.
 ## Remarks  
  The `remove` element removes the registered Web request module for the specified URI prefix.  
 
- The value for the `prefix` attribute should be the leading characters of a valid URI -- for example, "http", or "http://www.contoso.com".  
+ The value for the `prefix` attribute should be the leading characters of a valid URI -- for example, "http", or "`http://www.contoso.com` ".  
 
 ## Configuration Files  
  This element can be used in the application configuration file or the machine configuration file (Machine.config).  

docs/framework/configure-apps/file-schema/wcf/identity.md

@@ -42,7 +42,7 @@ The identity element allows a client developer to specify at design time the exp
 |dns|Specifies the DNS of an X.509 certificate used to authenticate a service. This element contains an attribute `value` that is a string, and contains the actual identity.|  
 |rsa|Specifies the value of the RSA field of an X.509 certificate used to authenticate a service to a client. This element contains an attribute `value` that is a string, and contains the actual identity|  
 |servicePrincipalName|Specifies a server principal name (SPN) identity, which is the principal name used by a client to uniquely identify an instance of a service. This element contains an attribute `value` that is a string, and contains the actual principal name. This element is of type <xref:System.ServiceModel.Configuration.ServicePrincipalNameElement>.|  
-|userPrincipalName|Specifies a user principal name (UPN) identity, which is the logon name type of a user on a network. The user principal name consists of the user object name used in Active Directory, followed by the at symbol (@) and then, typically, the Domain Name System parent domain. For example, Jeff in the Fabrikam.com domain tree might have the user principal name [jeff@fabrikam.com](mailto:jeffsmith@fabrikam.com).  This element contains an attribute `value` that is a string, and contains the actual principal name. This element is of type <xref:System.ServiceModel.Configuration.UserPrincipalNameElement>.|  
+|userPrincipalName|Specifies a user principal name (UPN) identity, which is the logon name type of a user on a network. The user principal name consists of the user object name used in Active Directory, followed by the at symbol (\@) and then, typically, the Domain Name System parent domain. For example, Jeff in the Fabrikam.com domain tree might have the user principal name [jeff@fabrikam.com](mailto:jeffsmith@fabrikam.com).  This element contains an attribute `value` that is a string, and contains the actual principal name. This element is of type <xref:System.ServiceModel.Configuration.UserPrincipalNameElement>.|  
 
 ### Parent Elements