Skip to content

Commit 594b398

Browse files
committed
remove references to .net framework 1.x where it makes sense
1 parent aca02aa commit 594b398

File tree

13 files changed

+875
-895
lines changed

13 files changed

+875
-895
lines changed

xml/System.Diagnostics/EventLog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
7676
There are three default event logs: Application, System, and Security. A Security log is read-only. Other applications and services you install, such as Active Directory, might have additional event logs.
7777
78-
There are security considerations when using the <xref:System.Diagnostics.EventLog> class. <xref:System.Diagnostics.EventLog> requires <xref:System.Diagnostics.EventLogPermission> permissions for specific actions in the .NET Framework 2.0 and later versions, or full trust in the .NET Framework 1.0 and 1.1. We recommend that <xref:System.Diagnostics.EventLogPermission> not be granted to partially trusted code. You should never pass any event log object, including <xref:System.Diagnostics.EventLogEntryCollection> and <xref:System.Diagnostics.EventLogEntry> objects, to less trusted code. For example, creating an <xref:System.Diagnostics.EventLog> object, writing an entry, and then passing the <xref:System.Diagnostics.EventLog> object to partially trusted code can create a security issue, because the ability to read and write to the event log allows code to perform actions such as issuing event log messages in the name of another application.
78+
There are security considerations when using the <xref:System.Diagnostics.EventLog> class. <xref:System.Diagnostics.EventLog> requires <xref:System.Diagnostics.EventLogPermission> permissions for specific actions in .NET Framework 2.0 and later versions. We recommend that <xref:System.Diagnostics.EventLogPermission> not be granted to partially trusted code. You should never pass any event log object, including <xref:System.Diagnostics.EventLogEntryCollection> and <xref:System.Diagnostics.EventLogEntry> objects, to less trusted code. For example, creating an <xref:System.Diagnostics.EventLog> object, writing an entry, and then passing the <xref:System.Diagnostics.EventLog> object to partially trusted code can create a security issue, because the ability to read and write to the event log allows code to perform actions such as issuing event log messages in the name of another application.
7979
8080
Starting with Windows Vista, User Account Control (UAC) determines the credentials of a user. If you are a member of the Built-in Administrators group, you are assigned two run-time access tokens: a standard user access token and an administrator access token. By default, you are in the standard user role. To run the code that accesses the Security log, you must first elevate your credentials from standard user to administrator. You can do this when you start an application by opening the shortcut menu for the application (if you're using a mouse, right-click the application icon) and indicating that you want to run as an administrator.
8181

xml/System.Text.RegularExpressions/Regex.xml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6374,12 +6374,9 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
63746374
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split2.cs" interactive="try-dotnet" id="Snippet2":::
63756375
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split2.vb" id="Snippet2":::
63766376

6377-
However, when the regular expression pattern includes multiple sets of capturing parentheses, the behavior of this method depends on the version of the .NET Framework. In the .NET Framework 1.0 and 1.1, if a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is not included in the returned array. Starting with the .NET Framework 2.0, all captured text is also added to the returned array. For example, the following code uses two sets of capturing parentheses to extract the elements of a date, including the date delimiters, from a date string. The first set of capturing parentheses captures the hyphen, and the second set captures the forward slash. If the example code is compiled and run under the .NET Framework 1.0 or 1.1, it excludes the slash characters; if it is compiled and run under the .NET Framework 2.0 or later versions, it includes them.
6377+
If the regular expression pattern includes multiple sets of capturing parentheses, and a match isn't found within the first set of capturing parentheses, captured text from additional capturing parentheses is included in the returned array.
63786378

6379-
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split3.cs" interactive="try-dotnet" id="Snippet3":::
6380-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split3.vb" id="Snippet3":::
6381-
6382-
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split(System.String)> will split the string into an array of single-character strings because the empty string delimiter can be found at every location. For example:
6379+
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split(System.String)> splits the string into an array of single-character strings because the empty string delimiter can be found at every location. For example:
63836380

63846381
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split11.cs" interactive="try-dotnet" id="Snippet11":::
63856382
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split11.vb" id="Snippet11":::
@@ -6460,7 +6457,7 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
64606457
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split4.cs" interactive="try-dotnet" id="Snippet4":::
64616458
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split4.vb" id="Snippet4":::
64626459

6463-
However, when the regular expression pattern includes multiple sets of capturing parentheses, the behavior of this method depends on the version of the .NET Framework. In the .NET Framework 1.0 and 1.1, only captured text from the first set of capturing parentheses is included in the returned array. Starting with the .NET Framework 2.0, all captured text is added to the returned array. However, elements in the returned array that contain captured text are not counted in determining whether the number of matched substrings equals `count`. For example, in the following code, a regular expression uses two sets of capturing parentheses to extract the elements of a date from a date string. The first set of capturing parentheses captures the hyphen, and the second set captures the forward slash. The call to the <xref:System.Text.RegularExpressions.Regex.Split(System.String,System.Int32)> method then specifies a maximum of two elements in the returned array. If the example code is compiled and run under the .NET Framework 1.0 or 1.1, the method returns a two-element string array. If it is compiled and run under the .NET Framework 2.0 or later versions, the method returns a three-element string array.
6460+
If the regular expression pattern includes multiple sets of capturing parentheses, and a match isn't found within the first set of capturing parentheses, captured text from additional capturing parentheses is included in the returned array. However, elements in the returned array that contain captured text are not counted in determining whether the number of matched substrings equals `count`. For example, in the following code, a regular expression uses two sets of capturing parentheses to extract the elements of a date from a date string. The first set of capturing parentheses captures the hyphen, and the second set captures the forward slash. The call to the <xref:System.Text.RegularExpressions.Regex.Split(System.String,System.Int32)> method then specifies a maximum of two elements in the returned array. The method returns a three-element string array.
64646461

64656462
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split5.cs" interactive="try-dotnet" id="Snippet5":::
64666463
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split5.vb" id="Snippet5":::
@@ -6560,10 +6557,7 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
65606557
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split9.cs" interactive="try-dotnet" id="Snippet9":::
65616558
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split9.vb" id="Snippet9":::
65626559

6563-
However, when the regular expression pattern includes multiple sets of capturing parentheses, the behavior of this method depends on the version of the .NET Framework. In the .NET Framework 1.0 and 1.1, if a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is not included in the returned array. Starting with the .NET Framework 2.0, all captured text is also added to the returned array. For example, the following code uses two sets of capturing parentheses to extract the elements of a date, including the date delimiters, from a date string. The first set of capturing parentheses captures the hyphen, and the second set captures the forward slash. If the example code is compiled and run under the .NET Framework 1.0 or 1.1, it excludes the slash characters; if it is compiled and run under the .NET Framework 2.0 or later versions, it includes them.
6564-
6565-
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split10.cs" interactive="try-dotnet" id="Snippet10":::
6566-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split10.vb" id="Snippet10":::
6560+
If the regular expression pattern includes multiple sets of capturing parentheses, and a match isn't found within the first set of capturing parentheses, captured text from additional capturing parentheses is included in the returned array.
65676561

65686562
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split%2A> will split the string into an array of single-character strings because the empty string delimiter can be found at every location. For example:
65696563

@@ -6656,12 +6650,9 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
66566650
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split6.cs" interactive="try-dotnet" id="Snippet6":::
66576651
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split6.vb" id="Snippet6":::
66586652

6659-
However, when the regular expression pattern includes multiple sets of capturing parentheses, the behavior of this method depends on the version of the .NET Framework. In .NET Framework 1.0 and 1.1, if a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is not included in the returned array. Starting with the .NET Framework 2.0, all captured text is also added to the returned array. For example, the following code uses two sets of capturing parentheses to extract the individual words in a string. The first set of capturing parentheses captures the hyphen, and the second set captures the vertical bar. If the example code is compiled and run under the .NET Framework 1.0 or 1.1, it excludes the vertical bar characters; if it is compiled and run under the .NET Framework 2.0 or later versions, it includes them.
6660-
6661-
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split7.cs" interactive="try-dotnet" id="Snippet7":::
6662-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split7.vb" id="Snippet7":::
6653+
However, when the regular expression pattern includes multiple sets of capturing parentheses and a match isn't found within the first set of capturing parentheses, captured text from additional capturing parentheses is included in the returned array.
66636654

6664-
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split%2A> will split the string into an array of single-character strings because the empty string delimiter can be found at every location. The following example splits the string "characters" into as many elements as the input string contains, starting with the character "a". Because the null string matches the end of the input string, a null string is inserted at the end of the returned array.
6655+
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split%2A> splits the string into an array of single-character strings because the empty string delimiter can be found at every location. The following example splits the string "characters" into as many elements as the input string contains, starting with the character "a". Because the null string matches the end of the input string, a null string is inserted at the end of the returned array.
66656656

66666657
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split14.cs" interactive="try-dotnet" id="Snippet14":::
66676658
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split14.vb" id="Snippet14":::
@@ -6758,10 +6749,7 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
67586749
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split9.cs" interactive="try-dotnet" id="Snippet9":::
67596750
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split9.vb" id="Snippet9":::
67606751

6761-
However, when the regular expression pattern includes multiple sets of capturing parentheses, the behavior of this method depends on the version of the .NET Framework. In the .NET Framework 1.0 and 1.1, if a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is not included in the returned array. Starting with the .NET Framework 2.0, all captured text is also added to the returned array. For example, the following code uses two sets of capturing parentheses to extract the elements of a date, including the date delimiters, from a date string. The first set of capturing parentheses captures the hyphen, and the second set captures the forward slash. If the example code is compiled and run under the .NET Framework 1.0 or 1.1, it excludes the slash characters; if it is compiled and run under the .NET Framework 2.0 or later versions, it includes them.
6762-
6763-
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split10.cs" interactive="try-dotnet" id="Snippet10":::
6764-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split10.vb" id="Snippet10":::
6752+
However, when the regular expression pattern includes multiple sets of capturing parentheses, and a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is included in the returned array.
67656753

67666754
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split%2A> will split the string into an array of single-character strings because the empty string delimiter can be found at every location.
67676755

@@ -6861,10 +6849,7 @@ For more details about `startat`, see the Remarks section of <xref:System.Text.R
68616849
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split9.cs" interactive="try-dotnet" id="Snippet9":::
68626850
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split9.vb" id="Snippet9":::
68636851

6864-
However, when the regular expression pattern includes multiple sets of capturing parentheses, the behavior of this method depends on the version of the .NET Framework. In the .NET Framework 1.0 and 1.1, if a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is not included in the returned array. Starting with the .NET Framework 2.0, all captured text is also added to the returned array. For example, the following code uses two sets of capturing parentheses to extract the elements of a date, including the date delimiters, from a date string. The first set of capturing parentheses captures the hyphen, and the second set captures the forward slash. If the example code is compiled and run under the .NET Framework 1.0 or 1.1, it excludes the slash characters; if it is compiled and run under the .NET Framework 2.0 or later versions, it includes them.
6865-
6866-
:::code language="csharp" source="~/snippets/csharp/System.Text.RegularExpressions/Regex/Split/split10.cs" interactive="try-dotnet" id="Snippet10":::
6867-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.Text.RegularExpressions.Regex.Split/vb/split10.vb" id="Snippet10":::
6852+
However, when the regular expression pattern includes multiple sets of capturing parentheses, and a match is not found within the first set of capturing parentheses, captured text from additional capturing parentheses is included in the returned array.
68686853

68696854
If the regular expression can match the empty string, <xref:System.Text.RegularExpressions.Regex.Split%2A> will split the string into an array of single-character strings because the empty string delimiter can be found at every location.
68706855

xml/System.Web.Configuration/TrustSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
156156
- Partial trust application domains revert to being full trust at the application domain level.
157157
158-
- The legacy partial trust files located in the CONFIG directory in the .NET Framework install directory are used instead of the new partial trust configuration files that are located in the same directory. The legacy files include the membership conditions that were found in the .NET Framework 1.1 or .NET Framework 2.0 SP1 versions of the .NET Framework.
158+
- The legacy partial trust files located in the CONFIG directory in the .NET Framework install directory are used instead of the new partial trust configuration files that are located in the same directory. The legacy files include the membership conditions that were found in .NET Framework 1.1 and .NET Framework 2.0 SP1.
159159
160160
- Additional membership conditions to evaluate permissions are applied, as defined in ASP.NET partial trust files. The CONFIG directory that ships with the .NET Framework 4 release contains legacy partial-trust policy files. The names of these files include the string "legacy" and contain the .NET Framework 2.0 SP1 sections. These sections contain non-empty membership conditions that are needed to evaluating CAS policy against assemblies.
161161

0 commit comments

Comments
 (0)