Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port nullability annotations to refs XmlDocument and XmlSerializer #41474

Merged
3 commits merged into from
Aug 28, 2020
Merged

Port nullability annotations to refs XmlDocument and XmlSerializer #41474

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91e0c3a
Port nullability annotations to refs XmlDocument and XmlSerializer
jozkee Aug 27, 2020
8e7a224
Fix new System.Data.Common nullability related errors
jozkee Aug 27, 2020
c84ec37
Switch nullability of parameter in SoapElementAttribute ctor
jozkee Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Data.Common/src/System/Data/Common/ObjectStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Data.Common/src/System/Data/Common/SqlUDTStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))!;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also IMO we should file an issue to investigate if this should return nullable here and below

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #41497.

}

// 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.
Expand All @@ -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))!;
}
}

Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Xml.XmlDocument.cs" />
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Xml.XmlDocument/src/System.Xml.XmlDocument.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
592 changes: 309 additions & 283 deletions src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Xml.XmlSerializer.cs" />
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Xml.XmlSerializer/src/System.Xml.XmlSerializer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down