[release/5.0] Backport nullability annotations to release/5.0 #41348
Conversation
carlossanlop
requested review from
krwq,
jeffhandley,
roji,
stephentoub,
eerhardt,
ericstj,
pgovind,
jozkee,
safern and
buyaa-n
carlossanlop
added
the
NO-MERGE
danmoseley
changed the title
|
@carlossanlop please also add #41315 |
No need, @krwq, because @danmosemsft automatically backported it with the bot comment: 2aa627b |
carlossanlop
force-pushed
the
nullabilityBackport50
branch
from
684965b to
3f2d49b
Compare
|
I force-updated this branch to the latest changes in dotnet/release5.0 , you can see change #41315 is already included in the commit history. |
carlossanlop
force-pushed
the
nullabilityBackport50
branch
from
3f2d49b to
e7afa73
Compare
We've gotten tactics approval to merge this PR in on Monday (August 31st) with however far we get through the remaining annotations--including them all in RC1. But it's certainly better to separate the bug fix into a separate PR. @carlossanlop can you remove #41382 from this PR and create a separate port PR for that please? The port bot should be able to do its magic on that one. |
carlossanlop
force-pushed
the
nullabilityBackport50
branch
from
ad4191d to
7c99012
Compare
…t#40744) * Add nullability annotations to Xml.Linq project * Fix misplaced assertion * Address feedback * Add missing NotNullIfNotNull attributes to operators
* Enable nullability on System.Xml.XPath * Switch XPathException ctor's message parameter to string?
Reverts decision made in dotnet#509
* src files annotated * ref file * Address feedback
* Nullable: System.Xml, part 7 (Serialization) * Fix build errors on Release (ifdef-ed code) * fix incidental product bug * address PR feedback * Make XmlSerializer._rootType nullable
* Globally enable nullability in XML * remove double #nullable enable in the file
…net#41083) * Port nullability annotations to System.Xml.ReaderWriter contract assembly * Port annotations of recently updated members in Xml/Serialization * Fix anontations on XmlElement discovered while updating System.Data.Common Xml related annotations * Fix Xml related annotations on System.Data.Common * address feedback Co-authored-by: Krzysztof Wicher <kwicher@microsoft.com>
…otnet#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#41086) * Enable nullability on System.Xml.XPath.XDocument src * Port nullability annotations to System.Xml.XPath.XDocument * Port nullability annotations to System.Xml.XDocument * Add ? to XmlAttribute argument in int? explicit operator
…elements (dotnet#41488) * Switch Markup property to XmlNode?[]? to reflect it can contain null elements * Update ref
…Runtime.Serialization.Json (dotnet#41476) * Initial nullable annotations of System.Private.DataContractSerialization Contributes to dotnet#2339 * Mark DataMember.Name as non-nullable. * Fix a few simple nullable compile errors. * Assert attributes is non-null in XmlObjectSerializerReadContext * Ensure XmlObjectSerializerContext.serializer is never null * Fix a few simple nullable errors * Remove any checks that DataMember.MemberInfo can be null. * Mark EnumDataContract.Members as non-nullable. Fix nullable errors in SchemaExporter. * Correctly annotate CollectionDataContract.IsCollectionOrTryCreate. * Assert DataContractResolver is non-null. * Suppress dotnet#41465 * Update System.Runtime.Serialization.Json ref source for nullable annotations. * Update System.Runtime.Serializaiton.Xml ref source for nullable annotations. * Update for Xml.ReaderWriter nullable annotations * Work around compiler issue. * Fix test failure. Reference compiler issue in TODO comment. * Revert nullable suppression now that XmlSchemaAppInfo.Markup is annotated correctly. * Fix build for latest annotations in master. * PR feedback round 1 * Address PR feedback round 2
carlossanlop
force-pushed
the
nullabilityBackport50
branch
from
48125da to
4969648
Compare
|
I have reviewed all current commits in this PR as well as linked PR #41541. This is approved for release/5.0 (previously approved by Tactics). You are good to go from my side assuming a simple cherry-pick for that last PR. I'll also be online to have another look if you'd like. |
* Add nullable annotations for XmlDataDocument * Address code review feedback * More code review feedback * Address Eric's feedback * Annotate _dataSet as not null when AttachDataSet is called * Fix GetElementById return type annotation In order to match with src Co-authored-by: Jeff Handley <jeff.handley@microsoft.com> Co-authored-by: David Cantú <dacantu@microsoft.com>
carlossanlop
added
auto-merge
and removed
NO-MERGE
|
Hello @carlossanlop! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
|
Removing auto-merge since it actually squashes where we want this PR to be merged not squashed. |
ghost
locked as resolved and limited conversation to collaborators
Do not merge yet.
This PR will backport the following master PRs (unchecked = still in review):
Fix null check in S.Diagnostics.Contract regressed by nullability annotations #41382 Fix null check in S.Diagnostics.Contract regressed by nullability annotations@krwq - Bug fix, must approve separately.System.ComponentModel.TypeConverter@safern - Skipping. Will target 6.0.