Add nullable annotations to System.ComponentModel.TypeConverter (#54961)

* Add nullable annotations to System.ComponentModel.TypeConverter * Annotate System.Data.Common * Annotations in depending projects * address feedback
dotnet · Jul 8, 2021 · 885296a · 885296a
1 parent 594901a
commit 885296a
Show file tree

Hide file tree

Showing 216 changed files with 2,289 additions and 2,338 deletions.
diff --git a/...nnotations/src/System/ComponentModel/DataAnnotations/MetadataPropertyDescriptorWrapper.cs b/...nnotations/src/System/ComponentModel/DataAnnotations/MetadataPropertyDescriptorWrapper.cs
@@ -26,7 +26,7 @@ public MetadataPropertyDescriptorWrapper(PropertyDescriptor descriptor, Attribut
 
         public override Type ComponentType { get { return _descriptor.ComponentType; } }
 
-        public override object GetValue(object component) { return _descriptor.GetValue(component); }
+        public override object? GetValue(object? component) { return _descriptor.GetValue(component); }
 
         public override bool IsReadOnly
         {
@@ -45,7 +45,7 @@ public override bool IsReadOnly
 
         public override void ResetValue(object component) { _descriptor.ResetValue(component); }
 
-        public override void SetValue(object component, object value) { _descriptor.SetValue(component, value); }
+        public override void SetValue(object? component, object? value) { _descriptor.SetValue(component, value); }
 
         public override bool ShouldSerializeValue(object component) { return _descriptor.ShouldSerializeValue(component); }
 

diff --git a/...em.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs b/...em.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs
@@ -207,11 +207,11 @@ private void SetupConversion()
 
                     TypeConverter converter = GetOperandTypeConverter();
                     IComparable min = (IComparable)(ParseLimitsInInvariantCulture
-                        ? converter.ConvertFromInvariantString((string)minimum)
-                        : converter.ConvertFromString((string)minimum));
+                        ? converter.ConvertFromInvariantString((string)minimum)!
+                        : converter.ConvertFromString((string)minimum))!;
                     IComparable max = (IComparable)(ParseLimitsInInvariantCulture
-                        ? converter.ConvertFromInvariantString((string)maximum)
-                        : converter.ConvertFromString((string)maximum));
+                        ? converter.ConvertFromInvariantString((string)maximum)!
+                        : converter.ConvertFromString((string)maximum))!;
 
                     Func<object, object?> conversion;
                     if (ConvertValueInInvariantCulture)

diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
diff --git a/...raries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj b/...raries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.manual.cs" />