Port nullability annotations to refs XmlDocument and XmlSerializer (#…

…41474) * Port nullability annotations to refs XmlDocument and XmlSerializer * Fix new System.Data.Common nullability related errors * Switch nullability of parameter in SoapElementAttribute ctor
dotnet · Aug 28, 2020 · c587f9d · c587f9d
1 parent e6b9b48
commit c587f9d
Show file tree

Hide file tree

Showing 8 changed files with 318 additions and 288 deletions.
diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/ObjectStorage.cs b/src/libraries/System.Data.Common/src/System/Data/Common/ObjectStorage.cs
@@ -341,7 +341,7 @@ public override object ConvertXmlToObject(string s)
 
             StringReader strreader = new StringReader(s);
             XmlSerializer deserializerWithOutRootAttribute = ObjectStorage.GetXmlSerializer(type);
-            return (deserializerWithOutRootAttribute.Deserialize(strreader));
+            return (deserializerWithOutRootAttribute.Deserialize(strreader))!;
         }
 
         // Prevent inlining so that reflection calls are not moved to caller that may be in a different assembly that may have a different grant set.

diff --git a/src/libraries/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs b/src/libraries/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs
@@ -161,7 +161,7 @@ public override object ConvertXmlToObject(string s)
 
             StringReader strreader = new StringReader(s);
             XmlSerializer deserializerWithOutRootAttribute = ObjectStorage.GetXmlSerializer(_dataType);
-            return (deserializerWithOutRootAttribute.Deserialize(strreader));
+            return (deserializerWithOutRootAttribute.Deserialize(strreader))!;
         }
 
         // Prevent inlining so that reflection calls are not moved to caller that may be in a different assembly that may have a different grant set.
@@ -188,7 +188,7 @@ public override object ConvertXmlToObject(XmlReader xmlReader, XmlRootAttribute
             else
             {
                 XmlSerializer deserializerWithRootAttribute = ObjectStorage.GetXmlSerializer(_dataType, xmlAttrib);
-                return (deserializerWithRootAttribute.Deserialize(xmlReader));
+                return (deserializerWithRootAttribute.Deserialize(xmlReader))!;
             }
         }
 

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/SoapElementAttribute.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/SoapElementAttribute.cs
@@ -17,7 +17,7 @@ public SoapElementAttribute()
         {
         }
 
-        public SoapElementAttribute(string elementName)
+        public SoapElementAttribute(string? elementName)
         {
             _elementName = elementName;
         }

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

diff --git a/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
@@ -3,6 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" />

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

diff --git a/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Xml\src\System.Private.Xml.csproj" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ public SoapElementAttribute() @@
             {
             }
-            public SoapElementAttribute(string elementName)
+            public SoapElementAttribute(string? elementName)
             {
                 _elementName = elementName;
             }
@@ Expand Down @@