From 141b708c19a758371dfda4cdd1a6cebea292eb1f Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:41:47 -0700 Subject: [PATCH 1/3] fix see tags --- .../AssemblyCatalog.xml | 2 +- .../CompositionScopeDefinition.xml | 2 +- .../FilteredCatalog.xml | 2 +- .../ContractBasedImportDefinition.xml | 2 +- xml/System.ComponentModel.Composition.Primitives/Export.xml | 2 +- .../ImportDefinition.xml | 2 +- .../ValidationAttribute.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml b/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml index 9b413091b92..35544b930f2 100644 --- a/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml +++ b/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml @@ -496,7 +496,7 @@ The assembly referenced by `codeBase` is loaded into the Load context. Conditions that specify which exports to match. Gets a collection of exports that match the conditions specified by the import definition. A collection of exports that match the conditions specified by . - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-composition-hosting-assemblycatalog-getexports">Supplemental API remarks for System.ComponentModel.Composition.Hosting.AssemblyCatalog.GetExports</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Hosting.AssemblyCatalog.GetExports. is . The has been disposed. diff --git a/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml b/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml index bba78cc32d6..71092cbcee6 100644 --- a/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml +++ b/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml @@ -306,7 +306,7 @@ For more information, see [Implementing a Dispose method](/dotnet/standard/garba Conditions that specify which exports to match. Gets a collection of exports that match the conditions specified by the import definition. A collection of exports that match the specified conditions. - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-composition-hosting-compositionscopedefinition-getexports">Supplemental API remarks for System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.GetExports</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.GetExports. is . diff --git a/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml b/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml index 2fbbf89403b..6584b9ad000 100644 --- a/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml +++ b/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml @@ -246,7 +246,7 @@ The import to match. Gets the exported parts from this catalog that match the specified import. A collection of matching parts. - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-composition-hosting-filteredcatalog-getexports">Supplemental API remarks for System.ComponentModel.Composition.Hosting.FilteredCatalog.GetExports</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Hosting.FilteredCatalog.GetExports. is . diff --git a/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml b/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml index 3d148f7ad1f..9d202bb16a8 100644 --- a/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml +++ b/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml @@ -57,7 +57,7 @@ Initializes a new instance of the class. - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-composition-primitives-contractbasedimportdefinition--ctor">Supplemental API remarks for System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition..ctor</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition..ctor. diff --git a/xml/System.ComponentModel.Composition.Primitives/Export.xml b/xml/System.ComponentModel.Composition.Primitives/Export.xml index 1f1ee072c48..2ba3c2258e3 100644 --- a/xml/System.ComponentModel.Composition.Primitives/Export.xml +++ b/xml/System.ComponentModel.Composition.Primitives/Export.xml @@ -256,7 +256,7 @@ Returns the exported object the export provides. The exported object the export provides. - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-composition-primitives-export-getexportedvaluecore">Supplemental API remarks for System.ComponentModel.Composition.Primitives.Export.GetExportedValueCore</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Primitives.Export.GetExportedValueCore. The method was not overridden by a derived class. An error occurred during composition. will contain a collection of errors that occurred. The current instance is an instance of , and the underlying exported value cannot be cast to T. diff --git a/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml b/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml index feefb54ee0a..4348be3b4ef 100644 --- a/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml +++ b/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml @@ -276,7 +276,7 @@ Gets a value that indicates whether the export represented by the specified definition satisfies the constraints of this import definition. if the constraints are satisfied; otherwise, . - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-composition-primitives-importdefinition-isconstraintsatisfiedby">Supplemental API remarks for System.ComponentModel.Composition.Primitives.ImportDefinition.IsConstraintSatisfiedBy</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Primitives.ImportDefinition.IsConstraintSatisfiedBy. is . diff --git a/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml b/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml index cdd09ba868a..da48578e0c1 100644 --- a/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml +++ b/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml @@ -93,7 +93,7 @@ Initializes a new instance of the class. - For more information about this API, see <see href="/dotnet/fundamentals/runtime-libraries/system-componentmodel-dataannotations-validationattribute--ctor">Supplemental API remarks for System.ComponentModel.DataAnnotations.ValidationAttribute..ctor</see>. + For more information about this API, see Supplemental API remarks for System.ComponentModel.DataAnnotations.ValidationAttribute..ctor. From 6c8421139f9061cc14fef838ad00563f10d5acae Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Wed, 20 Mar 2024 18:18:36 -0700 Subject: [PATCH 2/3] reinstate old remarks --- .../AssemblyCatalog.xml | 9 ++++++++- .../CompositionScopeDefinition.xml | 16 ++++++++++------ .../FilteredCatalog.xml | 16 ++++++++++------ .../ContractBasedImportDefinition.xml | 11 ++++++++++- .../Export.xml | 12 +++++++++--- .../ImportDefinition.xml | 12 +++++++++--- .../ValidationAttribute.xml | 16 +++++++++++----- 7 files changed, 67 insertions(+), 25 deletions(-) diff --git a/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml b/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml index 35544b930f2..b64853a70c7 100644 --- a/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml +++ b/xml/System.ComponentModel.Composition.Hosting/AssemblyCatalog.xml @@ -496,7 +496,14 @@ The assembly referenced by `codeBase` is loaded into the Load context. Conditions that specify which exports to match. Gets a collection of exports that match the conditions specified by the import definition. A collection of exports that match the conditions specified by . - For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Hosting.AssemblyCatalog.GetExports. + + matches the conditions defined by `definition`; instead, return an empty . + +]]> + is . The has been disposed. diff --git a/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml b/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml index 71092cbcee6..c13ac721462 100644 --- a/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml +++ b/xml/System.ComponentModel.Composition.Hosting/CompositionScopeDefinition.xml @@ -306,13 +306,17 @@ For more information, see [Implementing a Dispose method](/dotnet/standard/garba Conditions that specify which exports to match. Gets a collection of exports that match the conditions specified by the import definition. A collection of exports that match the specified conditions. - For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Hosting.CompositionScopeDefinition.GetExports. + + that matches the conditions defined by `definition`, return an empty . + +]]> + - is . - - - The has been disposed. - + is . + The has been disposed. diff --git a/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml b/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml index 6584b9ad000..12396ca0ccd 100644 --- a/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml +++ b/xml/System.ComponentModel.Composition.Hosting/FilteredCatalog.xml @@ -246,13 +246,17 @@ The import to match. Gets the exported parts from this catalog that match the specified import. A collection of matching parts. - For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Hosting.FilteredCatalog.GetExports. + + matches the conditions defined by `definition`; instead, return an empty . + +]]> + - is . - - - The has been disposed. - + is . + The has been disposed. diff --git a/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml b/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml index 9d202bb16a8..f6fa34b77d7 100644 --- a/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml +++ b/xml/System.ComponentModel.Composition.Primitives/ContractBasedImportDefinition.xml @@ -57,7 +57,16 @@ Initializes a new instance of the class. - For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Primitives.ContractBasedImportDefinition..ctor. + + , , +, , , , and properties. + +]]> + diff --git a/xml/System.ComponentModel.Composition.Primitives/Export.xml b/xml/System.ComponentModel.Composition.Primitives/Export.xml index 2ba3c2258e3..455208fcc30 100644 --- a/xml/System.ComponentModel.Composition.Primitives/Export.xml +++ b/xml/System.ComponentModel.Composition.Primitives/Export.xml @@ -256,11 +256,17 @@ Returns the exported object the export provides. The exported object the export provides. - For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Primitives.Export.GetExportedValueCore. + + + The method was not overridden by a derived class. An error occurred during composition. will contain a collection of errors that occurred. - The current instance is an instance of , and the underlying exported value cannot be cast to T. - + The current instance is an instance of , and the underlying exported value cannot be cast to T. diff --git a/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml b/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml index 4348be3b4ef..ac466f12e29 100644 --- a/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml +++ b/xml/System.ComponentModel.Composition.Primitives/ImportDefinition.xml @@ -276,10 +276,16 @@ Gets a value that indicates whether the export represented by the specified definition satisfies the constraints of this import definition. if the constraints are satisfied; otherwise, . - For more information about this API, see Supplemental API remarks for System.ComponentModel.Composition.Primitives.ImportDefinition.IsConstraintSatisfiedBy. + + property, but the result should remain consistent. + +]]> + - is . - + is . diff --git a/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml b/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml index da48578e0c1..07bb9975b60 100644 --- a/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml +++ b/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml @@ -93,7 +93,15 @@ Initializes a new instance of the class. - For more information about this API, see Supplemental API remarks for System.ComponentModel.DataAnnotations.ValidationAttribute..ctor. + + + @@ -138,8 +146,7 @@ property to retrieve an error message. +This constructor provides a resource accessor function that is used by the property to retrieve an error message. ]]> @@ -232,8 +239,7 @@ From eb44ef0598ed1229a6cb82fdda6d7c359adc12bc Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Thu, 28 Mar 2024 12:25:57 -0700 Subject: [PATCH 3/3] Update xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml Co-authored-by: Buyaa Namnan --- .../ValidationAttribute.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml b/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml index 07bb9975b60..d22029719e1 100644 --- a/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml +++ b/xml/System.ComponentModel.DataAnnotations/ValidationAttribute.xml @@ -95,9 +95,6 @@ Initializes a new instance of the class.