From bdb891882c564f8e1162414edde350e8d06c306c Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Fri, 29 May 2026 14:46:29 -0700 Subject: [PATCH 1/2] Remove .NET Framework remarks --- xml/System.Numerics/Complex.xml | 8 ++-- xml/System.Printing/PrintQueue.xml | 1 - xml/System.Printing/PrintSystemJobInfo.xml | 9 +--- .../StronglyTypedResourceBuilder.xml | 4 +- .../MissingSatelliteAssemblyException.xml | 2 +- xml/System.Resources/ResXResourceReader.xml | 7 +-- xml/System.Resources/ResXResourceWriter.xml | 44 ++++--------------- xml/System.Resources/ResourceManager.xml | 2 +- xml/System.Resources/ResourceReader.xml | 2 +- xml/System.Resources/ResourceWriter.xml | 13 ++---- xml/System.ServiceProcess/ServiceBase.xml | 6 +-- .../ServiceControllerPermissionAttribute.xml | 6 +-- .../ServiceControllerPermissionEntry.xml | 21 +++------ .../SpeechHypothesizedEventArgs.xml | 2 +- xml/System.Timers/Timer.xml | 5 +-- .../DependentTransaction.xml | 9 ++-- .../DistributedTransactionPermission.xml | 2 - .../EnterpriseServicesInteropOption.xml | 3 +- xml/System.Transactions/TransactionScope.xml | 12 ++--- 19 files changed, 43 insertions(+), 115 deletions(-) diff --git a/xml/System.Numerics/Complex.xml b/xml/System.Numerics/Complex.xml index e3cd20ac386..fb9528666ac 100644 --- a/xml/System.Numerics/Complex.xml +++ b/xml/System.Numerics/Complex.xml @@ -6844,7 +6844,7 @@ Languages that support custom operators can use the ` (or `(a, b)` in .NET Framework), where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the general format specifier ("G") and the conventions of the current system culture. + The default string representation of a complex number displays the number using its Cartesian coordinates in the form `` where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the general format specifier ("G") and the conventions of the current system culture. ## Examples The following example displays the string representation of several complex numbers. The output uses the formatting conventions of the English - United States ("en-US") culture, which, in this case, is the current system culture. @@ -6911,7 +6911,7 @@ Languages that support custom operators can use the ` (or `(a, b)` in .NET Framework), where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the general format specifier ("G") and the conventions of the culture defined by `provider`. + The string representation of the complex number returned by this method displays the number using its Cartesian coordinates in the form `` where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the general format specifier ("G") and the conventions of the culture defined by `provider`. The `provider` parameter is an implementation. Its method returns a object that provides culture-specific information about the format of the real and imaginary numbers in the returned string. If `provider` is `null`, the returned string is formatted using the object of the current culture. @@ -6990,7 +6990,7 @@ Languages that support custom operators can use the ` (or `(a, b)` in .NET Framework), where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the format string specified by `format`. The `format` parameter can be any valid standard numeric format specifier, or any combination of custom numeric format specifiers. If `format` is equal to or is `null`, the real and imaginary parts of the complex number are formatted with the general format specifier ("G"). If `format` is any other value, the method throws a . + The string representation of the complex number returned by this method displays the number using its Cartesian coordinates in the form `` where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the format string specified by `format`. The `format` parameter can be any valid standard numeric format specifier, or any combination of custom numeric format specifiers. If `format` is equal to or is `null`, the real and imaginary parts of the complex number are formatted with the general format specifier ("G"). If `format` is any other value, the method throws a . .NET provides extensive formatting support, which is described in greater detail in the following articles: @@ -7079,7 +7079,7 @@ Languages that support custom operators can use the ` (or `(a, b)` in .NET Framework), where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the format string specified by `format`. The `format` parameter can be any valid standard numeric format specifier, or any combination of custom numeric format specifiers. If `format` is equal to or is `null`, the real and imaginary parts of the complex number are formatted with the general format specifier ("G"). If `format` is any other value, the method throws a . + The string representation of the complex number returned by this method displays the number using its Cartesian coordinates in the form `` where *a* is the real part of the complex number, and *b* is its imaginary part. Both *a* and *b* are formatted using the format string specified by `format`. The `format` parameter can be any valid standard numeric format specifier, or any combination of custom numeric format specifiers. If `format` is equal to or is `null`, the real and imaginary parts of the complex number are formatted with the general format specifier ("G"). If `format` is any other value, the method throws a . .NET provides extensive formatting support, which is described in greater detail in the following articles: diff --git a/xml/System.Printing/PrintQueue.xml b/xml/System.Printing/PrintQueue.xml index 09bb380e384..c86d1e33a8d 100644 --- a/xml/System.Printing/PrintQueue.xml +++ b/xml/System.Printing/PrintQueue.xml @@ -601,7 +601,6 @@ - Exposing COM Components to the .NET Framework diff --git a/xml/System.Printing/PrintSystemJobInfo.xml b/xml/System.Printing/PrintSystemJobInfo.xml index 852576c4494..7a366bd119a 100644 --- a/xml/System.Printing/PrintSystemJobInfo.xml +++ b/xml/System.Printing/PrintSystemJobInfo.xml @@ -1021,14 +1021,7 @@ Gets a reference to the of the print job. A that contains the print job. - - - + Data written to this stream must be in XPS format as a package stream. diff --git a/xml/System.Resources.Tools/StronglyTypedResourceBuilder.xml b/xml/System.Resources.Tools/StronglyTypedResourceBuilder.xml index 9495ec7ebc8..0bece3d5e5d 100644 --- a/xml/System.Resources.Tools/StronglyTypedResourceBuilder.xml +++ b/xml/System.Resources.Tools/StronglyTypedResourceBuilder.xml @@ -41,14 +41,12 @@ class, which contains methods that provide access to culture-specific resources at run time. For more information about creating and consuming resources, see [Resources in Desktop Apps](/dotnet/framework/resources/). + Typically, resources separate code from content within an application. Creating and consuming these resources makes it easier to develop localizable applications. In .NET, resources are usually consumed by using the class, which contains methods that provide access to culture-specific resources at run time. For more information about creating and consuming resources, see [Resources in .NET apps](/dotnet/core/extensions/resources). Strongly typed resource support is a compile-time feature that encapsulates access to resources by creating classes that contain a set of static, read-only (`get`) properties. This provides an alternative way to consume resources instead of calling the and methods. The basic functionality for strongly typed resource support is provided by the class (as well as the `/str` command-line option in the [Resgen.exe (Resource File Generator)](/dotnet/framework/tools/resgen-exe-resource-file-generator)). The output of the method is a class that contains strongly typed properties that match the resources that are referenced in the input parameter. This class provides read-only access to the resources that are available in the file processed. - - ## Examples The following example generates a class named `DemoResources` that is written in C# or Visual Basic (depending on the example's source code). This class is in the `DemoApp` namespace and has properties that return the bitmap of a logo and the name of an application. The example calls a `CreateResourceFile` method to create the necessary .resw file and requires that a bitmap file named Logo.bmp be found in the example's current directory. The code example uses the following resource file, named demo.resx: diff --git a/xml/System.Resources/MissingSatelliteAssemblyException.xml b/xml/System.Resources/MissingSatelliteAssemblyException.xml index 4b30bf88f54..6b5e6b0417f 100644 --- a/xml/System.Resources/MissingSatelliteAssemblyException.xml +++ b/xml/System.Resources/MissingSatelliteAssemblyException.xml @@ -64,7 +64,7 @@ is thrown if the resource manager tries to retrieve but cannot find a resource for the default culture. However, the .NET Framework will load the resources for an app's default culture from a satellite assembly if the attribute specifies a value of for the location parameter. When this is the case, the exception is thrown when the resource manager tries to retrieve a resource of the default culture and the satellite assembly for the culture specified in the attribute is missing. Note that the exception is thrown by a resource retrieval method such as or , and not when the object is instantiated. + The default culture is the culture whose resources are loaded if the appropriate culture-specific resources cannot be found. By default, resources for the default culture are located in the main assembly, and a is thrown if the resource manager tries to retrieve but cannot find a resource for the default culture. However, .NET will load the resources for an app's default culture from a satellite assembly if the attribute specifies a value of for the location parameter. When this is the case, the exception is thrown when the resource manager tries to retrieve a resource of the default culture and the satellite assembly for the culture specified in the attribute is missing. Note that the exception is thrown by a resource retrieval method such as or , and not when the object is instantiated. uses the HRESULT COR_E_MISSINGSATELLITEASSEMBLY, which has the value 0x80131536. diff --git a/xml/System.Resources/ResXResourceReader.xml b/xml/System.Resources/ResXResourceReader.xml index 8cb488258d9..fe43b0b0af7 100644 --- a/xml/System.Resources/ResXResourceReader.xml +++ b/xml/System.Resources/ResXResourceReader.xml @@ -75,11 +75,6 @@ If you want to retrieve named resources from a .resx file rather than enumerating its resources, you can instantiate a object and call its `GetString` and `GetObject` methods. -> [!NOTE] -> The class contains a link demand and an inheritance demand at the class level that applies to all members. A exception is thrown when either the immediate caller or the derived class does not have full-trust permission. - - - ## Examples The following example demonstrates how to use a to iterate through the resources in a .resx file. First, the `rsxr` is created for the file `items.resx`. Next, the method is used to create an to iterate through the resources and display the contents to the console. @@ -439,7 +434,7 @@ :::code language="csharp" source="~/snippets/csharp/System.Resources/ResXResourceReader/BasePath/basepathex1.cs" id="Snippet1"::: :::code language="vb" source="~/snippets/visualbasic/System.Resources/ResXResourceReader/BasePath/basepathex1.vb" id="Snippet1"::: - Note that you must add a reference to System.Drawing.dll to compile the project successfully. The example also requires that the necessary images exist in a directory named C:\data\images\\. +The example requires that the necessary images exist in a directory named C:\data\images\\. ]]> diff --git a/xml/System.Resources/ResXResourceWriter.xml b/xml/System.Resources/ResXResourceWriter.xml index e0d417cf558..a1a35bf08ee 100644 --- a/xml/System.Resources/ResXResourceWriter.xml +++ b/xml/System.Resources/ResXResourceWriter.xml @@ -51,11 +51,6 @@ For more information on the format of a.resx file, see [Working with .resx Files Programmatically](/dotnet/framework/resources/working-with-resx-files-programmatically). -> [!NOTE] -> This class contains a link demand and an inheritance demand at the class level that applies to all members. A is thrown when either the immediate caller or the derived class does not have full-trust permission. - - - ## Examples The following example creates a .resx file named `CarResources.resx` that stores six strings, an icon, and two application-defined objects (two `Automobile` objects). Note that the `Automobile` class, which is defined and instantiated in the example, is tagged with the attribute. @@ -210,16 +205,9 @@ The stream to send the output to. - The delegate that is used to target earlier versions of the .NET Framework. - Initializes a new instance of the class that writes the resources to a specified stream object and sets a converter delegate. This delegate enables resource assemblies to be written that target versions of the .NET Framework before .NET Framework 4 by using qualified assembly names. - - - + The delegate that is used to target earlier versions of .NET Framework. + Initializes a new instance of the class that writes the resources to a specified stream object and sets a converter delegate. This delegate enables resource assemblies to be written that target versions of .NET Framework before .NET Framework 4 by using qualified assembly names. + To be added. @@ -255,16 +243,9 @@ The object to send output to. - The delegate that is used to target earlier versions of the .NET Framework. - Initializes a new instance of the class that writes the resources to a specified object and sets a delegate that enables resource assemblies to be written that target versions of the .NET Framework before .NET Framework 4 by using qualified assembly names. - - - + The delegate that is used to target earlier versions of .NET Framework. + Initializes a new instance of the class that writes the resources to a specified object and sets a delegate that enables resource assemblies to be written that target versions of .NET Framework before .NET Framework 4 by using qualified assembly names. + To be added. @@ -300,16 +281,9 @@ The file to send output to. - The delegate that is used to target earlier versions of the .NET Framework. - Initializes a new instance of the class that writes the resources to a specified file and sets a delegate that enables resource assemblies to be written that target versions of the .NET Framework before .NET Framework 4 by using qualified assembly names. - - - + The delegate that is used to target earlier versions of .NET Framework. + Initializes a new instance of the class that writes the resources to a specified file and sets a delegate that enables resource assemblies to be written that target versions of .NET Framework before .NET Framework 4 by using qualified assembly names. + To be added. The directory specified in does not exist. diff --git a/xml/System.Resources/ResourceManager.xml b/xml/System.Resources/ResourceManager.xml index 06646c852d4..b774fd550ec 100644 --- a/xml/System.Resources/ResourceManager.xml +++ b/xml/System.Resources/ResourceManager.xml @@ -1617,7 +1617,7 @@ csc GetStream.cs /resource:AppResources.resources This method will shrink the working set in a running app. Any future resource lookups on this object will be as expensive as the first lookup, because the resource manager will have to search and load resources again. This can be useful in some complex threading scenarios, where creating a new object is the appropriate behavior. > [!NOTE] -> Starting with the .NET Framework version 2.0, the method is not thread safe with respect to , , and operations. The advantage of this change is a performance improvement for multiple threads that access resources. However, if you call the method in one thread while simultaneously getting a resource in another thread, the get operation can throw an exception. +> The method is not thread safe with respect to , , and operations. The advantage of this change is a performance improvement for multiple threads that access resources. However, if you call the method in one thread while simultaneously getting a resource in another thread, the get operation can throw an exception. You can also use this method in situations where the managed instances for the resources created by the current resource manager have to be released deterministically, without waiting for the resource manager to go completely out of scope and be garbage collected. diff --git a/xml/System.Resources/ResourceReader.xml b/xml/System.Resources/ResourceReader.xml index 2c5f8ffd5d9..a43419950e2 100644 --- a/xml/System.Resources/ResourceReader.xml +++ b/xml/System.Resources/ResourceReader.xml @@ -596,7 +596,7 @@ Label11="Mobile Phone:" `resourceType` is a string that represents the data type of the resource. It can be any of the following values: -- The string representation of a `ResourceTypeCode` enumeration member that indicates the data type of the resource. `ResourceTypeCode` is a private enumeration that is used by .to indicate that a special binary format is used to store one of 19 common data types. These include the .NET Framework primitive data types (, , , , , , , , , , , , ), as well as , , and , In addition, the `ResourceTypeCode` enumeration includes the values shown in the following table. +- The string representation of a `ResourceTypeCode` enumeration member that indicates the data type of the resource. `ResourceTypeCode` is a private enumeration that is used by .to indicate that a special binary format is used to store one of 19 common data types. These include the .NET primitive data types (, , , , , , , , , , , , ), as well as , , and , In addition, the `ResourceTypeCode` enumeration includes the values shown in the following table. |ResourceTypeCode value|Description| |----------------------------|-----------------| diff --git a/xml/System.Resources/ResourceWriter.xml b/xml/System.Resources/ResourceWriter.xml index e1b792c041f..1b0e1155672 100644 --- a/xml/System.Resources/ResourceWriter.xml +++ b/xml/System.Resources/ResourceWriter.xml @@ -696,7 +696,7 @@ `typeName` is a string that represents the data type of the resource. It can be any of the following values: -- The string representation of a `ResourceTypeCode` enumeration member that indicates the data type of the resource. `ResourceTypeCode` is a private enumeration that is used by [Resgen.exe](/dotnet/framework/tools/resgen-exe-resource-file-generator) to indicate that a special binary format is used to store one of 19 common data types. These include the .NET Framework primitive data types (, , , , , , , , , , , , ), as well as , , and . In addition, the `ResourceTypeCode` enumeration includes the values shown in the following table. +- The string representation of a `ResourceTypeCode` enumeration member that indicates the data type of the resource. `ResourceTypeCode` is a private enumeration that is used by [Resgen.exe](/dotnet/framework/tools/resgen-exe-resource-file-generator) to indicate that a special binary format is used to store one of 19 common data types. These include the .NET primitive data types (, , , , , , , , , , , , ), as well as , , and . In addition, the `ResourceTypeCode` enumeration includes the values shown in the following table. |`ResourceTypeCode` value|Description| |------------------------------|-----------------| @@ -704,7 +704,7 @@ |`ResourceTypeCode.Null`|The data is a null reference.| |`ResourceTypeCode.Stream`|The data is stored in a stream.| -- A string that contains the fully qualified name of the type whose binary data is assigned to the `serializedData` argument (for example, `System.String`). In addition, for types that are not part of the .NET Framework class library, the string includes the name, version, culture, and public key of the assembly that contains the type. For example, the following string indicates that the serialized data represents an instance of the `Person` type in the `Extensions` namespace, which is found in version 1.0 of an assembly named Utility that has no public key and no designated culture. +- A string that contains the fully qualified name of the type whose binary data is assigned to the `serializedData` argument (for example, `System.String`). In addition, for types that are not part of the .NET class library, the string includes the name, version, culture, and public key of the assembly that contains the type. For example, the following string indicates that the serialized data represents an instance of the `Person` type in the `Extensions` namespace, which is found in version 1.0 of an assembly named Utility that has no public key and no designated culture. `Extensions.Person, Utility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null` @@ -973,14 +973,7 @@ Gets or sets a delegate that enables resource assemblies to be written that target versions of .NET Framework prior to .NET Framework 4 by using qualified assembly names. The type that is encapsulated by the delegate. - - - + To be added. diff --git a/xml/System.ServiceProcess/ServiceBase.xml b/xml/System.ServiceProcess/ServiceBase.xml index 8f624b9ac85..a5a93191a2b 100644 --- a/xml/System.ServiceProcess/ServiceBase.xml +++ b/xml/System.ServiceProcess/ServiceBase.xml @@ -67,10 +67,10 @@ You do not have to implement , , or any other method in . However, the service's behavior is described in , so at minimum, this member should be overridden. The `main()` function of the executable registers the service in the executable with the Service Control Manager by calling the method. The property of the object passed to the method must match the property of the service installer for that service. - You can use the `sc create` command to install services that target modern .NET, or use `InstallUtil.exe` to install services that target .NET Framework. + You can use the `sc create` command to install services. > [!NOTE] -> You can specify a log other than the Application event log to receive notification of service calls, but neither the nor the property can write to a custom log. Set to `false` if you do not want to use automatic logging. +> You can specify a log other than the Application event log to receive notification of service calls, but neither the nor the property can write to a custom log. Set to `false` if you do not want to use automatic logging. ]]> @@ -1286,7 +1286,7 @@ method sets the service state to indicate a stop is pending and calls the method. After the application is stopped, the service state is set to stopped. If the application is a hosted service, the application domain is unloaded. + The method sets the service state to indicate a stop is pending and calls the method. After the application is stopped, the service state is set to stopped. ]]> diff --git a/xml/System.ServiceProcess/ServiceControllerPermissionAttribute.xml b/xml/System.ServiceProcess/ServiceControllerPermissionAttribute.xml index 089e43f322c..233e1f24e04 100644 --- a/xml/System.ServiceProcess/ServiceControllerPermissionAttribute.xml +++ b/xml/System.ServiceProcess/ServiceControllerPermissionAttribute.xml @@ -44,14 +44,12 @@ Allows declarative service controller permission checks. - diff --git a/xml/System.ServiceProcess/ServiceControllerPermissionEntry.xml b/xml/System.ServiceProcess/ServiceControllerPermissionEntry.xml index bb2f4e73c8e..d785d1097cf 100644 --- a/xml/System.ServiceProcess/ServiceControllerPermissionEntry.xml +++ b/xml/System.ServiceProcess/ServiceControllerPermissionEntry.xml @@ -33,19 +33,8 @@ Defines the smallest unit of a code access security permission that is set for a . - - - + To be added. - - - - @@ -128,10 +117,10 @@ is . - is not valid. - - -or- - + is not valid. + + -or- + is not valid. diff --git a/xml/System.Speech.Recognition/SpeechHypothesizedEventArgs.xml b/xml/System.Speech.Recognition/SpeechHypothesizedEventArgs.xml index 841fa5660e0..a22c4b0724c 100644 --- a/xml/System.Speech.Recognition/SpeechHypothesizedEventArgs.xml +++ b/xml/System.Speech.Recognition/SpeechHypothesizedEventArgs.xml @@ -25,7 +25,7 @@ Returns notification from or events. - This class supports the .NET Framework infrastructure and is not intended to be used directly from application code. + This class supports the .NET infrastructure and is not intended to be used directly from application code. is set to `false`, a object raises the event only once, after the first has elapsed. To keep raising the event regularly at the interval defined by the , set to `true`, which is the default value. - The component catches and suppresses all exceptions thrown by event handlers for the event. This behavior is subject to change in future releases of the .NET Framework. Note, however, that this is not true of event handlers that execute asynchronously and include the `await` operator (in C#) or the `Await` operator (in Visual Basic). Exceptions thrown in these event handlers are propagated back to the calling thread, as the following example illustrates. For more information on exceptions thrown in asynchronous methods, see [Exception Handling](/dotnet/standard/parallel-programming/exception-handling-task-parallel-library). + The component catches and suppresses all exceptions thrown by event handlers for the event. This is not true of event handlers that execute asynchronously and include the `await` operator (in C#) or the `Await` operator (in Visual Basic). Exceptions thrown in these event handlers are propagated back to the calling thread, as the following example illustrates. For more information on exceptions thrown in asynchronous methods, see [Exception Handling](/dotnet/standard/parallel-programming/exception-handling-task-parallel-library). :::code language="csharp" source="~/snippets/csharp/System.Timers/ElapsedEventArgs/Overview/AsyncHandlerEx1.cs" id="Snippet3"::: :::code language="fsharp" source="~/snippets/fsharp/System.Timers/ElapsedEventArgs/Overview/AsyncHandlerEx1.fs" id="Snippet3"::: @@ -110,7 +110,6 @@ > - (this topic): fires an event at regular intervals. The class is intended for use as a server-based or service component in a multithreaded environment; it has no user interface and is not visible at runtime. > - : executes a single callback method on a thread pool thread at regular intervals. The callback method is defined when the timer is instantiated and cannot be changed. Like the class, this class is intended for use as a server-based or service component in a multithreaded environment; it has no user interface and is not visible at runtime. > - : a Windows Forms component that fires an event at regular intervals. The component has no user interface and is designed for use in a single-threaded environment. -> - (.NET Framework only): an ASP.NET component that performs asynchronous or synchronous web page postbacks at a regular interval. ## Examples The following example instantiates a `System.Timers.Timer` object that fires its event every two seconds (2,000 milliseconds), sets up an event handler for the event, and starts the timer. The event handler displays the value of the property each time it is raised. @@ -571,7 +570,7 @@ Even if is not `null`, events can occur after the or method has been called or after the property has been set to `false`, because the signal to raise the event is always queued for execution on a thread pool thread. One way to resolve this race condition is to set a flag that tells the event handler for the event to ignore subsequent events. - The component catches and suppresses all exceptions thrown by event handlers for the event. This behavior is subject to change in future releases of .NET Framework. + The component catches and suppresses all exceptions thrown by event handlers for the event. ## Examples The following example instantiates a object that fires its event every two seconds (2000 milliseconds), sets up an event handler for the event, and starts the timer. The event handler displays the value of the property each time it is raised. diff --git a/xml/System.Transactions/DependentTransaction.xml b/xml/System.Transactions/DependentTransaction.xml index 66907476c43..271e621f4af 100644 --- a/xml/System.Transactions/DependentTransaction.xml +++ b/xml/System.Transactions/DependentTransaction.xml @@ -107,14 +107,11 @@ diff --git a/xml/System.Transactions/DistributedTransactionPermission.xml b/xml/System.Transactions/DistributedTransactionPermission.xml index beb888532c0..afe95c13513 100644 --- a/xml/System.Transactions/DistributedTransactionPermission.xml +++ b/xml/System.Transactions/DistributedTransactionPermission.xml @@ -49,8 +49,6 @@ [!INCLUDE[cas-deprecated](~/includes/cas-deprecated.md)] - A local transaction only consumes resources from a single durable source or multiple volatile sources. A distributed transaction, on the other hand, has to interact with multiple durable resources, potentially across the network. When management of a transaction is escalated to MSDTC, the code that initiated the escalation is verified to have this permission. The security demand affects the code that initiated the escalation, not necessarily the code that originally created the local transaction. - ]]> diff --git a/xml/System.Transactions/EnterpriseServicesInteropOption.xml b/xml/System.Transactions/EnterpriseServicesInteropOption.xml index d6b5f530d4b..ff91d9dc68a 100644 --- a/xml/System.Transactions/EnterpriseServicesInteropOption.xml +++ b/xml/System.Transactions/EnterpriseServicesInteropOption.xml @@ -47,7 +47,8 @@ namespace. However, since the interoperation is not provided by default, you need to use this enumeration to specify how you want to participate in the COM+ context. Specifically, when you create a new , use this enumeration to indicate how you want your transaction to participate in COM+ transactions. + +Managed .NET components can participate in COM+ transactions using the classes in the namespace. However, since the interoperation is not provided by default, you need to use this enumeration to specify how you want to participate in the COM+ context. Specifically, when you create a new , use this enumeration to indicate how you want your transaction to participate in COM+ transactions. ]]> diff --git a/xml/System.Transactions/TransactionScope.xml b/xml/System.Transactions/TransactionScope.xml index 7f8b975ce00..5c01d2f0d88 100644 --- a/xml/System.Transactions/TransactionScope.xml +++ b/xml/System.Transactions/TransactionScope.xml @@ -347,9 +347,7 @@ The transaction to be set as the ambient transaction, so that transactional work done inside the scope uses this transaction. An instance of the enumeration that describes whether the ambient transaction associated with the transaction scope will flow across thread continuations when using Task or async/await .NET async programming patterns. - [Supported in the .NET Framework 4.5.1 and later versions] - - Initializes a new instance of the class and sets the specified transaction as the ambient transaction, so that transactional work done inside the scope uses this transaction. + Initializes a new instance of the class and sets the specified transaction as the ambient transaction, so that transactional work done inside the scope uses this transaction. To be added. @@ -573,9 +571,7 @@ The transaction to be set as the ambient transaction, so that transactional work done inside the scope uses this transaction. The after which the transaction scope times out and aborts the transaction. An instance of the enumeration that describes whether the ambient transaction associated with the transaction scope will flow across thread continuations when using Task or async/await .NET async programming patterns. - [Supported in the .NET Framework 4.5.1 and later versions] - - Initializes a new instance of the class with the specified timeout value, and sets the specified transaction as the ambient transaction, so that transactional work done inside the scope uses this transaction. + Initializes a new instance of the class with the specified timeout value, and sets the specified transaction as the ambient transaction, so that transactional work done inside the scope uses this transaction. To be added. @@ -716,9 +712,7 @@ When you use the `transactionOptions` parameter to specify an An instance of the enumeration that describes the transaction requirements associated with this transaction scope. A structure that describes the transaction options to use if a new transaction is created. If an existing transaction is used, the timeout value in this parameter applies to the transaction scope. If that time expires before the scope is disposed, the transaction is aborted. An instance of the enumeration that describes whether the ambient transaction associated with the transaction scope will flow across thread continuations when using Task or async/await .NET async programming patterns. - [Supported in the .NET Framework 4.5.1 and later versions] - - Initializes a new instance of the class with the specified requirements and asynchronous flow option. + Initializes a new instance of the class with the specified requirements and asynchronous flow option. To be added. From d03d387e2bc9954d7fa52e9a275c5f986182d95c Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Fri, 29 May 2026 15:38:11 -0700 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- xml/System.Resources/MissingSatelliteAssemblyException.xml | 2 +- xml/System.Resources/ResourceManager.xml | 2 +- xml/System.Resources/ResourceReader.xml | 2 +- xml/System.Timers/Timer.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xml/System.Resources/MissingSatelliteAssemblyException.xml b/xml/System.Resources/MissingSatelliteAssemblyException.xml index 6b5e6b0417f..0affab84352 100644 --- a/xml/System.Resources/MissingSatelliteAssemblyException.xml +++ b/xml/System.Resources/MissingSatelliteAssemblyException.xml @@ -64,7 +64,7 @@ is thrown if the resource manager tries to retrieve but cannot find a resource for the default culture. However, .NET will load the resources for an app's default culture from a satellite assembly if the attribute specifies a value of for the location parameter. When this is the case, the exception is thrown when the resource manager tries to retrieve a resource of the default culture and the satellite assembly for the culture specified in the attribute is missing. Note that the exception is thrown by a resource retrieval method such as or , and not when the object is instantiated. + The default culture is the culture whose resources are loaded if the appropriate culture-specific resources cannot be found. By default, resources for the default culture are located in the main assembly, and a is thrown if the resource manager tries to retrieve but cannot find a resource for the default culture. However, .NET loads the resources for an app's default culture from a satellite assembly if the attribute specifies a value of for the location parameter. When this is the case, the exception is thrown when the resource manager tries to retrieve a resource of the default culture and the satellite assembly for the culture specified in the attribute is missing. Note that the exception is thrown by a resource retrieval method such as or , and not when the object is instantiated. uses the HRESULT COR_E_MISSINGSATELLITEASSEMBLY, which has the value 0x80131536. diff --git a/xml/System.Resources/ResourceManager.xml b/xml/System.Resources/ResourceManager.xml index b774fd550ec..6db9fd8f96d 100644 --- a/xml/System.Resources/ResourceManager.xml +++ b/xml/System.Resources/ResourceManager.xml @@ -1617,7 +1617,7 @@ csc GetStream.cs /resource:AppResources.resources This method will shrink the working set in a running app. Any future resource lookups on this object will be as expensive as the first lookup, because the resource manager will have to search and load resources again. This can be useful in some complex threading scenarios, where creating a new object is the appropriate behavior. > [!NOTE] -> The method is not thread safe with respect to , , and operations. The advantage of this change is a performance improvement for multiple threads that access resources. However, if you call the method in one thread while simultaneously getting a resource in another thread, the get operation can throw an exception. +> The method is not thread safe with respect to , , and operations. This behavior improves performance for multiple threads that access resources. However, if you call the method in one thread while simultaneously getting a resource in another thread, the get operation can throw an exception. You can also use this method in situations where the managed instances for the resources created by the current resource manager have to be released deterministically, without waiting for the resource manager to go completely out of scope and be garbage collected. diff --git a/xml/System.Resources/ResourceReader.xml b/xml/System.Resources/ResourceReader.xml index a43419950e2..e8f4891b46f 100644 --- a/xml/System.Resources/ResourceReader.xml +++ b/xml/System.Resources/ResourceReader.xml @@ -596,7 +596,7 @@ Label11="Mobile Phone:" `resourceType` is a string that represents the data type of the resource. It can be any of the following values: -- The string representation of a `ResourceTypeCode` enumeration member that indicates the data type of the resource. `ResourceTypeCode` is a private enumeration that is used by .to indicate that a special binary format is used to store one of 19 common data types. These include the .NET primitive data types (, , , , , , , , , , , , ), as well as , , and , In addition, the `ResourceTypeCode` enumeration includes the values shown in the following table. + - The string representation of a `ResourceTypeCode` enumeration member that indicates the data type of the resource. `ResourceTypeCode` is a private enumeration that is used by Resgen.exe to indicate that a special binary format is used to store one of 19 common data types. These include the .NET primitive data types (, , , , , , , , , , , , ), as well as , , and . In addition, the `ResourceTypeCode` enumeration includes the values shown in the following table. |ResourceTypeCode value|Description| |----------------------------|-----------------| diff --git a/xml/System.Timers/Timer.xml b/xml/System.Timers/Timer.xml index 5fa2f5fa26e..6933c19a7bf 100644 --- a/xml/System.Timers/Timer.xml +++ b/xml/System.Timers/Timer.xml @@ -87,7 +87,7 @@ When is set to `false`, a object raises the event only once, after the first has elapsed. To keep raising the event regularly at the interval defined by the , set to `true`, which is the default value. - The component catches and suppresses all exceptions thrown by event handlers for the event. This is not true of event handlers that execute asynchronously and include the `await` operator (in C#) or the `Await` operator (in Visual Basic). Exceptions thrown in these event handlers are propagated back to the calling thread, as the following example illustrates. For more information on exceptions thrown in asynchronous methods, see [Exception Handling](/dotnet/standard/parallel-programming/exception-handling-task-parallel-library). + The component catches and suppresses all exceptions thrown by event handlers for the event. This is not true of event handlers that execute asynchronously and include the `await` operator (in C#) or the `Await` operator (in Visual Basic). Exceptions thrown in these event handlers are propagated back to the calling thread, as the following example illustrates. For more information on exceptions thrown in asynchronous methods, see [Exception Handling](/dotnet/standard/parallel-programming/exception-handling-task-parallel-library). :::code language="csharp" source="~/snippets/csharp/System.Timers/ElapsedEventArgs/Overview/AsyncHandlerEx1.cs" id="Snippet3"::: :::code language="fsharp" source="~/snippets/fsharp/System.Timers/ElapsedEventArgs/Overview/AsyncHandlerEx1.fs" id="Snippet3":::