Skip to content

Remove redundant ifdef #18284

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 29, 2025
Merged

Remove redundant ifdef #18284

merged 1 commit into from
Jan 29, 2025

Conversation

majocha
Copy link
Contributor

@majocha majocha commented Jan 29, 2025

Looks like the code in both #if branches is exactly the same:

fsharp/src/Compiler/TypedTree/TypeProviders.fs

Lines 125 to 143 in 2edab12

#if FSHARPCORE_USE_PACKAGE
TypeProviderConfig(systemRuntimeContainsType,
ReferencedAssemblies=getReferencedAssemblies(),
ResolutionFolder=resolutionEnvironment.ResolutionFolder,
RuntimeAssembly=runtimeAssemblyPath,
TemporaryFolder=resolutionEnvironment.TemporaryFolder,
IsInvalidationSupported=isInvalidationSupported,
IsHostedExecution= isInteractive,
SystemRuntimeAssemblyVersion = systemRuntimeAssemblyVersion)
#else
TypeProviderConfig(systemRuntimeContainsType,
ReferencedAssemblies=getReferencedAssemblies(),
ResolutionFolder=resolutionEnvironment.ResolutionFolder,
RuntimeAssembly=runtimeAssemblyPath,
TemporaryFolder=resolutionEnvironment.TemporaryFolder,
IsInvalidationSupported=isInvalidationSupported,
IsHostedExecution= isInteractive,
SystemRuntimeAssemblyVersion = systemRuntimeAssemblyVersion)
#endif

@majocha majocha requested a review from a team as a code owner January 29, 2025 08:54
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 29, 2025 •
edited
Loading

⚠️ 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

@psfinaki psfinaki added the NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes label Jan 29, 2025
psfinaki
psfinaki approved these changes Jan 29, 2025
View reviewed changes
Copy link
Contributor

@psfinaki psfinaki left a comment

Choose a reason for hiding this comment

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

Indeed! Thanks :)

@0101 0101 merged commit afb15f0 into dotnet:main Jan 29, 2025
33 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@0101 0101 0101 approved these changes

@psfinaki psfinaki psfinaki approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

NO_RELEASE_NOTES Label for pull requests which signals, that user opted-out of providing release notes

Projects

F# Compiler and Tooling
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@majocha @0101 @psfinaki