-
Couldn't load subscription status.
- Fork 833
Remove ActivityDisposable conditional directives and replace with System.IDisposable | null #18707
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.
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tem.IDisposable | null Co-authored-by: T-Gro <[email protected]>
Co-authored-by: T-Gro <[email protected]>
Copilot
AI
changed the title
[WIP] Conditional directives and ActivitityDisposable are no longer needed
Remove ActivityDisposable conditional directives and replace with System.IDisposable | null
Jun 23, 2025
Copilot finished work on behalf of
T-Gro
June 23, 2025 15:12
T-Gro
approved these changes
Jun 24, 2025
|
abonie
approved these changes
Jun 24, 2025
T-Gro
added a commit
that referenced
this pull request
Jun 24, 2025
* More test for error recovery (#18669) * [main] Update dependencies from dnceng/internal/dotnet-optimization (#18683) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250610.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25310.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250611.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25311.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250616.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25316.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250617.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25317.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <[email protected]> * [main] Update dependencies from dotnet/arcade (#18643) * Expand docstring on SynModuleDecl.Types (#18698) * Update dependencies from https://github.com/dotnet/arcade build 20250620.5 (#18703) Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25316.2 -> To Version 10.0.0-beta.25320.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Remove feature/lsp merge from branch-merge.yml (#18705) Cleaning up, sicne we've merged feature/lsp to main some time ago * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250623.1 (#18710) optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25317.1 -> To Version 1.0.0-prerelease.25323.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20250623.3 (#18709) Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25320.5 -> To Version 10.0.0-beta.25323.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Remove ActivityDisposable conditional directives and replace with System.IDisposable | null (#18707) --------- Co-authored-by: Edgar Gonzalez <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <[email protected]> Co-authored-by: Patrick Stevens <[email protected]> Co-authored-by: Adam Boniecki <[email protected]> Co-authored-by: Copilot <[email protected]>
brianrourkeboll
pushed a commit
to brianrourkeboll/fsharp
that referenced
this pull request
Sep 11, 2025
…tem.IDisposable | null (dotnet#18707)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
NO_RELEASE_NOTES
Label for pull requests which signals, that user opted-out of providing release notes
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes the conditional compilation directives for
ActivityDisposablethat were needed during the nullness bootstrapping phase when the "last known good" compiler had bugs around 'use' and nullable disposable handling.Changes Made
Removed conditional compilation block from
NullnessShims.fs:Updated function signatures in
Activity.fsandActivity.fsito directly useSystem.IDisposable | null:start: name: string -> tags: (string * string) seq -> System.IDisposable | nullstartNoTags: name: string -> System.IDisposable | nullstartAndMeasureEnvironmentStats: name: string -> System.IDisposable | nullImpact
ActivityDisposablereferences are now directly replaced withSystem.IDisposable | nullSystem.IDisposable | nullin the non-LKG caseThe changes are minimal and surgical, affecting only the necessary files to complete the cleanup of the nullness bootstrapping infrastructure.
Fixes #18706.
Warning
Firewall rules blocked me from connecting to one or more addresses
I tried to connect to the following addresses, but was blocked by firewall rules:
1k9vsblobprodcus379.vsblob.vsassets.iodotnet restore FSharp.Compiler.Service.sln(dns block)4vyvsblobprodcus361.vsblob.vsassets.iodotnet restore FSharp.Compiler.Service.sln(dns block)If you need me to access, download, or install something from one of these locations, you can either:
💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.