[NRT] Annotate all XAML attributes for NRT (#8676)

halgab · web-flow · commit 38c29bcd8387 · 2024-01-29T16:40:28.000+05:30
* Annotate all XAML attributes for NRT

* update tests
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/FriendAccessAllowedAttribute.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/FriendAccessAllowedAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 // Description: Implementation of a FriendAccessAllowedAttribute attribute that is used to mark internal metadata
 //              that is allowed to be accessed from friend assemblies.
 
diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/RuntimeIdentifierPropertyAttribute.cs b/src/Microsoft.DotNet.Wpf/src/Shared/System/Windows/Markup/RuntimeIdentifierPropertyAttribute.cs
@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !SYSTEM_XAML
 #nullable disable
+#pragma warning disable CS8632
+#endif
 
 // Description:
 //   This attribute is placed on a class to identify the property that will
@@ -34,23 +37,15 @@ public sealed class RuntimeNamePropertyAttribute: Attribute
         /// <summary/>
         public RuntimeNamePropertyAttribute(string name)
         {
-            _name = name;
+            Name = name;
         }
 
         /// <summary>
         /// The Name of the property in the class that will contain the ID of
         /// the class, this property needs to be of type string and have
         /// both get and set access
         /// </summary>
-        public string Name
-        {
-            get
-            {
-                return _name;
-            }
-        }
-
-        private string _name;
+        public string Name { get; }
     }
 #endif
 
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/AcceptedMarkupExtensionExpressionTypeAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/AcceptedMarkupExtensionExpressionTypeAttribute.cs
@@ -13,7 +13,7 @@ public class AcceptedMarkupExtensionExpressionTypeAttribute: Attribute
         public Type Type { get; set; }
 
         public AcceptedMarkupExtensionExpressionTypeAttribute(Type type)
-	    {
+        {
             Type = type;
         }
     }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/AmbientAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/AmbientAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ConstructorArgumentAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ConstructorArgumentAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ContentPropertyAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ContentPropertyAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
@@ -30,14 +28,14 @@ public ContentPropertyAttribute()
         /// of XAML content with property of the given name.
         /// </summary>
         /// <param name="name">The property to associate to direct XAML content</param>
-        public ContentPropertyAttribute(string name)
+        public ContentPropertyAttribute(string? name)
         {
             Name = name;
         }
 
         /// <summary>
         /// The name of the property that is associated with direct XAML content
         /// </summary>
-        public string Name { get; }
+        public string? Name { get; }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ContentWrapperAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/ContentWrapperAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
@@ -42,7 +40,7 @@ public ContentWrapperAttribute(Type contentWrapper)
         /// Overrides Object.Equals to implement correct equality semantics for this
         /// attribute.
         /// </summary>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return
                 obj is ContentWrapperAttribute other &&
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/DependsOnAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/DependsOnAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/DictionaryKeyPropertyAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/DictionaryKeyPropertyAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/MarkupExtensionBracketCharactersAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/MarkupExtensionBracketCharactersAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Windows.Markup
 {
     /// <summary>
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/MarkupExtensionReturnTypeAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/MarkupExtensionReturnTypeAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Windows.Markup
 {
     /// <summary>
@@ -16,23 +14,23 @@ public MarkupExtensionReturnTypeAttribute()
         {
         }
 
-        public MarkupExtensionReturnTypeAttribute(Type returnType)
+        public MarkupExtensionReturnTypeAttribute(Type? returnType)
         {
             ReturnType = returnType;
         }
 
         [Obsolete("The expressionType argument is not used by the XAML parser. To specify the expected return type, " +
             "use MarkupExtensionReturnTypeAttribute(Type). To specify custom handling for expression types, use " +
             "XamlSetMarkupExtensionAttribute.")]
-        public MarkupExtensionReturnTypeAttribute(Type returnType, Type expressionType)
+        public MarkupExtensionReturnTypeAttribute(Type? returnType, Type? expressionType)
         {
             ReturnType = returnType;
             ExpressionType = expressionType;
         }
 
-        public Type ReturnType { get; }
+        public Type? ReturnType { get; }
 
         [Obsolete("This is not used by the XAML parser. Please look at XamlSetMarkupExtensionAttribute.")]
-        public Type ExpressionType { get; }
+        public Type? ExpressionType { get; }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/NameScopePropertyAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/NameScopePropertyAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
@@ -12,17 +10,17 @@ namespace System.Windows.Markup
     [TypeForwardedFrom("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
     public sealed class NameScopePropertyAttribute : Attribute
     {
-        public NameScopePropertyAttribute (string name)
+        public NameScopePropertyAttribute(string name)
         {
             Name = name;
         }
 
-        public NameScopePropertyAttribute (string name, Type type) : this(name)
+        public NameScopePropertyAttribute(string name, Type? type) : this(name)
         {
             Type = type;
         }
 
         public string Name { get; }
-        public Type Type { get; }
+        public Type? Type { get; }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/RootNamespaceAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/RootNamespaceAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/TrimSurroundingWhitespaceAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/TrimSurroundingWhitespaceAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/UidPropertyAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/UidPropertyAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/UsableDuringInitializationAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/UsableDuringInitializationAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Windows.Markup
 {
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/WhitespaceSignificantCollectionAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/WhitespaceSignificantCollectionAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlDeferLoadAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlDeferLoadAttribute.cs
@@ -2,43 +2,32 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Windows.Markup
 {
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
     public sealed class XamlDeferLoadAttribute : Attribute
     {
-        string _contentTypeName;
-        string _loaderTypeName;
-
         public XamlDeferLoadAttribute(Type loaderType, Type contentType)
         {
             ArgumentNullException.ThrowIfNull(loaderType);
             ArgumentNullException.ThrowIfNull(contentType);
-            _loaderTypeName = loaderType.AssemblyQualifiedName;
-            _contentTypeName = contentType.AssemblyQualifiedName;
+            LoaderTypeName = loaderType.AssemblyQualifiedName!;
+            ContentTypeName = contentType.AssemblyQualifiedName!;
             LoaderType = loaderType;
             ContentType = contentType;
         }
 
         public XamlDeferLoadAttribute(string loaderType, string contentType)
         {
-            _loaderTypeName = loaderType ?? throw new ArgumentNullException(nameof(loaderType));
-            _contentTypeName = contentType ?? throw new ArgumentNullException(nameof(contentType));
+            LoaderTypeName = loaderType ?? throw new ArgumentNullException(nameof(loaderType));
+            ContentTypeName = contentType ?? throw new ArgumentNullException(nameof(contentType));
         }
 
-        public string LoaderTypeName
-        {
-            get { return _loaderTypeName; }
-        }
+        public string LoaderTypeName { get; }
 
-        public string ContentTypeName
-        {
-            get { return _contentTypeName; }
-        }
+        public string ContentTypeName { get; }
 
-        public Type LoaderType { get; private set; }
-        public Type ContentType { get; private set; }
+        public Type? LoaderType { get; private set; }
+        public Type? ContentType { get; private set; }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlSetMarkupExtensionAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlSetMarkupExtensionAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Windows.Markup
 {
     [AttributeUsage(AttributeTargets.Class, Inherited=true, AllowMultiple=false)]
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlSetTypeConverterAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XamlSetTypeConverterAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 namespace System.Windows.Markup
 {
    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlLangPropertyAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlLangPropertyAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
@@ -29,14 +27,14 @@ public sealed class XmlLangPropertyAttribute : Attribute
         /// Creates a new XmlLangPropertyAttribute with the given string
         /// as the property name.
         /// </summary>
-        public XmlLangPropertyAttribute(string name)
+        public XmlLangPropertyAttribute(string? name)
         {
             Name = name;
         }
 
         /// <summary>
         /// The name of the property that is designated to accept the xml:lang value
         /// </summary>
-        public string Name { get; }
+        public string? Name { get; }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlnsCompatibleWithAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlnsCompatibleWithAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlnsDefinitionAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlnsDefinitionAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
@@ -35,7 +33,7 @@ namespace System.Windows.Markup
     /// </summary>
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
     [TypeForwardedFrom("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
-    public sealed class XmlnsDefinitionAttribute: Attribute
+    public sealed class XmlnsDefinitionAttribute : Attribute
     {
         /// <summary>
         /// Constructor
@@ -74,6 +72,6 @@ public XmlnsDefinitionAttribute(string xmlNamespace, string clrNamespace)
         /// If the assemblyName is not set, the code should take the assembly
         /// for which the instance of this attribute is created.
         /// </summary>
-        public string AssemblyName { get; set; }
+        public string? AssemblyName { get; set; }
    }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlnsPrefixAttribute.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Windows/Markup/XmlnsPrefixAttribute.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.Runtime.CompilerServices;
 
 namespace System.Windows.Markup
diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/ContentWrapperAttributeTests.cs b/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/ContentWrapperAttributeTests.cs
diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XamlDeferLoadAttributeTests.cs b/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XamlDeferLoadAttributeTests.cs
diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XmlnsCompatibleWithAttributeTests.cs b/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XmlnsCompatibleWithAttributeTests.cs
diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XmlnsDefinitionAttributeTests.cs b/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XmlnsDefinitionAttributeTests.cs
diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XmlnsPrefixAttributeTests.cs b/src/Microsoft.DotNet.Wpf/tests/UnitTests/System.Xaml.Tests/System/Windows/Markup/XmlnsPrefixAttributeTests.cs

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class AcceptedMarkupExtensionExpressionTypeAttribute: Attribute`
`13`	`13`	`public Type Type { get; set; }`
`14`	`14`
`15`	`15`	`public AcceptedMarkupExtensionExpressionTypeAttribute(Type type)`
`16`		`- {`
	`16`	`+ {`
`17`	`17`	`Type = type;`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-#nullable disable`
`6`		`-`
`7`	`5`	`using System.Runtime.CompilerServices;`
`8`	`6`
`9`	`7`	`namespace System.Windows.Markup`
`@@ -30,14 +28,14 @@ public ContentPropertyAttribute()`
`30`	`28`	`/// of XAML content with property of the given name.`
`31`	`29`	`/// </summary>`
`32`	`30`	`/// <param name="name">The property to associate to direct XAML content</param>`
`33`		`- public ContentPropertyAttribute(string name)`
	`31`	`+ public ContentPropertyAttribute(string? name)`
`34`	`32`	`{`
`35`	`33`	`Name = name;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`/// <summary>`
`39`	`37`	`/// The name of the property that is associated with direct XAML content`
`40`	`38`	`/// </summary>`
`41`		`- public string Name { get; }`
	`39`	`+ public string? Name { get; }`
`42`	`40`	`}`
`43`	`41`	`}`