Skip to content

Commit e8b8756

Browse files
committed
Merge branch 'master' into publish-9778
2 parents 850e534 + 268771a commit e8b8756

File tree

3,459 files changed

+27362
-27361
lines changed

Some content is hidden

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

3,459 files changed

+27362
-27361
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"xref_query_tags": ["/uwp/api"],
99
"monikers": [],
1010
"moniker_ranges": [],
11-
"filemap_share_depots": ["VS.core-docs"],
1211
"open_to_public_contributors": true,
1312
"type_mapping": {
1413
"Conceptual": "Content",

includes/calendar-era.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22
> [!IMPORTANT]
3-
> Eras in the Japanese calendars are based on the emperor's reign and are therefore expected to change. For example, May 1, 2019 marked the beginning of the Reiwa era in the <xref:System.Globalization.JapaneseCalendar> and <xref:System.Globalization.JapaneseLunisolarCalendar>. Such a change of era affects all applications that use these calendars. See [Handling a new era in the Japanese calendar in .NET](https://devblogs.microsoft.com/dotnet/handling-a-new-era-in-the-japanese-calendar-in-net/) for more information and to determine whether your applications are affected. See [Prepare your application for the Japanese era change](/windows/uwp/design/globalizing/japanese-era-change) for information on testing your applications on Windows systems to ensure their readiness for the era change. See [Working with eras](~/docs/standard/datetime/working-with-calendars.md#working-with-eras) for features in .NET that support calendars with multiple eras and for best practices when working with calendars that support multiple eras.
3+
> Eras in the Japanese calendars are based on the emperor's reign and are therefore expected to change. For example, May 1, 2019 marked the beginning of the Reiwa era in the <xref:System.Globalization.JapaneseCalendar> and <xref:System.Globalization.JapaneseLunisolarCalendar>. Such a change of era affects all applications that use these calendars. See [Handling a new era in the Japanese calendar in .NET](https://devblogs.microsoft.com/dotnet/handling-a-new-era-in-the-japanese-calendar-in-net/) for more information and to determine whether your applications are affected. See [Prepare your application for the Japanese era change](/windows/uwp/design/globalizing/japanese-era-change) for information on testing your applications on Windows systems to ensure their readiness for the era change. See [Working with eras](/dotnet/standard/datetime/working-with-calendars#working-with-eras) for features in .NET that support calendars with multiple eras and for best practices when working with calendars that support multiple eras.

includes/interpolated-strings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22
> [!IMPORTANT]
3-
> Instead of calling the **String.Format** method or using [composite format strings](~/docs/standard/base-types/composite-formatting.md), you can use *interpolated strings* if your language supports them. An interpolated string is a string that contains *interpolated expressions*. Each interpolated expression is resolved with the expression's value and included in the result string when the string is assigned. For more information, see [String interpolation (C# Reference)](~/docs/csharp/language-reference/tokens/interpolated.md) and [Interpolated Strings (Visual Basic Reference)](~/docs/visual-basic/programming-guide/language-features/strings/interpolated-strings.md).
3+
> Instead of calling the **String.Format** method or using [composite format strings](/dotnet/standard/base-types/composite-formatting), you can use *interpolated strings* if your language supports them. An interpolated string is a string that contains *interpolated expressions*. Each interpolated expression is resolved with the expression's value and included in the result string when the string is assigned. For more information, see [String interpolation (C# Reference)](/dotnet/csharp/language-reference/tokens/interpolated) and [Interpolated Strings (Visual Basic Reference)](/dotnet/visual-basic/programming-guide/language-features/strings/interpolated-strings).

includes/provider-string-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
However, when calling the **String.Format** method, it is not necessary to focus on the particular overload that you want to call. Instead, you can call the method with an object that provides culture-sensitive or custom formatting and a [composite format string](~/docs/standard/base-types/composite-formatting.md) that includes one or more format items. You assign each format item a numeric index; the first index starts at 0. In addition to the initial string, your method call should have as many additional arguments as it has index values. For example, a string whose format items have indexes of 0 and 1 should have 2 arguments; one with indexes 0 through 5 should have 6 arguments. Your language compiler will then resolve your method call to a particular overload of the **String.Format** method.
2+
However, when calling the **String.Format** method, it is not necessary to focus on the particular overload that you want to call. Instead, you can call the method with an object that provides culture-sensitive or custom formatting and a [composite format string](/dotnet/standard/base-types/composite-formatting) that includes one or more format items. You assign each format item a numeric index; the first index starts at 0. In addition to the initial string, your method call should have as many additional arguments as it has index values. For example, a string whose format items have indexes of 0 and 1 should have 2 arguments; one with indexes 0 through 5 should have 6 arguments. Your language compiler will then resolve your method call to a particular overload of the **String.Format** method.
33

44
For more detailed documentation on using the **String.Format** method, see [Getting started with the String.Format method](#Starting) and [Which method do I call?](#FTaskList).

includes/simple-string-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
However, when calling the **String.Format** method, it is not necessary to focus on the particular overload that you want to call. Instead, you can call the method with a [composite format string](~/docs/standard/base-types/composite-formatting.md) that includes one or more format items. You assign each format item a numeric index; the first index starts at 0. In addition to the initial string, your method call should have as many additional arguments as it has index values. For example, a string whose format items have indexes of 0 and 1 should have 2 arguments; one with indexes 0 through 5 should have 6 arguments. Your language compiler will then resolve your method call to a particular overload of the **String.Format** method.
2+
However, when calling the **String.Format** method, it is not necessary to focus on the particular overload that you want to call. Instead, you can call the method with a [composite format string](/dotnet/standard/base-types/composite-formatting) that includes one or more format items. You assign each format item a numeric index; the first index starts at 0. In addition to the initial string, your method call should have as many additional arguments as it has index values. For example, a string whose format items have indexes of 0 and 1 should have 2 arguments; one with indexes 0 through 5 should have 6 arguments. Your language compiler will then resolve your method call to a particular overload of the **String.Format** method.
33

44
For more detailed documentation on using the **String.Format** method, see [Getting started with the String.Format method](#Starting) and [Which method do I call?](#FTaskList).

includes/thread-formatting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
For more information about the current thread culture, see the <xref:System.Globalization.CultureInfo.CurrentCulture?displayProperty=nameWithType> and <xref:System.Threading.Thread.CurrentCulture%2A?displayProperty=nameWithType> properties. For more information about format characters, format patterns, and the output they produce, see [Standard date and time format strings](~/docs/standard/base-types/standard-date-and-time-format-strings.md) and [Custom date and time format strings](~/docs/standard/base-types/custom-date-and-time-format-strings.md). For more information about changing the format pattern associated with a format character, see the <xref:System.Globalization.DateTimeFormatInfo> class.
2+
For more information about the current thread culture, see the <xref:System.Globalization.CultureInfo.CurrentCulture?displayProperty=nameWithType> and <xref:System.Threading.Thread.CurrentCulture%2A?displayProperty=nameWithType> properties. For more information about format characters, format patterns, and the output they produce, see [Standard date and time format strings](/dotnet/standard/base-types/standard-date-and-time-format-strings) and [Custom date and time format strings](/dotnet/standard/base-types/custom-date-and-time-format-strings). For more information about changing the format pattern associated with a format character, see the <xref:System.Globalization.DateTimeFormatInfo> class.

includes/tpl-install-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
> [!NOTE]
2-
> The TPL Dataflow Library (the <xref:System.Threading.Tasks.Dataflow> namespace) is not distributed with .NET. To install the <xref:System.Threading.Tasks.Dataflow> namespace in Visual Studio, open your project, choose **Manage NuGet Packages** from the **Project** menu, and search online for the `System.Threading.Tasks.Dataflow` package. Alternatively, to install it using [the .NET Core CLI](~/docs/core/tools/index.md), run `dotnet add package System.Threading.Tasks.Dataflow`.
2+
> The TPL Dataflow Library (the <xref:System.Threading.Tasks.Dataflow> namespace) is not distributed with .NET. To install the <xref:System.Threading.Tasks.Dataflow> namespace in Visual Studio, open your project, choose **Manage NuGet Packages** from the **Project** menu, and search online for the `System.Threading.Tasks.Dataflow` package. Alternatively, to install it using [the .NET Core CLI](/dotnet/core/tools/), run `dotnet add package System.Threading.Tasks.Dataflow`.

includes/visual-property-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
> [!NOTE]
2-
> Setting a visual property only has an effect if that property is both present in the control's default template and is set by using a [TemplateBinding](~/docs/framework/wpf/advanced/templatebinding-markup-extension.md). You can find a list of visual properties in the [Changing the Visual Structure of a Control](~/docs/framework/wpf/controls/customizing-the-appearance-of-an-existing-control.md#changing-the-visual-structure-of-a-control) section in the [Customizing the Appearance of an Existing Control by Creating a ControlTemplate](~/docs/framework/wpf/controls/customizing-the-appearance-of-an-existing-control.md) article.
2+
> Setting a visual property only has an effect if that property is both present in the control's default template and is set by using a [TemplateBinding](/dotnet/framework/wpf/advanced/templatebinding-markup-extension). You can find a list of visual properties in the [Changing the Visual Structure of a Control](/dotnet/framework/wpf/controls/customizing-the-appearance-of-an-existing-control#changing-the-visual-structure-of-a-control) section in the [Customizing the Appearance of an Existing Control by Creating a ControlTemplate](/dotnet/framework/wpf/controls/customizing-the-appearance-of-an-existing-control) article.
33

xml/Microsoft.Build.BuildEngine/InvalidToolsetDefinitionException.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@
134134
<format type="text/markdown"><![CDATA[
135135
136136
## Remarks
137-
This constructor is called during deserialization to reconstitute the exception object transmitted over a stream. For more information, see [XML and SOAP Serialization](~/docs/standard/serialization/xml-and-soap-serialization.md).
137+
This constructor is called during deserialization to reconstitute the exception object transmitted over a stream. For more information, see [XML and SOAP Serialization](/dotnet/standard/serialization/xml-and-soap-serialization).
138138
139139
]]></format>
140140
</remarks>
141-
<related type="Article" href="~/docs/standard/serialization/xml-and-soap-serialization.md">XML and SOAP Serialization</related>
141+
<related type="Article" href="/dotnet/standard/serialization/xml-and-soap-serialization">XML and SOAP Serialization</related>
142142
</Docs>
143143
</Member>
144144
<Member MemberName=".ctor">
@@ -182,7 +182,7 @@
182182
183183
]]></format>
184184
</remarks>
185-
<related type="Article" href="~/docs/standard/exceptions/index.md">Handling and Throwing Exceptions</related>
185+
<related type="Article" href="/dotnet/standard/exceptions/">Handling and Throwing Exceptions</related>
186186
</Docs>
187187
</Member>
188188
<Member MemberName=".ctor">
@@ -300,7 +300,7 @@
300300
<format type="text/markdown"><![CDATA[
301301
302302
## Remarks
303-
This constructor is called during deserialization to reconstitute the exception object transmitted over a stream. For more information, see [XML and SOAP Serialization](~/docs/standard/serialization/xml-and-soap-serialization.md).
303+
This constructor is called during deserialization to reconstitute the exception object transmitted over a stream. For more information, see [XML and SOAP Serialization](/dotnet/standard/serialization/xml-and-soap-serialization).
304304
305305
]]></format>
306306
</remarks>

xml/Microsoft.Build.Debugging/DebuggerManager+IslandThread.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
## Remarks
7979
Call `Dispose` when you are finished using the <xref:Microsoft.Build.Debugging.DebuggerManager.IslandThread>. After calling `Dispose`, you must release all references to the <xref:Microsoft.Build.Debugging.DebuggerManager.IslandThread> so the garbage collector can reclaim the memory that it was using.
8080
81-
For more information, see [Cleaning Up Unmanaged Resources](~/docs/standard/garbage-collection/unmanaged.md) and [Implementing a Dispose Method](~/docs/standard/garbage-collection/implementing-dispose.md).
81+
For more information, see [Cleaning Up Unmanaged Resources](/dotnet/standard/garbage-collection/unmanaged) and [Implementing a Dispose Method](/dotnet/standard/garbage-collection/implementing-dispose).
8282
8383
> [!NOTE]
8484
> Always call `Dispose` before you release your last reference to the <xref:Microsoft.Build.Debugging.DebuggerManager.IslandThread>. Otherwise, the resources it is using will not be freed until the garbage collector calls the <xref:Microsoft.Build.Debugging.DebuggerManager.IslandThread> object's `Finalize` method.

0 commit comments

Comments
 (0)