Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
fb3f6a2
Merge pull request #4856 from dotnet/master
mairaw Apr 2, 2018
8848ae2
Merge pull request #4868 from dotnet/master
mairaw Apr 4, 2018
9094335
Merge pull request #4883 from dotnet/master
mairaw Apr 5, 2018
b750a8e
Merge pull request #4891 from dotnet/master
mairaw Apr 6, 2018
dc3c8a2
Merge pull request #4899 from dotnet/master
mairaw Apr 9, 2018
8b011de
Merge pull request #4910 from dotnet/master
mairaw Apr 10, 2018
acd77ef
Merge pull request #4924 from dotnet/master
mairaw Apr 12, 2018
864e834
Merge pull request #4938 from dotnet/master
mairaw Apr 13, 2018
9a4fe1a
Merge pull request #4943 from dotnet/master
mairaw Apr 14, 2018
7e52792
Merge pull request #4949 from dotnet/master
mairaw Apr 17, 2018
2e8acae
Merge pull request #4955 from dotnet/master
mairaw Apr 18, 2018
68b60d3
Merge pull request #4971 from dotnet/master
mairaw Apr 20, 2018
6809156
Merge pull request #4981 from dotnet/master
BillWagner Apr 23, 2018
7a99c2d
Merge pull request #5010 from dotnet/master
mairaw Apr 24, 2018
8c996b9
Merge pull request #5021 from dotnet/master
mairaw Apr 25, 2018
86adcc0
Merge pull request #5035 from dotnet/master
mairaw Apr 26, 2018
2042de7
Merge pull request #5051 from dotnet/master
mairaw Apr 27, 2018
03ee570
Merge pull request #5061 from dotnet/master
mairaw Apr 27, 2018
94d33ca
Merge pull request #5084 from dotnet/master
Apr 30, 2018
cb70f85
Merge pull request #5087 from dotnet/master
Apr 30, 2018
87d533e
Merge pull request #5089 from dotnet/master
mairaw Apr 30, 2018
58eb8f6
Merge branch 'master' into live
mairaw Apr 30, 2018
68c3cc2
Merge pull request #5106 from dotnet/master
May 1, 2018
11f11ca
Merge pull request #5118 from dotnet/master
mairaw May 2, 2018
3d5d33f
Merge pull request #5167 from dotnet/master
mairaw May 4, 2018
1510984
Merge pull request #5193 from dotnet/master
mairaw May 5, 2018
42b1a1e
Merge branch 'master' into live
mairaw May 7, 2018
c03eef7
Merge pull request #5223 from dotnet/master
BillWagner May 7, 2018
88f251b
Merge pull request #5270 from dotnet/master
May 10, 2018
ff1d405
Merge pull request #5300 from dotnet/master
mairaw May 11, 2018
e5bb395
Merge pull request #5334 from dotnet/master
mairaw May 12, 2018
89c93d0
Merge pull request #5375 from dotnet/master
May 15, 2018
d9b1298
Merge pull request #5409 from dotnet/master
mairaw May 16, 2018
22c3c8f
Merge pull request #5436 from dotnet/master
May 17, 2018
5b17d73
Merge pull request #5456 from dotnet/master
BillWagner May 18, 2018
895c760
Merge pull request #5480 from dotnet/master
mairaw May 19, 2018
43924ac
Merge pull request #5542 from dotnet/master
mairaw May 22, 2018
bce0c52
Merge pull request #5575 from dotnet/master
mairaw May 24, 2018
77d9a94
Merge branch 'master' into live
mairaw May 24, 2018
b7763f3
Merge pull request #5599 from dotnet/master
mairaw May 25, 2018
54231aa
Merge pull request #5617 from dotnet/master
mairaw May 25, 2018
cd4aef0
Merge pull request #5668 from dotnet/master
mairaw May 30, 2018
2e56d4d
Merge pull request #5689 from dotnet/master
mairaw May 30, 2018
4eb5c00
C18280: Incorrect link structure (#5709)
carolinacmoravia Jun 1, 2018
3540f61
Merge pull request #5726 from dotnet/master
mairaw Jun 1, 2018
bbf70ab
Merge pull request #5760 from dotnet/master
Jun 2, 2018
d8bf497
Merge pull request #5788 from dotnet/master
mairaw Jun 4, 2018
fc70fcb
Merge pull request #5823 from dotnet/master
mairaw Jun 6, 2018
5b08028
Merge pull request #5825 from dotnet/master
mairaw Jun 6, 2018
d955cb4
Merge pull request #5844 from dotnet/master
mairaw Jun 7, 2018
2ad7d06
Merge pull request #5865 from dotnet/master
BillWagner Jun 8, 2018
6c48077
Merge pull request #5884 from dotnet/master
mairaw Jun 9, 2018
95afc8f
Merge pull request #5913 from dotnet/master
Jun 12, 2018
73a6623
Merge branch 'master' into live
mairaw Jun 12, 2018
1e17d85
Merge pull request #5933 from dotnet/master
mairaw Jun 13, 2018
416988a
Merge pull request #5965 from dotnet/master
mairaw Jun 15, 2018
7c0cb6b
Merge pull request #5980 from dotnet/master
mairaw Jun 16, 2018
6bc4efc
Merge pull request #6020 from dotnet/master
mairaw Jun 19, 2018
01c3f29
fix method name
imba-tjd Jun 20, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/core/tools/cli-msbuild-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ This command is publishing an application into a `pub` folder using the "Release

The notable exception to this rule are `new` and `run` commands, as they have not been implemented as MSBuild targets.

<a name="dotnet-restore-note"></a>
[!INCLUDE[DotNet Restore Note](~/includes/dotnet-restore-note.md)]
<a name="dotnet-restore-note"></a>
[!INCLUDE[DotNet Restore Note](~/includes/dotnet-restore-note.md)]
2 changes: 1 addition & 1 deletion docs/csharp/tour-of-csharp/classes-and-objects.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ The following program uses the `Expression` classes to evaluate the expression `

### Method overloading

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.
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.

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

Expand Down