Skip to content

Commit 736ec4d

Browse files
authored
Merge pull request #6240 from dotnet/master
Update live with current master
2 parents 979597c + 200ca06 commit 736ec4d

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

docs/core/tools/dotnet-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Starting with .NET Core 2.0, `dotnet restore` is run implicitly if necessary whe
4949

5050
- [`dotnet new`](dotnet-new.md)
5151
- [`dotnet build`](dotnet-build.md)
52-
- [`dotnet build server`](dotnet-build-server.md)
52+
- [`dotnet build-server`](dotnet-build-server.md)
5353
- [`dotnet run`](dotnet-run.md)
5454
- [`dotnet test`](dotnet-test.md)
5555
- [`dotnet publish`](dotnet-publish.md)

docs/csharp/language-reference/keywords/foreach-in.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "foreach, in (C# Reference)"
3-
ms.date: 06/28/2018
3+
ms.date: 06/29/2018
44
f1_keywords:
55
- "foreach"
66
- "foreach_CSharpKeyword"
@@ -29,11 +29,11 @@ The following example shows usage of the `foreach` statement with an instance of
2929

3030
The next example uses the `foreach` statement with an instance of the <xref:System.Span%601?displayProperty=nameWithType> type, which doesn't implement any interfaces:
3131

32-
[!code-csharp-interactive[span example](~/samples/snippets/csharp/keywords/IterationKeywordsExamples.cs#2)]
32+
[!code-csharp[span example](~/samples/snippets/csharp/keywords/IterationKeywordsExamples.cs#2)]
3333

34-
Beginning with C# 7.3, when the collection type supports `ref` access to its elements, you can declare the iteration variable with the `ref` or `ref readonly` modifier. The following example uses a `ref` iteration variable to set the value of each item in a stackalloc array. The `ref readonly` version iterates the collection to print all the values. The `readonly` declaration uses an implicit local variable declaration. Implicit variable declarations can be used with either `ref` or `ref readonly` declarations, as can explicitly typed variable declarations.
34+
Beginning with C# 7.3, if the enumerator's `Current` property returns a [reference return value](../../programming-guide/classes-and-structs/ref-returns.md) (`ref T` where `T` is the type of the collection element), you can declare the iteration variable with the `ref` or `ref readonly` modifier. The following example uses a `ref` iteration variable to set the value of each item in a stackalloc array. The `ref readonly` version iterates the collection to print all the values. The `readonly` declaration uses an implicit local variable declaration. Implicit variable declarations can be used with either `ref` or `ref readonly` declarations, as can explicitly typed variable declarations.
3535

36-
[!code-csharp-interactive[ref span example](~/samples/snippets/csharp/keywords/IterationKeywordsExamples.cs#RefSpan)]
36+
[!code-csharp[ref span example](~/samples/snippets/csharp/keywords/IterationKeywordsExamples.cs#RefSpan)]
3737

3838
## C# language specification
3939

@@ -47,4 +47,4 @@ Beginning with C# 7.3, when the collection type supports `ref` access to its ele
4747
[Iteration Statements](iteration-statements.md)
4848
[C# Keywords](index.md)
4949
[C# Reference](../index.md)
50-
[C# Programming Guide](../../programming-guide/index.md)
50+
[C# Programming Guide](../../programming-guide/index.md)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following provides an overview of the kinds of members a class can contain.
4949

5050
## Accessibility
5151

52-
Each member of a class has an associated accessibility, which controls the regions of program text that are able to access the member. There are five possible forms of accessibility. These are summarized below.
52+
Each member of a class has an associated accessibility, which controls the regions of program text that are able to access the member. There are six possible forms of accessibility. These are summarized below.
5353

5454
* `public`
5555
- Access not limited
@@ -58,11 +58,11 @@ Each member of a class has an associated accessibility, which controls the regio
5858
* `internal`
5959
- Access limited to the current assembly (.exe, .dll, etc.)
6060
* `protected internal`
61-
- Access limited to the containing class or classes derived from the containing class
61+
- Access limited to the containing class, classes derived from the containing class, or classes within the same assembly
6262
* `private`
6363
- Access limited to this class
6464
* `private protected`
65-
- Access limited to the containing class or classes derived from the containing type within the same assembly
65+
- Access limited to the containing class or classes derived from the containing type within the same assembly
6666

6767
## Type parameters
6868

docs/framework/configure-apps/file-schema/network/defaultproxy-element-network-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Configures the Hypertext Transfer Protocol (HTTP) proxy server.
7676
bypassonlocal="true"
7777
/>
7878
<bypasslist>
79-
<add address="[a-z]+\.contoso\.com" />
79+
<add address="[a-z]+\.contoso\.com$" />
8080
</bypasslist>
8181
</defaultProxy>
8282
</system.net>

docs/framework/ui-automation/ui-automation-support-for-the-hyperlink-control-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ manager: "markl"
5454
|---------------------------------------|--------------------|-----------|
5555
|<xref:System.Windows.Automation.Provider.IInvokeProvider>|Yes|All hyperlink controls must support the Invoke pattern.|
5656
|<xref:System.Windows.Automation.Provider.IValueProvider>|Depends|Hyperlink controls should support the Value control pattern when the link contains information that is usable and meaningful to the user.|
57-
|<xref:System.Windows.Automation.Provider.IValueProvider.Value>|For example, "http://www...."|A URL for an Internet or Intranet address is an example of a hyperlink that contains information that is meaningful to the user. A programmatic link, however, is meaningful only to an application and is not recommended for the Value property.|
57+
|<xref:System.Windows.Automation.Provider.IValueProvider.Value>|For example, `"http://www...."`|A URL for an Internet or Intranet address is an example of a hyperlink that contains information that is meaningful to the user. A programmatic link, however, is meaningful only to an application and is not recommended for the Value property.|
5858

5959
<a name="Required_UI_Automation_Events"></a>
6060
## Required UI Automation Events

docs/framework/wcf/extending/configuration-and-metadata-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ if (transportBindingElement is UdpTransportBindingElement)
176176
The custom binding element can export policy assertions in the WSDL binding for a service endpoint to express the capabilities of that binding element. The following example code is taken from the [Transport: UDP](../../../../docs/framework/wcf/samples/transport-udp.md) sample.
177177

178178
#### Policy Export
179-
The `UdpTransportBindingElement` type implements``<xref:System.ServiceModel.Description.IPolicyExportExtension?displayProperty=nameWithType> to add support for exporting policy. As a result, <xref:System.ServiceModel.Description.MetadataExporter?displayProperty=nameWithType> includes `UdpTransportBindingElement` in the generation of policy for any binding that includes it.
179+
The `UdpTransportBindingElement` type implements <xref:System.ServiceModel.Description.IPolicyExportExtension?displayProperty=nameWithType> to add support for exporting policy. As a result, <xref:System.ServiceModel.Description.MetadataExporter?displayProperty=nameWithType> includes `UdpTransportBindingElement` in the generation of policy for any binding that includes it.
180180

181181
In <xref:System.ServiceModel.Description.IPolicyExportExtension.ExportPolicy%2A?displayProperty=nameWithType>, add an assertion for UDP and another assertion if the channel is in multicast mode. This is because multicast mode affects how the communication stack is constructed, and thus must be coordinated between both sides.
182182

0 commit comments

Comments
 (0)