Skip to content

Commit 640cee8

Browse files
authored
Merge pull request #6066 from dotnet/master
Update live with current master
2 parents 3d42e1d + b4f7e49 commit 640cee8

File tree

11 files changed

+126
-124
lines changed

11 files changed

+126
-124
lines changed

docs/core/versions/index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ The installer UI in those downloads was also modified to clearly present the nam
3939
Here are some examples of this format:
4040

4141
```
42-
dotnet-runtime-2.0.4-macos.10.12-x64.pkg # Mac runtime installer
43-
dotnet-sdk-2.0.4-win10-x64.exe # Windows SDK installer
44-
dotnet-sdk-2.0.4-fedora.24-x64.tar.gz # Fedora 24 binary archive
42+
dotnet-runtime-2.0.4-osx.10.12-x64.pkg # Mac runtime installer
43+
dotnet-sdk-2.0.4-win-x64.exe # Windows SDK installer
44+
dotnet-sdk-2.0.4-linux-x64.tar.gz # Linux binary archive
4545
4646
#Ubuntu file set needed for the SDK
47-
dotnet-host-2.0.4-ubuntu.16.04-x64.deb # Host / muxer and host policy
48-
dotnet-runtime-2.0.4-ubuntu.16.04-x64.deb # runtime
49-
dotnet-sdk-2.0.4-ubuntu.16.04-x64.deb # SDK tools
47+
dotnet-host-2.0.4-ubuntu.16.04-x64.deb # Host / muxer and host policy
48+
dotnet-runtime-2.0.4-ubuntu.16.04-x64.deb # runtime
49+
dotnet-sdk-2.0.4-ubuntu.16.04-x64.deb # SDK tools
5050
```
5151

5252
The format is readable and clearly shows what you're downloading, what version it is, and where you can use it. The runtime package name includes `runtime`, and the SDK includes `SDK`.

docs/csharp/tour-of-csharp/classes-and-objects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ The following program uses the `Expression` classes to evaluate the expression `
201201

202202
### Method overloading
203203

204-
Method *overloading* permits multiple methods in the same class to have the same name as long as they have unique signatures. When compiling an invocation of an overloaded method, the compiler uses *overload resolution* to determine the specific method to invoke. Overload resolution finds the one method that best matches the arguments or reports an error if no single best match can be found. The following example shows overload resolution in effect. The comment for each invocation in the `Main` method shows which method is actually invoked.
204+
Method *overloading* permits multiple methods in the same class to have the same name as long as they have unique signatures. When compiling an invocation of an overloaded method, the compiler uses *overload resolution* to determine the specific method to invoke. Overload resolution finds the one method that best matches the arguments or reports an error if no single best match can be found. The following example shows overload resolution in effect. The comment for each invocation in the `UsageExample` method shows which method is actually invoked.
205205

206206
[!code-csharp[OverloadUsage](../../../samples/snippets/csharp/tour/classes-and-objects/Overloading.cs#L3-L41)]
207207

docs/machine-learning/tutorials/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 06/06/2018
77

88
The following tutorials enable you to understand how to use [ML.NET](../index.md) to build custom machine learning solutions and integrate them into your .NET applications:
99

10-
* [Sentiment Analysis](sentiment-analysis.md): demonstrates how to apply a binary classification task using ML.NET.
11-
* [Taxi Fare Predictor](taxi-fare.md): demonstrates how to apply a regression task using ML.NET.
10+
* [Sentiment analysis](sentiment-analysis.md): demonstrates how to apply a binary classification task using ML.NET.
11+
* [Taxi fare predictor](taxi-fare.md): demonstrates how to apply a regression task using ML.NET.
1212

1313
For more examples that use ML.NET, check the [dotnet/machinelearning-samples](https://github.com/dotnet/machinelearning-samples) GitHub repository.

docs/machine-learning/tutorials/sentiment-analysis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ The `Train` method executes the following tasks:
163163
Create the `Train` method, just after the `Main` method, using the following code:
164164

165165
```csharp
166-
public static PredictionModel<SentimentData, SentimentPrediction> Train()
166+
public static async Task<PredictionModel<SentimentData, SentimentPrediction>> Train()
167167
{
168168

169169
}

docs/machine-learning/tutorials/taxi-fare.md

Lines changed: 76 additions & 71 deletions
Large diffs are not rendered by default.

docs/standard/choosing-core-framework-server.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Choose between .NET Core and .NET Framework for server apps
33
description: A guide on which implementation of .NET you should consider when building a server app in .NET.
44
author: cartermp
55
ms.author: mairaw
6-
ms.date: 03/15/2018
6+
ms.date: 06/19/2018
77
---
88
# Choosing between .NET Core and .NET Framework for server apps
99

@@ -83,8 +83,6 @@ Some .NET Framework technologies aren't available in .NET Core. Some of them mig
8383

8484
* ASP.NET Web Pages applications: ASP.NET Web Pages aren't included in ASP.NET Core. ASP.NET Core [Razor Pages](/aspnet/core/mvc/razor-pages/) have many similarities with Web Pages.
8585

86-
* ASP.NET SignalR server/client implementation. Currently, [ASP.NET SignalR](https://github.com/aspnet/SignalR) is available in preview mode with ASP.NET Core 2.1.
87-
8886
* WCF services implementation. Even when there’s a [WCF-Client library](https://github.com/dotnet/wcf) to consume WCF services from .NET Core, WCF server implementation is currently only available in the .NET Framework. This scenario is not part of the current plan for .NET Core but it’s being considered for the future.
8987

9088
* Workflow-related services: Windows Workflow Foundation (WF), Workflow Services (WCF + WF in a single service) and WCF Data Services (formerly known as "ADO.NET Data Services") are only available in the .NET Framework. There are no plans to bring WF/WCF+WF/WCF Data Services to .NET Core.

docs/standard/exceptions/index.md

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
title: "Handling and Throwing Exceptions"
3-
ms.date: "03/30/2017"
2+
title: "Handling and throwing exceptions in .NET"
3+
ms.date: "06/19/2018"
44
ms.technology: dotnet-standard
55
helpviewer_keywords:
6-
- "exceptions [.NET Framework], handling"
6+
- "exceptions [.NET], handling"
77
- "runtime, exceptions"
88
- "filtering exceptions"
9-
- "errors [.NET Framework], exceptions"
10-
- "exceptions [.NET Framework], throwing"
11-
- "exceptions [.NET Framework]"
9+
- "errors [.NET], exceptions"
10+
- "exceptions [.NET], throwing"
11+
- "exceptions [.NET]"
1212
- "common language runtime, exceptions"
1313
ms.assetid: f99a1d29-a2a8-47af-9707-9909f9010735
1414
author: "mairaw"
@@ -20,7 +20,7 @@ Applications must be able to handle errors that occur during execution in a cons
2020

2121
## Exceptions
2222

23-
An exception is any error condition or unexpected behavior that is encountered by an executing program. Exceptions can be thrown because of a fault in your code or in code that you call (such as a shared library), unavailable operating system resources, unexpected conditions that the runtime encounters (such as code that cannot be verified), and so on. Your application can recover from some of these conditions, but not from others. Although you can recover from most application exceptions, you cannot recover from most runtime exceptions.
23+
An exception is any error condition or unexpected behavior that is encountered by an executing program. Exceptions can be thrown because of a fault in your code or in code that you call (such as a shared library), unavailable operating system resources, unexpected conditions that the runtime encounters (such as code that can't be verified), and so on. Your application can recover from some of these conditions, but not from others. Although you can recover from most application exceptions, you can't recover from most runtime exceptions.
2424

2525
In .NET, an exception is an object that inherits from the <xref:System.Exception?displayProperty=nameWithType> class. An exception is thrown from an area of code where a problem has occurred. The exception is passed up the stack until the application handles it or the program terminates.
2626

@@ -30,38 +30,37 @@ Traditionally, a language's error-handling model relied on either the language's
3030

3131
- Exception throwing and handling works the same for .NET programming languages.
3232

33-
- Does not require any particular language syntax for handling exceptions, but allows each language to define its own syntax.
33+
- Doesn't require any particular language syntax for handling exceptions, but allows each language to define its own syntax.
3434

3535
- Exceptions can be thrown across process and even machine boundaries.
3636

3737
- Exception-handling code can be added to an application to increase program reliability.
3838

39-
Exceptions offer advantages over other methods of error notification, such as return codes. Failures do not go unnoticed because if an exception is thrown and you don't handle it, the runtime terminates your application. Invalid values do not continue to propagate through the system as a result of code that fails to check for a failure return code.
39+
Exceptions offer advantages over other methods of error notification, such as return codes. Failures don't go unnoticed because if an exception is thrown and you don't handle it, the runtime terminates your application. Invalid values don't continue to propagate through the system as a result of code that fails to check for a failure return code.
4040

41-
## Common Exceptions
41+
## Common exceptions
4242

4343
The following table lists some common exceptions with examples of what can cause them.
4444

45-
| Exception type | Base type | Description | Example |
46-
| -------------- | --------- | ----------- | ------- |
47-
| <xref:System.Exception> | <xref:System.Object> | Base class for all exceptions. | None (use a derived class of this exception). |
48-
| <xref:System.IndexOutOfRangeException> | <xref:System.Exception> | Thrown by the runtime only when an array is indexed improperly. | Indexing an array outside its valid range: `arr[arr.Length+1]` |
49-
| <xref:System.NullReferenceException> | <xref:System.Exception> | Thrown by the runtime only when a null object is referenced. | `object o = null; o.ToString();` |
50-
| <xref:System.InvalidOperationException> | <xref:System.Exception> | Thrown by methods when in an invalid state. | Calling `Enumerator.GetNext()` after removing an Item from the underlying collection. |
51-
| <xref:System.ArgumentException> | <xref:System.Exception> | Base class for all argument exceptions. | None (use a derived class of this exception). |
52-
| <xref:System.ArgumentNullException> | <xref:System.Exception> | Thrown by methods that do not allow an argument to be null. | `String s = null; "Calculate".IndexOf (s);` |
53-
| <xref:System.ArgumentOutOfRangeException> | <xref:System.Exception> | Thrown by methods that verify that arguments are in a given range. | `String s = "string"; s.Substring(s.Length+1);` |
54-
55-
## See Also
56-
57-
* [Exception Class and Properties](exception-class-and-properties.md)
58-
* [How to: Use the Try-Catch Block to Catch Exceptions](how-to-use-the-try-catch-block-to-catch-exceptions.md)
59-
* [How to: Use Specific Exceptions in a Catch Block](how-to-use-specific-exceptions-in-a-catch-block.md)
60-
* [How to: Explicitly Throw Exceptions](how-to-explicitly-throw-exceptions.md)
61-
* [How to: Create User-Defined Exceptions](how-to-create-user-defined-exceptions.md)
62-
* [Using User-Filtered Exception Handlers](using-user-filtered-exception-handlers.md)
63-
* [How to: Use Finally Blocks](how-to-use-finally-blocks.md)
64-
* [Handling COM Interop Exceptions](handling-com-interop-exceptions.md)
65-
* [Best Practices for Exceptions](best-practices-for-exceptions.md)
66-
67-
To learn more about how exceptions work in .NET, see [What Every Dev needs to Know About Exceptions in the Runtime](https://github.com/dotnet/coreclr/blob/master/Documentation/botr/exceptions.md).
45+
| Exception type | Description | Example |
46+
| -------------- | ----------- | ------- |
47+
| <xref:System.Exception> | Base class for all exceptions. | None (use a derived class of this exception). |
48+
| <xref:System.IndexOutOfRangeException> | Thrown by the runtime only when an array is indexed improperly. | Indexing an array outside its valid range: <br /> `arr[arr.Length+1]` |
49+
| <xref:System.NullReferenceException> | Thrown by the runtime only when a null object is referenced. | `object o = null;` <br /> `o.ToString();` |
50+
| <xref:System.InvalidOperationException> | Thrown by methods when in an invalid state. | Calling `Enumerator.MoveNext()` after removing an item from the underlying collection. |
51+
| <xref:System.ArgumentException> | Base class for all argument exceptions. | None (use a derived class of this exception). |
52+
| <xref:System.ArgumentNullException> | Thrown by methods that do not allow an argument to be null. | `String s = null;` <br /> `"Calculate".IndexOf(s);`|
53+
| <xref:System.ArgumentOutOfRangeException> | Thrown by methods that verify that arguments are in a given range. | `String s = "string";` <br /> `s.Substring(s.Length+1);` |
54+
55+
## See also
56+
57+
[Exception Class and Properties](exception-class-and-properties.md)
58+
[How to: Use the Try-Catch Block to Catch Exceptions](how-to-use-the-try-catch-block-to-catch-exceptions.md)
59+
[How to: Use Specific Exceptions in a Catch Block](how-to-use-specific-exceptions-in-a-catch-block.md)
60+
[How to: Explicitly Throw Exceptions](how-to-explicitly-throw-exceptions.md)
61+
[How to: Create User-Defined Exceptions](how-to-create-user-defined-exceptions.md)
62+
[Using User-Filtered Exception Handlers](using-user-filtered-exception-handlers.md)
63+
[How to: Use Finally Blocks](how-to-use-finally-blocks.md)
64+
[Handling COM Interop Exceptions](handling-com-interop-exceptions.md)
65+
[Best Practices for Exceptions](best-practices-for-exceptions.md)
66+
[What Every Dev needs to Know About Exceptions in the Runtime](https://github.com/dotnet/coreclr/blob/master/Documentation/botr/exceptions.md).

docs/standard/io/how-to-read-text-from-a-file.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "How to: Read Text from a File"
3-
ms.date: "03/30/2017"
3+
ms.date: "06/19/2018"
44
ms.technology: dotnet-standard
55
dev_langs:
66
- "csharp"
@@ -18,16 +18,16 @@ ms.author: "mairaw"
1818
# How to: Read Text from a File
1919
The following examples show how to read text synchronously and asynchronously from a text file using .NET for desktop apps. In both examples, when you create the instance of the <xref:System.IO.StreamReader> class, you provide the relative or absolute path to the file. The following examples assume that the file named TestFile.txt is in the same folder as the application.
2020

21-
These code examples do not apply developing for Windows Store Apps because the Windows Runtime provides different streams types reading and writing to files. For an example that shows how to read text from a file within the context of a Windows Store app, see [Quickstart: Reading and writing files](http://msdn.microsoft.com/library/windows/apps/hh758325.aspx). For examples that show how to convert between .NET Framework streams and Windows runtime streams see [How to: Convert Between .NET Framework Streams and Windows Runtime Streams](../../../docs/standard/io/how-to-convert-between-dotnet-streams-and-winrt-streams.md).
21+
These code examples do not apply to developing for Windows Store Apps because the Windows Runtime provides different stream types for reading and writing to files. For an example that shows how to read text from a file in a Windows Store app, see [Quickstart: Reading and writing files](https://docs.microsoft.com/en-us/previous-versions/windows/apps/hh758325(v=win.10)). For examples that show how to convert between .NET Framework streams and Windows runtime streams, see [How to: Convert Between .NET Framework Streams and Windows Runtime Streams](../../../docs/standard/io/how-to-convert-between-dotnet-streams-and-winrt-streams.md).
2222

2323
## Example
24-
The first example shows a synchronous read operation within a console application. In this example, the text file is opened using a stream reader, the contents are copied to a string and string is output to the console.
24+
The following example shows a synchronous read operation within a console application. In this example, the text file is opened using a stream reader, the contents are copied to a string, and the string is output to the console.
2525

2626
[!code-csharp[Conceptual.BasicIO.TextFiles#3](../../../samples/snippets/csharp/VS_Snippets_CLR/conceptual.basicio.textfiles/cs/source3.cs#3)]
2727
[!code-vb[Conceptual.BasicIO.TextFiles#3](../../../samples/snippets/visualbasic/VS_Snippets_CLR/conceptual.basicio.textfiles/vb/source3.vb#3)]
2828

2929
## Example
30-
The second example shows an asynchronous read operation within a Windows Presentation Foundation (WPF) application.
30+
The following example shows an asynchronous read operation in a Windows Presentation Foundation (WPF) application.
3131

3232
[!code-csharp[Conceptual.BasicIO.TextFiles#6](../../../samples/snippets/csharp/VS_Snippets_CLR/conceptual.basicio.textfiles/cs/source6.cs#6)]
3333
[!code-vb[Conceptual.BasicIO.TextFiles#6](../../../samples/snippets/visualbasic/VS_Snippets_CLR/conceptual.basicio.textfiles/vb/source6.vb#6)]

docs/standard/net-standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: .NET Standard
33
description: Learn about .NET Standard, its versions and the .NET implementations that support it.
44
author: mairaw
55
ms.author: mairaw
6-
ms.date: 08/13/2017
6+
ms.date: 05/18/2018
77
ms.technology: dotnet-standard
88
ms.assetid: c044882c-af15-45f2-96d1-534557a5ee9b
99
---

docs/standard/parallel-programming/how-to-implement-a-producer-consumer-dataflow-pattern.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This document describes how to use the TPL Dataflow Library to implement a produ
3838
**vbc.exe /r:System.Threading.Tasks.Dataflow.dll DataflowProducerConsumer.vb**
3939

4040
## Robust Programming
41-
This example uses just one consumer to process the source data. If you have multiple consumers in your application, use the <xref:System.Threading.Tasks.Dataflow.IReceivableSourceBlock%601.TryReceive%2A> method to read data from the source block, as shown in the following example.
41+
The preceding example uses just one consumer to process the source data. If you have multiple consumers in your application, use the <xref:System.Threading.Tasks.Dataflow.IReceivableSourceBlock%601.TryReceive%2A> method to read data from the source block, as shown in the following example.
4242

4343
[!code-csharp[TPLDataflow_ProducerConsumer#2](../../../samples/snippets/csharp/VS_Snippets_Misc/tpldataflow_producerconsumer/cs/dataflowproducerconsumer.cs#2)]
4444
[!code-vb[TPLDataflow_ProducerConsumer#2](../../../samples/snippets/visualbasic/VS_Snippets_Misc/tpldataflow_producerconsumer/vb/dataflowproducerconsumer.vb#2)]

0 commit comments

Comments
 (0)