Skip to content

Commit 416988a

Browse files
authored
Merge pull request #5965 from dotnet/master
Update live with current master
2 parents 1e17d85 + 0abfeb0 commit 416988a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+117
-279
lines changed

docs/core/tools/dotnet-new.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: dotnet new command - .NET Core CLI
33
description: The dotnet new command creates new .NET Core projects based on the specified template.
44
author: mairaw
55
ms.author: mairaw
6-
ms.date: 05/29/2018
6+
ms.date: 06/12/2018
77
---
88
# dotnet new
99

@@ -145,8 +145,8 @@ Lists templates containing the specified name. If invoked for the `dotnet new` c
145145

146146
The language of the template to create. The language accepted varies by the template (see defaults in the [arguments](#arguments) section). Not valid for some templates.
147147

148-
> [!NOTE]
149-
> Some shells interpret `#` as a special character. In those cases, you need to enclose the language parameter value, such as `dotnet new console -lang "F#"`.
148+
> [!NOTE]
149+
> Some shells interpret `#` as a special character. In those cases, you need to enclose the language parameter value, such as `dotnet new console -lang "F#"`.
150150
151151
`-n|--name <OUTPUT_NAME>`
152152

@@ -196,8 +196,8 @@ Lists templates containing the specified name. If invoked for the `dotnet new` c
196196

197197
The language of the template to create. The language accepted varies by the template (see defaults in the [arguments](#arguments) section). Not valid for some templates.
198198

199-
> [!NOTE]
200-
> Some shells interpret `#` as a special character. In those cases, you need to enclose the language parameter value, such as `dotnet new console -lang "F#"`.
199+
> [!NOTE]
200+
> Some shells interpret `#` as a special character. In those cases, you need to enclose the language parameter value, such as `dotnet new console -lang "F#"`.
201201
202202
`-n|--name <OUTPUT_NAME>`
203203

@@ -237,8 +237,8 @@ Lists templates containing the specified name. If invoked for the `dotnet new` c
237237

238238
The language of the template to create. The language accepted varies by the template (see defaults in the [arguments](#arguments) section). Not valid for some templates.
239239

240-
> [!NOTE]
241-
> Some shells interpret `#` as a special character. In those cases, you need to enclose the language parameter value, such as `dotnet new console -lang "F#"`.
240+
> [!NOTE]
241+
> Some shells interpret `#` as a special character. In those cases, you need to enclose the language parameter value, such as `dotnet new console -lang "F#"`.
242242
243243
`-n|--name <OUTPUT_NAME>`
244244

@@ -496,13 +496,13 @@ Create a .NET Standard class library project in the specified directory (availab
496496

497497
`dotnet new classlib -lang VB -o MyLibrary`
498498

499-
Create a new ASP.NET Core C# MVC application project in the current directory with no authentication targeting .NET Core 2.0:
499+
Create a new ASP.NET Core C# MVC application project in the current directory with no authentication:
500500

501-
`dotnet new mvc -au None -f netcoreapp2.0`
501+
`dotnet new mvc -au None`
502502

503-
Create a new xUnit application targeting .NET Core 2.0:
503+
Create a new xUnit application:
504504

505-
`dotnet new xunit --framework netcoreapp2.0`
505+
`dotnet new xunit`
506506

507507
List all templates available for MVC:
508508

@@ -521,4 +521,4 @@ Create a *global.json* in the current directory setting the SDK version to 2.0.0
521521
[Custom templates for dotnet new](custom-templates.md)
522522
[Create a custom template for dotnet new](~/docs/core/tutorials/create-custom-template.md)
523523
[dotnet/dotnet-template-samples GitHub repo](https://github.com/dotnet/dotnet-template-samples)
524-
[Available templates for dotnet new](https://github.com/dotnet/templating/wiki/Available-templates-for-dotnet-new)
524+
[Available templates for dotnet new](https://github.com/dotnet/templating/wiki/Available-templates-for-dotnet-new)

docs/core/tools/dotnet-sln.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: dotnet sln command - .NET Core CLI
33
description: The dotnet-sln command provides a convenient option to add, remove, and list projects in a solution file.
44
author: mairaw
55
ms.author: mairaw
6-
ms.date: 05/29/2018
6+
ms.date: 06/13/2018
77
---
88
# dotnet sln
99

@@ -28,6 +28,12 @@ dotnet sln [-h|--help]
2828

2929
The `dotnet sln` command provides a convenient way to add, remove, and list projects in a solution file.
3030

31+
To use the `dotnet sln` command, the solution file must already exist. If you need to create one, use the [dotnet new](dotnet-new.md) command, like in the following example:
32+
33+
```
34+
dotnet new sln
35+
```
36+
3137
## Commands
3238

3339
`add <PROJECT> ...`

docs/csharp/language-reference/configure-language-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ You can create a **Directory.build.props** file that contains the `<LangVersion>
8888
</Project>
8989
```
9090

91-
Now, builds in every subdirectory of the directory containing that file will use C# version 7.3 syntax. For more information, see the article on [Customize your build](/visualstudio/msbuild/customize-your-build.md).
91+
Now, builds in every subdirectory of the directory containing that file will use C# version 7.3 syntax. For more information, see the article on [Customize your build](/visualstudio/msbuild/customize-your-build).
9292

9393
## Set the langversion compiler option
9494

docs/csharp/language-reference/keywords/accessibility-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The accessibility domain of a member specifies in which program sections a membe
1313
## Example
1414
This example contains a top-level type, `T1`, and two nested classes, `M1` and `M2`. The classes contain fields that have different declared accessibilities. In the `Main` method, a comment follows each statement to indicate the accessibility domain of each member. Notice that the statements that try to reference the inaccessible members are commented out. If you want to see the compiler errors caused by referencing an inaccessible member, remove the comments one at a time.
1515

16-
[!code-csharp[csrefKeywordsModifiers#4](../../../csharp/language-reference/keywords/codesnippet/CSharp/accessibility-domain_1.cs)]
16+
[!code-csharp[csrefKeywordsModifiers#4](~/samples/snippets/csharp/VS_Snippets_VBCSharp/csrefKeywordsModifiers/CS/csrefKeywordsModifiers.cs#4)]
1717

1818
## C# Language Specification
1919
[!INCLUDE[CSharplangspec](~/includes/csharplangspec-md.md)]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The `add` contextual keyword is used to define a custom event accessor that is i
1313
## Example
1414
The following example shows an event that has custom `add` and [remove](../../../csharp/language-reference/keywords/remove.md) accessors. For the full example, see [How to: Implement Interface Events](../../../csharp/programming-guide/events/how-to-implement-interface-events.md).
1515

16-
[!code-csharp[csrefKeywordsContextual#15](../../../csharp/language-reference/keywords/codesnippet/CSharp/add_1.cs)]
16+
[!code-csharp[csrefKeywordsContextual#15](~/samples/snippets/csharp/VS_Snippets_VBCSharp/csrefKeywordsContextual/CS/csrefKeywordsContextual.cs#15)]
1717

1818
You do not typically need to provide your own custom event accessors. The accessors that are automatically generated by the compiler when you declare an event are sufficient for most scenarios.
1919

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.assetid: a9be126b-cbf4-4990-a70d-d0e1983cad0e
1212
# as (C# Reference)
1313
You can use the `as` operator to perform certain types of conversions between compatible reference types or [nullable types](../../../csharp/programming-guide/nullable-types/index.md). The following code shows an example.
1414

15-
[!code-csharp[csrefKeywordsOperator#1](../../../csharp/language-reference/keywords/codesnippet/CSharp/as_1.cs)]
15+
[!code-csharp[csrefKeywordsOperator#1](~/samples/snippets/csharp/VS_Snippets_VBCSharp/csrefKeywordsOperator/CS/csrefKeywordsOperators.cs#1)]
1616

1717
## Remarks
1818
The `as` operator is like a cast operation. However, if the conversion isn't possible, `as` returns `null` instead of raising an exception. Consider the following example:
@@ -30,7 +30,8 @@ expression is type ? (type)expression : (type)null
3030
Note that the `as` operator performs only reference conversions, nullable conversions, and boxing conversions. The `as` operator can't perform other conversions, such as user-defined conversions, which should instead be performed by using cast expressions.
3131

3232
## Example
33-
[!code-csharp[csrefKeywordsOperator#2](../../../csharp/language-reference/keywords/codesnippet/CSharp/as_2.cs)]
33+
34+
[!code-csharp[csrefKeywordsOperator#2](~/samples/snippets/csharp/VS_Snippets_VBCSharp/csrefKeywordsOperator/CS/csrefKeywordsOperators.cs#2)]
3435

3536
## C# Language Specification
3637
[!INCLUDE[CSharplangspec](~/includes/csharplangspec-md.md)]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The `ascending` contextual keyword is used in the [orderby clause](../../../csha
1414
## Example
1515
The following example shows the use of `ascending` in an [orderby clause](../../../csharp/language-reference/keywords/orderby-clause.md).
1616

17-
[!code-csharp[csrefKeywordsContextual#14](../../../csharp/language-reference/keywords/codesnippet/CSharp/ascending_1.cs)]
17+
[!code-csharp[csrefKeywordsContextual#14](~/samples/snippets/csharp/VS_Snippets_VBCSharp/csrefKeywordsContextual/CS/csrefKeywordsContextual.cs#14)]
1818

1919
## See Also
2020
[C# Reference](../../../csharp/language-reference/index.md)

docs/csharp/language-reference/keywords/codesnippet/CSharp/accessibility-domain_1.cs

Lines changed: 0 additions & 77 deletions
This file was deleted.

docs/csharp/language-reference/keywords/codesnippet/CSharp/add_1.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

docs/csharp/language-reference/keywords/codesnippet/CSharp/as_1.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)