Conversation
* calendar * nullable: all calendars * fix likely corert error
* Nullable: Exception, SystemException, Argument*Exception * Add Debug.Assert rather than comment
* Nullable: NumberFormatInfo, CultureInfo * fix build * fix windows * fix APPX issue * another appx failure * get rid of line split * mark retVal as nullable
…nfo, TextElementEnumerator, TimeSpanFormat, TimeSpanParse (#23486) * nullable: DateTimeFormat, DateTimeFormatInfoScanner, SortKey, StringInfo, TextElementEnumerator, TimeSpanFormat, TimeSpanParse * prefix workaround comment with TODO-NULLABLE * add TODO-NULLABLE
* Nullable: Internal.Console, System.ValueType * Making ToString() nullable
Merge remote-tracking branch 'dotnet/master' into NullableFeature
Nullable: System.Runtime.Intrinsics
* Unix interop * More interop * Fix * fix
* Nullable annotations for Delegate/MulticastDelegate * Dead string * Remove TODO's * Review * Review2 * More * More * Unnecessary ? * Update src/System.Private.CoreLib/src/System/MulticastDelegate.cs Co-Authored-By: danmosemsft <danmose@microsoft.com> * Santi feedback * Jan feedback * No assert msg
* Nullable: Annotate remaining System.*Exception * PR feedback
|
@stephentoub build break: |
|
I'm amazed they don't happen more often with all these concurrent PRs. Will fix. |
|
@safern is going to add |
Merge master into NullableFeature
* Nullable: Overlapped and friends * Address PR feedback
Also fixing the class? annotation on public LazyInitializer methods.
Finishes off annotation of the System.Threading namespace, not including subnamespaces.
* Nullable: ReaderWriterLockSlim * Address PR feedback * Audit System.Threading for unannotated statics
* Nullable: All remaining exceptions * Fix build break and PR Feedback
* Nullable: System.Threading.Tasks * Address PR feedback
* Nullable: shared/System/Security * fix windows * address feedback * IIIIdentity.Identity? * apply feedback
|
|
I would have expected to see a merge conflict with the move of delegate. #23552 |
Pull master changes into NullableFeature
|
@stephentoub @jkotas -- let's merge this as is if we get a green build into master so that we can get annotations in reference assemblies for preview5 so we can start collecting feedback -- also this way we could catch any perf regression and fix it in the next preview. We have 1 things to follow that are fixed on the next preview:
Does that sound good? |
|
Fine with me |
|
I'm ok with it, too. I don't believe the first issue you call out is actually an issue. And the second one is just something we'll want to address prior to actually shipping but shouldn't block work making it to master. |
Yeah I thought it was an issue, but I just spoke with @tannergooding and he confirmed it is not an issue. I'll update my comment. |
|
Is it that much infrastructure work to instead ship a SxS preview with nullable annotations (similar to what the compiler team did for their initial nullable previews - CC. @jaredpar). My concern is that we are still working on annotating the framework and it will take some time and churn before it is complete. By shipping the framework as annotated by default, we are going to be forcing all users who are annotating their libraries to deal with our own churn and partial annotations, while simultaneously dealing with their own. I think that shipping a SxS feature branch would be an overall better solution as it would let users opt-in to this dual-churn scenario or to decide to only deal with it after we have decided our own annotations are stable. I believe the infrastructure work would largely resolve down to creating a |
|
I don't believe merging into master affects that one way or the other; public consumption of these annotations only happens via reference assemblies, which are not directly impacted by any changes in corelib. We could have a separate conversation about your question, but this PR doesn't seem like the right place for it. |
|
@dotnet-bot test Ubuntu x64 Checked CoreFX Tests |
|
Failures seem to be happening in all other PRs. I will merge to avoid potential merge conflicts and so that we can merged approved PRs into the feature branch. |
|
I'll open a new draft PR once we merge a new change into the nullable branch. |
Nullable feature into master Commit migrated from dotnet/coreclr@de68c9d
Rolling PR to check for bugs introduced in the nullable annotations work.
As new changes merge into the nullable branch, this will re-run tests automatically.
We have not yet determined when to do the merge, so this is no-merge.