Skip to content

[System.Net.Http] Enable nullability in this framework.#24978

Merged
rolfbjarne merged 3 commits intomainfrom
dev/rolf/system-net-http-nullability
Mar 24, 2026
Merged

[System.Net.Http] Enable nullability in this framework.#24978
rolfbjarne merged 3 commits intomainfrom
dev/rolf/system-net-http-nullability

Conversation

@rolfbjarne
Copy link
Copy Markdown
Member

And fix any build warnings/errors that came up.

Contributes towards #17285.

And fix any build warnings/errors that came up.

Contributes towards #17285.
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Enables C# nullable reference types for the legacy CFNetworkHandler-based HTTP implementation and addresses resulting warnings/errors, as part of the broader effort to improve framework nullability.

Changes:

  • Enabled #nullable in CFNetworkHandler and CFContentStream.
  • Added explicit null-handling for HttpRequestMessage.RequestUri, proxy settings, stream events, and headers.
  • Annotated internal state to satisfy nullability (e.g., CookieContainer?, CFContentStream?, ExceptionDispatchInfo?, required fields).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
src/System.Net.Http/CFNetworkHandler.cs Turns on nullability and updates request/stream handling to avoid nullable warnings.
src/System.Net.Http/CFContentStream.cs Turns on nullability and updates buffering/error propagation logic accordingly.
Comments suppressed due to low confidence (1)

src/System.Net.Http/CFNetworkHandler.cs:275

  • streamBuckets is a mutable Dictionary that’s accessed from multiple threads (SendAsync caller thread, CFRunLoop.Main event callbacks, and the cancellation callback). In this cancellation registration you read streamBuckets without locking, while CloseStream mutates it under a lock and other code mutates it without a lock; concurrent reads/writes on Dictionary can throw or corrupt state. Use a consistent synchronization strategy (lock for all accesses, or switch to a thread-safe collection) so cancellation/event handling can’t race with add/remove.
			bucket.CancellationTokenRegistration = cancellationToken.Register (() => {
				if (!streamBuckets.TryGetValue (stream.Handle, out var bucket2))
					return;

				bucket2.Response.TrySetCanceled ();
				CloseStream (stream);

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@rolfbjarne rolfbjarne enabled auto-merge (squash) March 24, 2026 12:05
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [PR Build #5acf83f] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 5acf83f0b7057013c1b8c28d3d7941c7b655a297 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ API diff for current PR / commit

NET (empty diffs)

✅ API diff vs stable

NET (empty diffs)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 5acf83f0b7057013c1b8c28d3d7941c7b655a297 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #5acf83f] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 5acf83f0b7057013c1b8c28d3d7941c7b655a297 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #5acf83f] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 5acf83f0b7057013c1b8c28d3d7941c7b655a297 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

🚀 [CI Build #5acf83f] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 156 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 6 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 15 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ sharpie: All 1 tests passed. Html Report (VSDrops) Download
✅ windows: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

macOS tests

✅ Tests on macOS Monterey (12): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Ventura (13): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sequoia (15): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Tahoe (26): All 5 tests passed. Html Report (VSDrops) Download

Linux Build Verification

Linux build succeeded

Pipeline on Agent
Hash: 5acf83f0b7057013c1b8c28d3d7941c7b655a297 [PR build]

@rolfbjarne rolfbjarne merged commit 1f440e0 into main Mar 24, 2026
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants