"#if" directive around nullness removed fromsrc/Compiler/DependencyManager/DependencyProvider.fs and refactored. #18207

progressive-galib · 2025-01-07T08:14:15Z

Description

"#if" directive around nullness removed fromsrc/Compiler/DependencyManager/DependencyProvider.fs and refactored.

Related: #18061 (partially addresses)

Checklist

Release notes entry updated: in
docs/release-notes/.FSharp.Compiler.Service/9.0.200.md,

"#if" directive around nullness removed from src Related: dotnet#18061 (partially addresses) - [x] Release notes entry updated: in `docs/release-notes/.FSharp.Compiler.Service/9.0.200.md`,

github-actions · 2025-01-07T08:14:53Z

❗ Release notes required

✅ Found changes and release notes in following paths:

Change path Release notes path Description

src/Compiler docs/release-notes/.FSharp.Compiler.Service/9.0.200.md

T-Gro · 2025-01-07T13:03:05Z

src/Compiler/DependencyManager/DependencyProvider.fs

@@ -122,10 +122,8 @@ type IResolveDependenciesResult =
    /// This path is also equivalent to
    ///     #I @"c:\somepath\to\packages\1.1.1\ResolvedPackage"
    abstract Roots: seq<string>
-
-#if NO_CHECKNULLS
+


The directive is logically negated, i.e. NO_CHECKNULLS.
With SDK 9, we do have null checking support, so the attribute is not needed.

for some reason project build fails when i remove this,
#if NO_CHECKNULLS [<AllowNullLiteral>] #endif

also btw my machine is too weak to build it so i am using your ci/cd. hope its okay....

@T-Gro it fails with

Restore was successful. Restored /Users/runner/work/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24623.3/tools/Tools.proj (in 2.25 sec). /Users/runner/work/1/s/src/FSharp.Build/FSharp.Build.fsproj : error NU1503: Skipping restore for project '/Users/runner/work/1/s/src/FSharp.Build/FSharp.Build.fsproj'. The project file may be invalid or missing targets required for restore. [/Users/runner/work/1/s/FSharp.sln] ##[error]src/FSharp.Build/FSharp.Build.fsproj(0,0): error NU1503: (NETCORE_ENGINEERING_TELEMETRY=Restore) Skipping restore for project '/Users/runner/work/1/s/src/FSharp.Build/FSharp.Build.fsproj'. The project file may be invalid or missing targets required for restore. /Users/runner/work/1/s/tests/service/data/TestTP/TestTP.fsproj : error NU1503: Skipping restore for project '/Users/runner/work/1/s/tests/service/data/TestTP/TestTP.fsproj'. The project file may be invalid or missing targets required for restore. [/Users/runner/work/1/s/FSharp.sln] ##[error]tests/service/data/TestTP/TestTP.fsproj(0,0): error NU1503: (NETCORE_ENGINEERING_TELEMETRY=Restore) Skipping restore for project '/Users/runner/work/1/s/tests/service/data/TestTP/TestTP.fsproj'. The project file may be invalid or missing targets required for restore. /Users/runner/work/1/s/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj : error NU1503: Skipping restore for project '/Users/runner/work/1/s/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj'. The project file may be invalid or missing targets required for restore. [/Users/runner/work/1/s/FSharp.sln] ##[error]tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj(0,0): error NU1503: (NETCORE_ENGINEERING_TELEMETRY=Restore) Skipping restore for project '/Users/runner/work/1/s/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj'. The project file may be invalid or missing targets required for restore. /Users/runner/work/1/s/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj : error NU1503: Skipping restore for project '/Users/runner/work/1/s/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj'. The project file may be invalid or missing targets required for restore. [/Users/runner/work/1/s/FSharp.sln] ##[error]tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj(0,0): error NU1503: (NETCORE_ENGINEERING_TELEMETRY=Restore) Skipping restore for project '/Users/runner/work/1/s/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj'. The project file may be invalid or missing targets required for restore. /Users/runner/work/1/s/tests/benchmarks/FSharp.Benchmarks.Common/FSharp.Benchmarks.Common.fsproj : error NU1503: Skipping restore for project '/Users/runner/work/1/s/tests/benchmarks/FSharp.Benchmarks.Common/FSharp.Benchmarks.Common.fsproj'. The project file may be invalid or missing targets required for restore. [/Users/runner/work/1/s/FSharp.sln] ##[error]tests/benchmarks/FSharp.Benchmarks.Common/FSharp.Benchmarks.Common.fsproj(0,0): error NU1503: (NETCORE_ENGINEERING_TELEMETRY=Restore) Skipping restore for project '/Users/runner/work/1/s/tests/benchmarks/FSharp.Benchmarks.Common/FSharp.Benchmarks.Common.fsproj'. The project file may be invalid or missing targets required for restore. Determining projects to restore... /Users/runner/work/1/s/src/FSharp.Core/FSharp.Core.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=netstandard2.0] ##[error]src/FSharp.Core/FSharp.Core.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project. /Users/runner/work/1/s/src/fsc/fscProject/fsc.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=net9.0] ##[error]src/fsc/fscProject/fsc.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project. /Users/runner/work/1/s/src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=netstandard2.0] ##[error]src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project. /Users/runner/work/1/s/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=net9.0] ##[error]tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project. /Users/runner/work/1/s/tests/fsharp/FSharpSuite.Tests.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=net9.0] ##[error]tests/fsharp/FSharpSuite.Tests.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project. /Users/runner/work/1/s/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=net9.0] ##[error]tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project. /Users/runner/work/1/s/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=net9.0] ##[error]tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj(0,0): error MSB4057: (NETCORE_ENGINEERING_TELEMETRY=Restore) The target "_GetRestoreSettingsPerFramework" does not exist in the project.

my guess is it has something to makefiles or buildscripts or whatever f# equivalent there is.

git checkout cf575d3

T-Gro · 2025-01-08T08:52:29Z

/run fantomas

T-Gro · 2025-01-08T08:52:34Z

/azp run

azure-pipelines · 2025-01-08T08:52:50Z

Azure Pipelines successfully started running 2 pipeline(s).

github-actions · 2025-01-08T08:53:46Z

Failed to run fantomas: https://github.com/dotnet/fsharp/actions/runs/12667153205

T-Gro · 2025-01-08T08:53:46Z

src/Compiler/DependencyManager/DependencyProvider.fs

@@ -160,15 +160,15 @@ type ReflectionDependencyManagerProvider

    let instance =
        if not (isNull (theType.GetConstructor([| typeof<string option>; typeof<bool> |]))) then
-            Activator.CreateInstance(theType, [| outputDir :> objnull; useResultsCache :> objnull |])
+            Activator.CreateInstance(theType, [| outputDir :> obj | null; useResultsCache :> obj | null |])


objnull is an alias which became part of the public API of FSharp.Core -> that one can remain.
It is just an alias to obj|null, both are fine.

T-Gro · 2025-01-08T08:55:48Z

Does "dotnet fantomas ." fail for you locally as well?
What if you manually try updating to a newer Fantomas version?
(if it is because of |null, it might need a tool update)

Martin521 · 2025-01-08T09:32:51Z

I guess the changed files must temporarily be put into the nullness section of .fantomasignore until fantomas 7 is out.

psfinaki · 2025-01-09T12:17:29Z

So I took a look:

dotnet fantomas . indeed fails locally here
the fantomas version we have is the latest available in our feeds
we could update the feeds and the fantomas version but the newest fantomas (6.3.16) just throws StackOverflow on our repo (even main)

(fyi @nojaf)

So I think @progressive-galib the best we can do here is to revert formatting changes (and also the ones which are deemed not necessary by @T-Gro) and put the DependencyProvider to the .fantomasignore.

Sorry for the inconvenience here, nulls shook the F# ecosystem a bit. Other files might cause less problems :)

nojaf · 2025-01-09T12:48:04Z

Hi,

Could you try the latest beta maybe? That has initial support for all the nullness stuff: https://www.nuget.org/packages/fantomas/7.0.0-beta-001

You PR here will need to be ignored (via .fantomasignore) as it seems to have nullness syntax.

psfinaki · 2025-01-09T17:20:28Z

I think it behaves differently and does some changes, but eventually the beta also throws SO :/

nojaf · 2025-01-10T08:03:01Z

@psfinaki could you share some more details? Latest beta worked for me on this branch.

progressive-galib · 2025-01-11T16:23:40Z

@psfinaki could you share some more details? Latest beta worked for me on this branch.

could you push cause it fails on my machine.

nojaf · 2025-01-11T17:02:26Z

You need to ignore the file for now.

progressive-galib and others added 2 commits January 7, 2025 08:08

/Compiler/TypedTree/TypedTreePickle.fs refactored.

3fddcbc

"#if" directive around nullness removed from src Related: dotnet#18061 (partially addresses) - [x] Release notes entry updated: in `docs/release-notes/.FSharp.Compiler.Service/9.0.200.md`,

Merge branch 'dotnet:main' into 18061-DependencyProvider

877b7f1

progressive-galib requested a review from a team as a code owner January 7, 2025 08:14

try 2

851c0d5

T-Gro reviewed Jan 7, 2025

View reviewed changes

progressive-galib and others added 2 commits January 7, 2025 15:00

refactoring

a4c56aa

Merge branch 'main' into 18061-DependencyProvider

3d02838

progressive-galib marked this pull request as draft January 7, 2025 16:02

progressive-galib added 2 commits January 7, 2025 16:06

.

8441ede

.

cb74ce7

progressive-galib marked this pull request as ready for review January 7, 2025 16:32

progressive-galib added 2 commits January 7, 2025 17:29

lets hope this works

bffe6d6

.

cf575d3

progressive-galib force-pushed the 18061-DependencyProvider branch from bfbca20 to cf575d3 Compare January 7, 2025 19:13

T-Gro reviewed Jan 8, 2025

View reviewed changes

fantomas tried with a bit of tricks DependencyProvider.fs

dd8ae98

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

"#if" directive around nullness removed fromsrc/Compiler/DependencyManager/DependencyProvider.fs and refactored. #18207

"#if" directive around nullness removed fromsrc/Compiler/DependencyManager/DependencyProvider.fs and refactored. #18207

progressive-galib commented Jan 7, 2025

github-actions bot commented Jan 7, 2025 •

edited

Loading

T-Gro Jan 7, 2025

progressive-galib Jan 7, 2025

progressive-galib Jan 7, 2025

progressive-galib Jan 7, 2025

progressive-galib Jan 7, 2025

T-Gro commented Jan 8, 2025

T-Gro commented Jan 8, 2025

azure-pipelines bot commented Jan 8, 2025

github-actions bot commented Jan 8, 2025

T-Gro Jan 8, 2025

T-Gro commented Jan 8, 2025

Martin521 commented Jan 8, 2025

psfinaki commented Jan 9, 2025

nojaf commented Jan 9, 2025 •

edited

Loading

psfinaki commented Jan 9, 2025

nojaf commented Jan 10, 2025

progressive-galib commented Jan 11, 2025 •

edited

Loading

nojaf commented Jan 11, 2025

"#if" directive around nullness removed fromsrc/Compiler/DependencyManager/DependencyProvider.fs and refactored. #18207

Are you sure you want to change the base?

"#if" directive around nullness removed fromsrc/Compiler/DependencyManager/DependencyProvider.fs and refactored. #18207

Conversation

progressive-galib commented Jan 7, 2025

Description

Checklist

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

❗ Release notes required

T-Gro Jan 7, 2025

Choose a reason for hiding this comment

progressive-galib Jan 7, 2025

Choose a reason for hiding this comment

progressive-galib Jan 7, 2025

Choose a reason for hiding this comment

progressive-galib Jan 7, 2025

Choose a reason for hiding this comment

progressive-galib Jan 7, 2025

Choose a reason for hiding this comment

T-Gro commented Jan 8, 2025

T-Gro commented Jan 8, 2025

azure-pipelines bot commented Jan 8, 2025

github-actions bot commented Jan 8, 2025

T-Gro Jan 8, 2025

Choose a reason for hiding this comment

T-Gro commented Jan 8, 2025

Martin521 commented Jan 8, 2025

psfinaki commented Jan 9, 2025

nojaf commented Jan 9, 2025 • edited Loading

psfinaki commented Jan 9, 2025

nojaf commented Jan 10, 2025

progressive-galib commented Jan 11, 2025 • edited Loading

nojaf commented Jan 11, 2025

github-actions bot commented Jan 7, 2025 •

edited

Loading

nojaf commented Jan 9, 2025 •

edited

Loading

progressive-galib commented Jan 11, 2025 •

edited

Loading