Merge pull request #6384 from dotnet/master

Update live with current master

Author: mairaw

.openpublishing.redirection.json

@@ -618,6 +618,10 @@
             "source_path": "docs/framework/unmanaged-api/cor-prf-allowable-after-attach-bitmask.md",
             "redirect_url": "/dotnet/framework/unmanaged-api/profiling/cor-prf-monitor-enumeration"
         },
+        {
+            "source_path": "docs/framework/security/json-web-token-handler-api-reference.md",
+            "redirect_url": "https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/wiki"
+        },
         {
             "source_path": "docs/framework/wcf/extending/extending-wcf.md",
             "redirect_url": "/dotnet/framework/wcf/extending/index",
@@ -1329,6 +1333,11 @@
         {
             "source_path":"docs/visual-basic/programming-guide/concepts/threading/thread-timers.md",
             "redirect_url":"/dotnet/standard/threading/timers"
+        },
+        {
+            "source_path":"docs/fsharp/language-reference/primitive-types.md",
+            "redirect_url":"/dotnet/fsharp/language-reference/basic-types",
+            "redirect_document_id": true
         }
     ]
 }

docs/core/tools/global-json.md

@@ -1,32 +1,104 @@
 ---
-title: global.json reference
-description: See the schema for the global.json file, which permits setting the .NET Core tools version.
-author: blackdwarf
+title: global.json overview
+description: Learn how to use the global.json file to set the .NET Core SDK version when running .NET Core CLI commands.
+author: mairaw
 ms.author: mairaw
-ms.date: 04/05/2017
+ms.date: 07/02/2018
+ms.custom: "updateeachrelease"
 ---
-# global.json reference
+# global.json overview
 
-The *global.json* file allows selection of the .NET Core tools version being used through the `sdk` property.
+[!INCLUDE [topic-appliesto-net-core-all](../../../includes/topic-appliesto-net-core-all.md)]
 
-.NET Core CLI tools look for this file in the current working directory (which isn't necessarily the same as the project directory) or one of its parent directories.
+The *global.json* file allows you to define which .NET Core SDK version is used when you run .NET Core CLI commands. Selecting the .NET Core SDK is independent from specifying the runtime your project targets. The .NET Core SDK version indicates which versions of the .NET Core CLI tools are used. In general, you want to use the latest version of the tools, so no *global.json* file is needed.
+
+For more information about specifying the runtime instead, see [Target frameworks](../../standard/frameworks.md).
+
+.NET Core SDK looks for a *global.json* file in the current working directory (which isn't necessarily the same as the project directory) or one of its parent directories.
+
+## global.json schema
+
+### sdk
 
-## sdk
 Type: Object
 
-Specifies information about the SDK.
+Specifies information about the .NET Core SDK to select.
+
+#### version
 
-### version
 Type: String
 
-The version of the SDK to use.
+The version of the .NET Core SDK to use.
+
+Note that this field:
 
-For example:
+- Doesn't have globbing support, that is, the full version number has to be specified.
+- Doesn't support version ranges.
+
+The following example shows the contents of a *global.json* file:
 
 ```json
 {
   "sdk": {
-    "version": "1.0.0-preview2-003121"
+    "version": "2.1.300"
   }
 }
 ```
+
+## global.json and the .NET Core CLI
+
+It's helpful to know which versions are available in order to set one in the *global.json* file. You can find the full list of supported available SDKs at the [.NET Downloads](https://www.microsoft.com/net/download/all) site. Starting with .NET Core SDK 2.1, you can run the following command to verify which SDK versions are already installed on your machine:
+
+```console
+dotnet --list-sdks
+```
+
+To install additional .NET Core SDK versions on your machine, visit the [.NET Downloads](https://www.microsoft.com/net/download/all) site.
+
+You can create a new the *global.json* file in the current directory by executing the [dotnet new](dotnet-new.md) command, similar to the following example:
+
+```console
+dotnet new globaljson --sdk-version 2.1.300
+```
+
+## Matching rules
+
+> [!NOTE]
+> The matching rules are governed by the apphost, which is part of the .NET Core runtime.
+> The latest version of the host is used when you have multiple runtimes installed side-by-side.
+
+Starting with .NET Core 2.0, the following rules apply when determining which version of the SDK to use:
+
+- If no *global.json* file is found or *global.json* doesn't specify an SDK version, the latest installed SDK version is used. Latest SDK version can be either release or pre-release - the highest version number wins.
+- If *global.json* does specify an SDK version:
+  - If the specified SDK version is found on the machine, that exact version is used.
+  - If the specified SDK version can't be found on the machine, the latest installed SDK **patch version** of that version is used. Latest installed SDK **patch version** can be either release or pre-release - the highest version number wins. In .NET Core 2.1 and higher, the **patch versions** lower than the **patch version** specified are ignored in the SDK selection.
+  - If the specified SDK version and an appropriate SDK **patch version** can't be found, an error is thrown.
+
+The SDK version is currently composed of the following parts:
+
+`[.NET Core major version].[.NET Core minor version].[xyz][-optional preview name]`
+
+The **feature release** of the .NET Core SDK is represented by the first digit (`x`) in the last portion of the number (`xyz`) for SDK versions 2.1.100 and higher. In general, the .NET Core SDK has a faster release cycle than .NET Core.
+
+The **patch version** is defined by the last two digits (`yz`) in the last portion of the number (`xyz`) for SDK versions 2.1.100 and higher. For example, if you specify `2.1.300` as the SDK version, SDK selection finds up to `2.1.399` but `2.1.400` isn't considered a patch version for `2.1.300`.
+
+.NET Core SDK versions `2.1.100` through `2.1.201` were released during the transition between version number schemes and don't correctly handle the `xyz` notation. We highly recommend if you specify these versions in the *global.json* file, that you ensure the specified versions are on the target machines.
+
+With .NET Core SDK 1.x, if you specified a version and no exact match was found, the latest installed SDK version was used. Latest SDK version can be either release or pre-release - the highest version number wins.
+
+## Troubleshooting build warnings
+
+> [!WARNING]
+> You are working with a preview version of the .NET Core SDK. You can define the SDK version via a global.json file in the current project. More at https://go.microsoft.com/fwlink/?linkid=869452
+
+This warning indicates that your project is being compiled using a preview version of the .NET Core SDK, as explained in the [Matching rules](#matching-rules) section. .NET Core SDK versions have a history and commitment of being high quality. However, if you don't want to use a preview version, add a *global.json* file to your project hierarchy structure to specify which SDK version to use, and use `dotnet --list-sdks` to confirm that the version is installed on your machine. When a new version is released, to use the new version, either remove the *global.json* file or update it to use the newer version.
+
+> [!WARNING]
+> Startup project '{startupProject}' targets framework '.NETCoreApp' version '{targetFrameworkVersion}'. This version of the Entity Framework Core .NET Command-line Tools only supports version 2.0 or higher. For information on using older versions of the tools, see https://go.microsoft.com/fwlink/?linkid=871254
+
+Starting with .NET Core SDK 2.1 (v. 2.1.300), the `dotnet ef` command comes included in the SDK. This warning indicates that your project targets EF Core 1.0 or 1.1, which isn't compatible with .NET Core SDK 2.1 and later versions. To compile your project, install .NET Core SDK 2.0 (v. 2.1.201) and earlier on your machine. For more information, see [EF Core .NET Command-line Tools](/ef/core/miscellaneous/cli/dotnet).
+
+## See also
+
+[How project SDKs are resolved](/visualstudio/msbuild/how-to-use-project-sdk#how-project-sdks-are-resolved)

docs/csharp/language-reference/keywords/volatile.md

@@ -35,7 +35,7 @@ The `volatile` keyword indicates that a field might be modified by multiple thre
  [!code-csharp[csrefKeywordsModifiers#24](../../../csharp/language-reference/keywords/codesnippet/CSharp/volatile_1.cs)]  
 
 ## Example  
- The following example demonstrates how an auxiliary or worker thread can be created and used to perform processing in parallel with that of the primary thread. For background information about multithreading, see [Threading (C#)](../../../standard/threading/index.md) and [Managed Threading](../../programming-guide/concepts/threading/index.md).  
+ The following example demonstrates how an auxiliary or worker thread can be created and used to perform processing in parallel with that of the primary thread. For background information about multithreading, see [Managed Threading](../../../standard/threading/index.md) and [Threading (C#)](../../programming-guide/concepts/threading/index.md).  
 
  [!code-csharp[csProgGuideThreading#1](../../../csharp/language-reference/keywords/codesnippet/CSharp/volatile_2.cs)]  
 

docs/csharp/misc/cs0765.md

@@ -56,6 +56,7 @@ public partial class PartClass : IEnumerable
 }  
 ```  
 
-## See Also  
- [Partial Classes and Methods](../../csharp/programming-guide/classes-and-structs/partial-classes-and-methods.md)  
- [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b)
+## See also
+
+[Partial Classes and Methods](../../csharp/programming-guide/classes-and-structs/partial-classes-and-methods.md)  
+[Expression Trees (C#)](../programming-guide/concepts/expression-trees/index.md)  

docs/csharp/misc/cs0838.md

@@ -45,5 +45,6 @@ namespace TestNamespace
 }  
 ```  
 
-## See Also  
- [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b)
+## See also
+
+[Expression Trees (C#)](../programming-guide/concepts/expression-trees/index.md)  

docs/csharp/misc/cs1945.md

@@ -34,6 +34,7 @@ class Test
 }  
 ```  
 
-## See Also  
- [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b)  
- [Statements, Expressions, and Operators](../../csharp/programming-guide/statements-expressions-operators/index.md)
+## See also
+
+[Expression Trees (C#)](../programming-guide/concepts/expression-trees/index.md)  
+[Statements, Expressions, and Operators](../../csharp/programming-guide/statements-expressions-operators/index.md)  

docs/csharp/misc/cs1951.md

@@ -32,5 +32,6 @@ class Test
 }  
 ```  
 
-## See Also  
- [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b)
+## See also
+
+[Expression Trees (C#)](../programming-guide/concepts/expression-trees/index.md)  

docs/csharp/programming-guide/statements-expressions-operators/anonymous-functions.md

@@ -29,8 +29,9 @@ An anonymous function is an "inline" statement or expression that can be used wh
 ## C# Language Specification  
  [!INCLUDE[CSharplangspec](~/includes/csharplangspec-md.md)]  
 
-## See Also  
- [Statements, Expressions, and Operators](../../../csharp/programming-guide/statements-expressions-operators/index.md)  
- [Lambda Expressions](../../../csharp/programming-guide/statements-expressions-operators/lambda-expressions.md)  
- [Delegates](../../../csharp/programming-guide/delegates/index.md)  
- [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b)
+## See also
+
+[Statements, Expressions, and Operators](../../../csharp/programming-guide/statements-expressions-operators/index.md)  
+[Lambda Expressions](../../../csharp/programming-guide/statements-expressions-operators/lambda-expressions.md)  
+[Delegates](../../../csharp/programming-guide/delegates/index.md)  
+[Expression Trees (C#)](../concepts/expression-trees/index.md)  

docs/csharp/programming-guide/statements-expressions-operators/expressions.md

@@ -55,8 +55,9 @@ DoWork();
 ## Lambda expressions  
  Lambda expressions represent "inline methods" that have no name but can have input parameters and multiple statements. They are used extensively in LINQ to pass arguments to methods. Lambda expressions are compiled to either delegates or expression trees depending on the context in which they are used. For more information, see [Lambda Expressions](../../../csharp/programming-guide/statements-expressions-operators/lambda-expressions.md).  
 
-## Expression trees  
- Expression trees enable expressions to be represented as data structures. They are used extensively by LINQ providers to translate query expressions into code that is meaningful in some other context, such as a SQL database. For more information, see [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b).  
+## Expression trees
+
+Expression trees enable expressions to be represented as data structures. They are used extensively by LINQ providers to translate query expressions into code that is meaningful in some other context, such as a SQL database. For more information, see [Expression Trees (C#)](../concepts/expression-trees/index.md).
 
 ## Expression body definitions
 

docs/csharp/programming-guide/statements-expressions-operators/how-to-use-lambda-expressions-in-a-query.md

@@ -23,6 +23,7 @@ You do not use lambda expressions directly in query syntax, but you do use them
 ## Compiling the Code  
  To run this code, copy and paste the method into the `StudentClass` that is provided in [How to: Query a Collection of Objects](../../../csharp/programming-guide/linq-query-expressions/how-to-query-a-collection-of-objects.md) and call it from the `Main` method.  
 
-## See Also  
- [Lambda Expressions](../../../csharp/programming-guide/statements-expressions-operators/lambda-expressions.md)  
- [Expression Trees](http://msdn.microsoft.com/library/fb1d3ed8-d5b0-4211-a71f-dd271529294b)
+## See also
+
+[Lambda Expressions](../../../csharp/programming-guide/statements-expressions-operators/lambda-expressions.md)  
+[Expression Trees (C#)](../concepts/expression-trees/index.md)