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.

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

Revert PR - Make the interaction between #line and #nowarn directives consistent #17859

Merged
merged 2 commits into from
Oct 9, 2024

Conversation

KevinRansom
Copy link
Member

@KevinRansom KevinRansom commented Oct 9, 2024

the PR: Make the interaction between #line and #nowarn directives consistent made it's way into the release\dev17.12 branch and the revert of it didn't.
This PR corrects that, by reverting the PR. Unfortunately the rc2 SDK shipped with the bug, in order to ensure that sourcebuild continues to build this PR contains some proj file amendments to ensure successful sourcebuild compilation of rtm with the rc2 SDK.

@vlad, since we have not rtm'd yet version number changes are not required.

@KevinRansom KevinRansom requested a review from a team as a code owner October 9, 2024 01:35
Copy link
Contributor

github-actions bot commented Oct 9, 2024

⚠️ Release notes required, but author opted out

Warning

Author opted out of release notes, check is disabled for this pull request.
cc @dotnet/fsharp-team-msft

@KevinRansom KevinRansom added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Oct 9, 2024
@ellahathaway
Copy link
Member

ellahathaway commented Oct 9, 2024

I'm validating this for source-build. Please wait on merging this until I finish validation (~2 hours)

So far - stage 1 build looks good. Waiting on stage 2 build.

[Test run](https://dev.azure.com/dnceng/internal/_build/results?buildId=2556650&view=results (internal Microsoft link)

ellahathaway added a commit to dotnet/sdk that referenced this pull request Oct 9, 2024
@KevinRansom KevinRansom merged commit c3eb162 into dotnet:release/dev17.12 Oct 9, 2024
32 of 33 checks passed
psfinaki pushed a commit that referenced this pull request Oct 23, 2024
* Revert PR - Make the interaction between #line and #nowarn directives consistent (#17859)

* merge

* revert Reverting PR - Make the interaction between #line and #nowarn directives consistent

* Update LanguageFeatures.fs

---------

Co-authored-by: Kevin Ransom (msft) <codecutter@hotmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
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
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants