Merge pull request #6419 from dotnet/master

Update Live with current Master

Author: Ron Petrusha

.openpublishing.redirection.json

@@ -1334,10 +1334,38 @@
             "source_path":"docs/visual-basic/programming-guide/concepts/threading/thread-timers.md",
             "redirect_url":"/dotnet/standard/threading/timers"
         },
+        {
+            "source_path":"docs/csharp/programming-guide/concepts/threading/walkthrough-multithreading-with-the-backgroundworker-component.md",
+            "redirect_url":"/dotnet/api/system.componentmodel.backgroundworker"
+        },
+        {
+            "source_path":"docs/visual-basic/programming-guide/concepts/threading/walkthrough-multithreading-with-the-backgroundworker-component.md",
+            "redirect_url":"/dotnet/api/system.componentmodel.backgroundworker"
+        },
         {
             "source_path":"docs/fsharp/language-reference/primitive-types.md",
             "redirect_url":"/dotnet/fsharp/language-reference/basic-types",
             "redirect_document_id": true
+        },
+        {
+            "source_path":"docs/fsharp/using-fsharp-in-visual-studio/index.md",
+            "redirect_url":"/visualstudio/ide/fsharp-visual-studio",
+            "redirect_document_id":true
+        },
+        {
+            "source_path":"docs/fsharp/using-fsharp-in-visual-studio/visual-fsharp-development-environment-features.md",
+            "redirect_url":"/visualstudio/ide/fsharp-visual-studio",
+            "redirect_document_id":true
+        },
+        {
+            "source_path":"docs/fsharp/using-fsharp-in-visual-studio/configuring-projects.md",
+            "redirect_url":"/visualstudio/ide/fsharp-visual-studio",
+            "redirect_document_id":true
+        },
+        {
+            "source_path":"docs/fsharp/using-fsharp-in-visual-studio/targeting-older-versions-of-net.md",
+            "redirect_url":"/visualstudio/ide/fsharp-target-older-dotnet-versions",
+            "redirect_document_id":true
         }
     ]
 }

docs/csharp/pattern-matching.md

@@ -39,10 +39,7 @@ to those statements.
 In this topic, you'll build a method  that computes the area of
 different geometric shapes. But, you'll do it without resorting to object
 oriented techniques and building a class hierarchy for the different shapes.
-You'll use *pattern matching* instead. To further emphasize that we're not
-using inheritance, you'll make each shape a `struct` instead of a class. 
-Note that different `struct` types cannot specify a common user defined
-base type, so inheritance is not a possible design.
+You'll use *pattern matching* instead.
 As you go through this sample, contrast this code with how it would
 be structured as an object hierarchy. When the data you must
 query and manipulate is not a class hierarchy, pattern matching enables

docs/csharp/programming-guide/concepts/assemblies-gac/index.md

@@ -21,7 +21,7 @@ Assemblies form the fundamental unit of deployment, version control, reuse, acti
 -   If you want to load an assembly only to inspect it, use a method such as <xref:System.Reflection.Assembly.ReflectionOnlyLoadFrom%2A>.  
 
 ## Assembly Manifest  
- Within every assembly is an *assembly manifest*. Similar to a table of contents, the assembly manifest contains the following:  
+ Within every assembly, there is an *assembly manifest*. Similar to a table of contents, the assembly manifest contains the following:  
 
 -   The assembly's identity (its name and version).  
 

docs/csharp/programming-guide/concepts/async/async-return-types.md

@@ -27,7 +27,7 @@ In the following example, the `GetLeisureHours` async method contains a `return`
 
 When `GetLeisureHours` is called from within an await expression in the `ShowTodaysInfo` method, the await expression retrieves the integer value (the value of `leisureHours`) that's stored in the task returned by the `GetLeisureHours` method. For more information about await expressions, see [await](../../../../csharp/language-reference/keywords/await.md).  
 
-You can better understand how this happens by separating the call to `GetLeisureHours` from the application of `await`, as the following code shows. A call to method `TaskOfT_MethodAsync` that isn't immediately awaited returns a `Task<int>`, as you would expect from the declaration of the method. The task is assigned to the `integerTask` variable in the example. Because `integerTask` is a <xref:System.Threading.Tasks.Task%601>, it contains a <xref:System.Threading.Tasks.Task%601.Result> property of type `TResult`. In this case, TResult represents an integer type. When `await` is applied to `integerTask`, the await expression evaluates to the contents of the <xref:System.Threading.Tasks.Task%601.Result%2A> property of `integerTask`. The value is assigned to the `result2` variable.  
+You can better understand how this happens by separating the call to `GetLeisureHours` from the application of `await`, as the following code shows. A call to method `GetLeisureHours` that isn't immediately awaited returns a `Task<int>`, as you would expect from the declaration of the method. The task is assigned to the `integerTask` variable in the example. Because `integerTask` is a <xref:System.Threading.Tasks.Task%601>, it contains a <xref:System.Threading.Tasks.Task%601.Result> property of type `TResult`. In this case, TResult represents an integer type. When `await` is applied to `integerTask`, the await expression evaluates to the contents of the <xref:System.Threading.Tasks.Task%601.Result%2A> property of `integerTask`. The value is assigned to the `ret` variable.  
 
 > [!IMPORTANT]
 >  The <xref:System.Threading.Tasks.Task%601.Result%2A> property is a blocking property. If you try to access it before its task is finished, the thread that's currently active is blocked until the task completes and the value is available. In most cases, you should access the value by using `await` instead of accessing the property directly. <br/> The previous example retrieved the value of the <xref:System.Threading.Tasks.Task%601.Result%2A> property to block the main thread so that the `ShowTodaysInfo` method could finish execution before the application ended.  
@@ -43,7 +43,7 @@ In the following example, the `WaitAndApologize` async method doesn't contain a
 
 `WaitAndApologize` is awaited by using an await statement instead of an await expression, similar to the calling statement for a synchronous void-returning method. The application of an await operator in this case doesn't produce a value.  
 
-As in the previous <xref:System.Threading.Tasks.Task%601> example, you can separate the call to `Task_MethodAsync` from the application of an await operator, as the following code shows. However, remember that a `Task` doesn't have a `Result` property, and that no value is produced when an await operator is applied to a `Task`.  
+As in the previous <xref:System.Threading.Tasks.Task%601> example, you can separate the call to `WaitAndApologize` from the application of an await operator, as the following code shows. However, remember that a `Task` doesn't have a `Result` property, and that no value is produced when an await operator is applied to a `Task`.  
 
 The following code separates calling the `WaitAndApologize` method from awaiting the task that the method returns.  
 

docs/csharp/programming-guide/concepts/threading/index.md

@@ -33,7 +33,6 @@ Threading enables your C# program to perform concurrent processing so that you c
 |-----------|-----------------|  
 |[Multithreaded Applications (C#)](../../../../csharp/programming-guide/concepts/threading/multithreaded-applications.md)|Describes how to create and use threads.|  
 |[Parameters and Return Values for Multithreaded Procedures (C#)](../../../../csharp/programming-guide/concepts/threading/parameters-and-return-values-for-multithreaded-procedures.md)|Describes how to pass and return parameters with multithreaded applications.|  
-|[Walkthrough: Multithreading with the BackgroundWorker Component (C#)](../../../../csharp/programming-guide/concepts/threading/walkthrough-multithreading-with-the-backgroundworker-component.md)|Shows how to create a simple multithreaded application.|  
 |[Thread Synchronization (C#)](../../../../csharp/programming-guide/concepts/threading/thread-synchronization.md)|Describes how to control the interactions of threads.|  
 |[Thread Pooling (C#)](../../../../csharp/programming-guide/concepts/threading/thread-pooling.md)|Describes how to use a pool of worker threads that are managed by the system.|  
 |[How to: Use a Thread Pool (C#)](../../../../csharp/programming-guide/concepts/threading/how-to-use-a-thread-pool.md)|Demonstrates synchronized use of multiple threads in the thread pool.|  

docs/csharp/programming-guide/concepts/threading/parameters-and-return-values-for-multithreaded-procedures.md

@@ -112,7 +112,6 @@ private void BackgroundWorker1_RunWorkerCompleted(
  You can provide parameters and return values to thread-pool threads by using the optional `ByVal` state-object variable of the <xref:System.Threading.ThreadPool.QueueUserWorkItem%2A> method. Thread-timer threads also support a state object for this purpose. For information on thread pooling and thread timers, see [Thread Pooling (C#)](../../../../csharp/programming-guide/concepts/threading/thread-pooling.md) and [Timers](../../../../standard/threading/timers.md).  
 
 ## See Also  
- [Walkthrough: Multithreading with the BackgroundWorker Component (C#)](../../../../csharp/programming-guide/concepts/threading/walkthrough-multithreading-with-the-backgroundworker-component.md)  
  [Thread Pooling (C#)](../../../../csharp/programming-guide/concepts/threading/thread-pooling.md)  
  [Thread Synchronization (C#)](../../../../csharp/programming-guide/concepts/threading/thread-synchronization.md)  
  [Events](../../../../csharp/programming-guide/events/index.md)  

docs/csharp/programming-guide/concepts/threading/toc.md

@@ -1,7 +1,6 @@
 # [Threading](index.md)
 ## [Multithreaded Applications](multithreaded-applications.md)
 ## [Parameters and Return Values for Multithreaded Procedures](parameters-and-return-values-for-multithreaded-procedures.md)
-## [Walkthrough: Multithreading with the BackgroundWorker Component](walkthrough-multithreading-with-the-backgroundworker-component.md)
 ## [Thread Synchronization](thread-synchronization.md)
 ## [Thread Pooling](thread-pooling.md)
 ### [How to: Use a Thread Pool](how-to-use-a-thread-pool.md)