Skip to content

Merge master into live #4059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2020
Merged

Merge master into live #4059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b18d4e6
fix broken links (#4054)
mairaw Mar 31, 2020
a14c597
Grammar fix (#4053)
breyed Mar 31, 2020
9b3b5b3
Merge branch 'master' into publish-27932
cxwtool Apr 1, 2020
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
2 changes: 1 addition & 1 deletion xml/System.Threading/Thread.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ Main thread: ThreadProc.Join has returned. Press Enter to end program.
## Remarks

> [!IMPORTANT]
> The `Thread.Abort` method should be used with caution. Particularly when you call it to abort a thread other than the current thread, you do not know what code has executed or failed to execute when the <xref:System.Threading.ThreadAbortException> is thrown, nor can you be certain of the state of your application or any application and user state that it is responsible for preserving. For example, calling `Thread.Abort` may prevent static constructors from executing or prevent the release of unmanaged resources
> The `Thread.Abort` method should be used with caution. Particularly when you call it to abort a thread other than the current thread, you do not know what code has executed or failed to execute when the <xref:System.Threading.ThreadAbortException> is thrown, nor can you be certain of the state of your application or any application and user state that it is responsible for preserving. For example, calling `Thread.Abort` may prevent static constructors from executing or prevent the release of unmanaged resources.

]]></format>
</remarks>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Web/SiteMap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<altmember cref="T:System.Web.UI.WebControls.TreeView" />
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/e468hxky(v=vs.100)">ASP.NET Site Navigation Overview</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/yy2ykkab(v=vs.100)">ASP.NET Site Maps</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)5">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)">ASP.NET Site Navigation Providers</related>
</Docs>
<Members>
<Member MemberName="CurrentNode">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Web/SiteMapProvider.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ catalog.aspx,Online Catalog,Browse Our Many Great Items!,default.aspx
<altmember cref="T:System.Web.XmlSiteMapProvider" />
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/e468hxky(v=vs.100)">ASP.NET Site Navigation Overview</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/yy2ykkab(v=vs.100)">ASP.NET Site Maps</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)5">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/ms227425(v=vs.100)">Securing ASP.NET Site Navigation</related>
<related type="Article" href="~/docs/framework/app-domains/working-with-assemblies-and-the-gac.md">Working with Assemblies and the Global Assembly Cache</related>
</Docs>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Web/SiteMapProviderCollection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ AccessSiteMapProvider Samples.AspNet.Controls.AccessSiteMapProvider
</remarks>
<altmember cref="T:System.Collections.Hashtable" />
<altmember cref="P:System.Web.SiteMap.Providers" />
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)5">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)">ASP.NET Site Navigation Providers</related>
</Docs>
<Members>
<Member MemberName=".ctor">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Web/StaticSiteMapProvider.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ NODEID URL NAME PARENTNODEID
<altmember cref="T:System.Web.SiteMap" />
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/e468hxky(v=vs.100)">ASP.NET Site Navigation Overview</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/yy2ykkab(v=vs.100)">ASP.NET Site Maps</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)5">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)">ASP.NET Site Navigation Providers</related>
</Docs>
<Members>
<Member MemberName=".ctor">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Web/XmlSiteMapProvider.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<altmember cref="T:System.Web.StaticSiteMapProvider" />
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/e468hxky(v=vs.100)">ASP.NET Site Navigation Overview</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/yy2ykkab(v=vs.100)">ASP.NET Site Maps</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)5">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/4ht3k9tx(v=vs.100)">ASP.NET Site Navigation Providers</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/ms178418(v=vs.100)">How to: Add Simple Site Navigation</related>
<related type="Article" href="https://docs.microsoft.com/previous-versions/aspnet/ms227425(v=vs.100)">Securing ASP.NET Site Navigation</related>
</Docs>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Windows/FrameworkElement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@
[!code-csharp[CustomControlNumericUpDown#StaticCtorOfCustomClassCommonTasks](~/samples/snippets/csharp/VS_Snippets_Wpf/CustomControlNumericUpDown/CSharp/CustomControlLibrary/NumericUpDown2.cs)]
[!code-vb[CustomControlNumericUpDown#StaticCtorOfCustomClassCommonTasks](~/samples/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDown/visualbasic/customcontrollibrary/numericupdown2.vb)]

The complete source code for this example is available on GitHub for both [C#](https://github.com/dotnet/samples/tree/master/snippets/csharp/VS_Snippets_Wpf/CustomControlNumericUpDown/CSharp/CustomControlLibrary) and [Visual Basic](https://github.com/dotnet/samples/tree/master/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDown/visualbasic/customcontrollibrary).
The complete source code for this example is available on GitHub for both [C#](https://github.com/dotnet/dotnet-api-docs/tree/master/samples/snippets/csharp/VS_Snippets_Wpf/CustomControlNumericUpDown/CSharp/CustomControlLibrary) and [Visual Basic](https://github.com/dotnet/dotnet-api-docs/tree/master/samples/snippets/visualbasic/VS_Snippets_Wpf/CustomControlNumericUpDown/visualbasic/customcontrollibrary).

]]></format>
</remarks>
Expand Down
4 changes: 2 additions & 2 deletions xml/System/DateTime.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Time values are measured in 100-nanosecond units called ticks. A particular date
> [!NOTE]
> If you are working with a ticks value that you want to convert to some other time interval, such as minutes or seconds, you should use the <xref:System.TimeSpan.TicksPerDay?displayProperty=nameWithType>, <xref:System.TimeSpan.TicksPerHour?displayProperty=nameWithType>, <xref:System.TimeSpan.TicksPerMinute?displayProperty=nameWithType>, <xref:System.TimeSpan.TicksPerSecond?displayProperty=nameWithType>, or <xref:System.TimeSpan.TicksPerMillisecond?displayProperty=nameWithType> constant to perform the conversion. For example, to add the number of seconds represented by a specified number of ticks to the <xref:System.DateTime.Second%2A> component of a <xref:System.DateTime> value, you can use the expression `dateValue.Second + nTicks/Timespan.TicksPerSecond`.

You can view the source for the entire set of examples from this article in either [Visual Basic](https://github.com/dotnet/samples/tree/master/snippets/visualbasic/System.DateTime/) or [C#](https://github.com/dotnet/samples/tree/master/snippets/csharp/System.DateTime/) from the docs repository on GitHub.
You can view the source for the entire set of examples from this article in either [Visual Basic](https://github.com/dotnet/dotnet-api-docs/tree/master/samples/snippets/visualbasic/System.DateTime/) or [C#](https://github.com/dotnet/dotnet-api-docs/tree/master/samples/snippets/csharp/System.DateTime/) from the docs repository on GitHub.

> [!NOTE]
> An alternative to the <xref:System.DateTime> structure for working with date and time values in particular time zones is the <xref:System.DateTimeOffset> structure. The <xref:System.DateTimeOffset> structure stores date and time information in a private <xref:System.DateTime> field and the number of minutes by which that date and time differs from UTC in a private <xref:System.Int16> field. This makes it possible for a <xref:System.DateTimeOffset> value to reflect the time in a particular time zone, whereas a <xref:System.DateTime> value can unambiguously reflect only UTC and the local time zone's time. For a discussion about when to use the <xref:System.DateTime> structure or the <xref:System.DateTimeOffset> structure when working with date and time values, see [Choosing Between DateTime, DateTimeOffset, TimeSpan, and TimeZoneInfo](~/docs/standard/datetime/choosing-between-datetime.md).
Expand Down Expand Up @@ -457,7 +457,7 @@ The previous examples all assumed that <xref:System.DateTime> values are express
[!code-vb[System.DateTime.Persistence#6](~/samples/snippets/visualbasic/System.DateTime/DateWithTimeZone.vb#6)]

> [!IMPORTANT]
> The `DateWithTimeZone` structure is used in the next two examples, which serialize and deserialize an array of `DateWithTimeZone` objects. You can view the source for the entire set of examples from this article in either [Visual Basic](https://github.com/dotnet/samples/tree/master/snippets/visualbasic/System.DateTime/) or [C#](https://github.com/dotnet/samples/tree/master/snippets/csharp/System.DateTime/) from the docs repository on GitHub.
> The `DateWithTimeZone` structure is used in the next two examples, which serialize and deserialize an array of `DateWithTimeZone` objects. You can view the source for the entire set of examples from this article in either [Visual Basic](https://github.com/dotnet/dotnet-api-docs/tree/master/samples/snippets/visualbasic/System.DateTime/) or [C#](https://github.com/dotnet/dotnet-api-docs/tree/master/samples/snippets/csharp/System.DateTime/) from the docs repository on GitHub.

By using the `DateWithTimeZone` structure, you can then persist date and time along with time zone information. The following example uses the <xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter> class to serialize an array of `DateWithTimeZone` objects.

Expand Down