Skip to content

Commit 8c996b9

Browse files
authored
Merge pull request #5021 from dotnet/master
Update live with current master
2 parents 7a99c2d + a672ad6 commit 8c996b9

File tree

260 files changed

+361
-495
lines changed

Some content is hidden

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

260 files changed

+361
-495
lines changed

docs/core/windows-prerequisites.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Prerequisites for .NET Core on Windows
33
description: Learn what dependencies you need on your Windows machine to develop and run .NET Core applications.
44
author: JRAlexander
55
ms.author: johalex
6-
ms.date: 03/02/2018
6+
ms.date: 04/24/2018
77
ms.topic: article
88
ms.prod: .net-core
99
ms.workload:
@@ -45,8 +45,8 @@ See [.NET Core 1.x Supported OS Versions](https://github.com/dotnet/core/blob/ma
4545
* Installing .NET Core via a *.zip* file. This can include build/CI/CD servers.
4646

4747
> [!NOTE]
48-
> *For Windows 7 and Windows Server 2008 machines only:*
49-
> Make sure that your Windows installation is up-to-date and includes hotfix [KB2533623](https://support.microsoft.com/help/2533623) installed through Windows Update.
48+
> *For Windows 8.1 and earlier versions, or Windows Server 2012 R2 and earlier versions:*
49+
> Make sure that your Windows installation is up-to-date and includes [KB2999226](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows) which can be installed through Windows Update. If you don't have this update installed, you'll see an error when you launch a .NET Core application like the following: `The program can't start because api-ms-win-crt-runtime-1-1-0.dll is missing from your computer. Try reinstalling the program to fix this problem.`.
5050
5151
## Prerequisites with Visual Studio 2017
5252

docs/csharp/getting-started/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following topics are available:
4444

4545
* [Using the Visual Studio Development Environment for C#](/visualstudio/csharp-ide/using-the-visual-studio-development-environment-for-csharp)
4646

47-
Provides a guide to using the [!INCLUDE[csprcs](~/includes/csprcs-md.md)] integrated development environment.
47+
Provides a guide to using the Visual C# integrated development environment.
4848

4949
* [C# Programming Guide](../../csharp/programming-guide/index.md)
5050

docs/csharp/getting-started/introduction-to-the-csharp-language-and-the-net-framework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.author: "wiwagn"
1818
C# is an elegant and type-safe object-oriented language that enables developers to build a variety of secure and robust applications that run on the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)]. You can use C# to create Windows client applications, XML Web services, distributed components, client-server applications, database applications, and much, much more. Visual C# provides an advanced code editor, convenient user interface designers, integrated debugger, and many other tools to make it easier to develop applications based on the C# language and the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)].
1919

2020
> [!NOTE]
21-
> The [!INCLUDE[csprcs](~/includes/csprcs-md.md)] documentation assumes that you have an understanding of basic programming concepts. If you are a complete beginner, you might want to explore Visual C# Express, which is available on the Web. You can also take advantage of books and Web resources about C# to learn practical programming skills.
21+
> The Visual C# documentation assumes that you have an understanding of basic programming concepts. If you are a complete beginner, you might want to explore Visual C# Express, which is available on the Web. You can also take advantage of books and Web resources about C# to learn practical programming skills.
2222
2323
## C# Language
2424
C# syntax is highly expressive, yet it is also simple and easy to learn. The curly-brace syntax of C# will be instantly recognizable to anyone familiar with C, C++ or Java. Developers who know any of these languages are typically able to begin to work productively in C# within a very short time. C# syntax simplifies many of the complexities of C++ and provides powerful features such as nullable value types, enumerations, delegates, lambda expressions and direct memory access, which are not found in Java. C# supports generic methods and types, which provide increased type safety and performance, and iterators, which enable implementers of collection classes to define custom iteration behaviors that are simple to use by client code. [!INCLUDE[vbteclinqext](~/includes/vbteclinqext-md.md)] expressions make the strongly-typed query a first-class language construct.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ ms.author: "wiwagn"
1818

1919
# default (C# Reference)
2020

21-
The `default` keyword.
22-
2321
The `default` keyword can be used in the `switch` statement or in a default value expression:
2422

2523
- [The switch statement](switch.md): Specifies the default label.
2624

27-
- [Default value expressions](../../programming-guide/statements-expressions-operators/default-value-expressions.md): Produces the default value of the type. This will be null for reference types and zero for value types, and the 0 bit pattern for structs.
25+
- [Default value expressions](../../programming-guide/statements-expressions-operators/default-value-expressions.md): Produces the default value of a type.
2826

29-
## See Also
27+
## See also
3028

3129
[C# Reference](../index.md)
3230
[C# Programming Guide](../../programming-guide/index.md)

docs/csharp/language-reference/operators/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ C# provides many operators, which are symbols that specify which operations (mat
5858

5959
[unchecked](../../../csharp/language-reference/keywords/unchecked.md) – disables overflow checking for integer operations. This is the default compiler behavior.
6060

61-
[default(T)](../../../csharp/programming-guide/statements-expressions-operators/default-value-expressions.md)returns the default value of type T: `null` for reference types, zero for numeric types, and zero/`null` filled in members for struct types.
61+
[default(T)](../../../csharp/programming-guide/statements-expressions-operators/default-value-expressions.md)produces the default value of type T.
6262

6363
[delegate](../../../csharp/programming-guide/statements-expressions-operators/anonymous-methods.md) – declares and returns a delegate instance.
6464

docs/csharp/language-reference/preprocessor-directives/preprocessor-pragma-checksum.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Generates checksums for source files to aid with debugging [!INCLUDE[vstecasp](~
3838

3939
This solution does not work for [!INCLUDE[vstecasp](~/includes/vstecasp-md.md)] projects, because the computed checksum is for the generated source file, rather than the .aspx file. To address this problem, `#pragma checksum` provides checksum support for [!INCLUDE[vstecasp](~/includes/vstecasp-md.md)] pages.
4040

41-
When you create an [!INCLUDE[vstecasp](~/includes/vstecasp-md.md)] project in [!INCLUDE[csprcs](~/includes/csprcs-md.md)], the generated source file contains a checksum for the .aspx file, from which the source is generated. The compiler then writes this information into the PDB file.
41+
When you create an [!INCLUDE[vstecasp](~/includes/vstecasp-md.md)] project in Visual C#, the generated source file contains a checksum for the .aspx file, from which the source is generated. The compiler then writes this information into the PDB file.
4242

4343
If the compiler encounters no `#pragma checksum` directive in the file, it computes the checksum and writes the value to the PDB file.
4444

docs/csharp/misc/sorry-we-don-t-have-specifics-on-this-csharp-error.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -894,16 +894,16 @@ ms.author: "wiwagn"
894894
We’re sorry, but we don’t have any specific information about this error. You can search for the error number and message text to find information on the web. Or you can ask other developers using one of these forums:
895895

896896
[Visual C# Language](https://social.msdn.microsoft.com/Forums/en-US/home?forum=csharplanguage)
897-
Provides a forum for questions about and general discussions of the [!INCLUDE[csprcs](~/includes/csprcs-md.md)] language syntax and compiler.
897+
Provides a forum for questions about and general discussions of the Visual C# language syntax and compiler.
898898

899899
[Visual C# IDE](https://social.msdn.microsoft.com/Forums/en-US/home?forum=csharpide)
900900
Provides a forum for questions about how to work in the [!INCLUDE[vsprvs](~/includes/vsprvs-md.md)] environment.
901901

902902
[Visual C# General](https://social.msdn.microsoft.com/Forums/vstudio/en-US/home?forum=csharpgeneral)
903-
Provides a forum for questions about and issues with [!INCLUDE[csprcs](~/includes/csprcs-md.md)] that are not discussed in other forums.
903+
Provides a forum for questions about and issues with Visual C# that are not discussed in other forums.
904904

905905
[StackOverflow](http://stackoverflow.com/questions/tagged/c%23)
906-
Provides a forum for questions about and issues with [!INCLUDE[csprcs](~/includes/csprcs-md.md)].
906+
Provides a forum for questions about and issues with Visual C#.
907907

908908
Also see:
909909
[Additional Resources for Visual C# Programmers](../../csharp/getting-started/additional-resources.md)

docs/csharp/programming-guide/classes-and-structs/how-to-create-a-new-method-for-an-enumeration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You can use extension methods to add functionality specific to a particular enum
2525
Note that the `Extensions` class also contains a static variable that is updated dynamically and that the return value of the extension method reflects the current value of that variable. This demonstrates that, behind the scenes, extension methods are invoked directly on the static class in which they are defined.
2626

2727
## Compiling the Code
28-
To run this code, copy and paste it into a Visual C# console application project that has been created in [!INCLUDE[vs_current_short](~/includes/vs-current-short-md.md)]. By default, this project targets version 3.5 of the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)], and it has a reference to System.Core.dll and a `using` directive for System.Linq. If one or more of these requirements are missing from the project, you can add them manually.
28+
To run this code, copy and paste it into a Visual C# console application project that has been created in Visual Studio. By default, this project targets version 3.5 of the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)], and it has a reference to System.Core.dll and a `using` directive for System.Linq. If one or more of these requirements are missing from the project, you can add them manually.
2929

3030
## See Also
3131
[C# Programming Guide](../../../csharp/programming-guide/index.md)

docs/csharp/programming-guide/classes-and-structs/how-to-implement-and-call-a-custom-extension-method.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This topic shows how to implement your own extension methods for any .NET type.
3737
[!code-csharp[csProgGuideExtensionMethods#1](../../../csharp/programming-guide/classes-and-structs/codesnippet/CSharp/how-to-implement-and-call-a-custom-extension-method_1.cs)]
3838

3939
## Compiling the Code
40-
To run this code, copy and paste it into a Visual C# console application project that has been created in [!INCLUDE[vs_current_short](~/includes/vs-current-short-md.md)]. By default, this project targets version 3.5 of the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)], and it has a reference to System.Core.dll and a `using` directive for System.Linq. If one or more of these requirements are missing from the project, you can add them manually.
40+
To run this code, copy and paste it into a Visual C# console application project that has been created in Visual Studio. By default, this project targets version 3.5 of the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)], and it has a reference to System.Core.dll and a `using` directive for System.Linq. If one or more of these requirements are missing from the project, you can add them manually.
4141

4242
## .NET Framework Security
4343
Extension methods present no specific security vulnerabilities. They can never be used to impersonate existing methods on a type, because all name collisions are resolved in favor of the instance or static method defined by the type itself. Extension methods cannot access any private data in the extended class.

docs/csharp/programming-guide/classes-and-structs/how-to-initialize-a-dictionary-with-a-collection-initializer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ A <xref:System.Collections.Generic.Dictionary`2> contains a collection of key/va
2323
Note the two pairs of braces in each element of the collection. The innermost braces enclose the object initializer for the `StudentName`, and the outermost braces enclose the initializer for the key/value pair that will be added to the `students`<xref:System.Collections.Generic.Dictionary`2>. Finally, the whole collection initializer for the dictionary is enclosed in braces.
2424

2525
## Compiling the Code
26-
To run this code, copy and paste the class into a Visual C# console application project that has been created in [!INCLUDE[vs_current_short](~/includes/vs-current-short-md.md)]. By default, this project targets version 3.5 of the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)], and it has a reference to System.Core.dll and a using directive for System.Linq. If one or more of these requirements are missing from the project, you can add them manually.
26+
To run this code, copy and paste the class into a Visual C# console application project that has been created in Visual Studio. By default, this project targets version 3.5 of the [!INCLUDE[dnprdnshort](~/includes/dnprdnshort-md.md)], and it has a reference to System.Core.dll and a using directive for System.Linq. If one or more of these requirements are missing from the project, you can add them manually.
2727

2828
## See Also
2929
[C# Programming Guide](../../../csharp/programming-guide/index.md)

0 commit comments

Comments
 (0)