File-based apps: add support for `#:include` by jjonescz · Pull Request #52347 · dotnet/sdk

jjonescz · 2026-01-07T16:06:24Z

Resolves #48174.
Fixes part of #50912 (changes to files are detected, new file additions are not, except for #:include).

jjonescz · 2026-01-07T16:08:49Z

src/Cli/dotnet/Commands/Run/Api/RunApiCommand.cs

            VirtualProjectBuilder.WriteProjectFile(
                csprojWriter,
-                directives,
+                evaluatedDirectives,


I've noticed the run-api doesn't evaluate directives, so I've fixed that, and added tests for it.

jjonescz · 2026-01-07T16:11:13Z

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileBasedProgramsResources.resx

    <value>Unrecognized directive '{0}'.</value>
    <comment>{0} is the directive name like 'package' or 'sdk'.</comment>
  </data>
-  <data name="EmptyTempPath" xml:space="preserve">


This is not used in the package, so moved out.

jjonescz · 2026-01-07T16:12:47Z

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs


    public readonly struct ParseInfo
    {
+        public required SourceFile SourceFile { get; init; }


Need to know source file that directives come from to evaluate relative paths in #:include/#:exclude directives, so moved this from ParseContext to ParseInfo.

jjonescz · 2026-01-07T16:17:00Z

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs

 }

-internal delegate void ErrorReporter(SourceFile sourceFile, TextSpan textSpan, string message);
+internal delegate void ErrorReporter(SourceFile sourceFile, TextSpan textSpan, string message, Exception? innerException = null);


The inner exception used to be passed but got lost in this refactoring: #51995, so I've restored it.

jjonescz · 2026-01-07T16:21:05Z

src/Microsoft.DotNet.ProjectTools/VirtualProjectBuilder.cs

    }

-    public static void RemoveDirectivesFromFile(ImmutableArray<CSharpDirective> directives, SourceText text, string filePath)
+    public static void RemoveDirectivesFromFile(ImmutableArray<CSharpDirective> directives, SourceFile sourceFile, string targetFilePath)


This function did not used to save the file if not modified - I don't think that was intentional but it worked thanks to the project convert command copying all Compile items anyway. It all works differently (better) now.

jjonescz · 2026-01-07T16:21:41Z

test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs


-    private static void Convert(string inputCSharp, out string actualProject, out string? actualCSharp, bool force, string? filePath,
-        bool collectDiagnostics, out ImmutableArray<SimpleDiagnostic>.Builder? actualDiagnostics)
+    private static void Convert(


Unified the helpers here.

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs

DamianEdwards · 2026-01-17T18:02:00Z

@mmitche @jjonescz was this closed intentionally?

jjonescz · 2026-01-19T09:27:15Z

I don't know why this should be closed, reopening.

DamianEdwards · 2026-01-20T15:54:00Z

documentation/general/dotnet-run-file.md

  Relative paths are resolved relative to the file containing the directive.

-  This is currently gated under a feature flag that can be enabled by setting the MSBuild property `ExperimentalFileBasedProgramEnableIncludeDirective=true`.
+  This directive is currently gated under a feature flag that can be enabled by setting the MSBuild property `ExperimentalFileBasedProgramEnableIncludeDirective=true`.


Suitably verbose property name

mmitche · 2026-01-20T18:16:26Z

It got closed unintentionally because the base branch (3xx) got re-created.

jjonescz · 2026-01-22T09:41:43Z

@333fred @RikkiGibson @MiYanni this is ready for reviews, thanks :)

333fred

Done reviewing the implementation. I have not looked at the tests.

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs

src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommand.cs

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

jjonescz · 2026-02-23T09:39:24Z

@333fred for another look, thanks

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs

commit 3d009596d1c130ded9be7576d45a4e3cc8a31d41 Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Date: Thu Mar 12 08:10:03 2026 -0700 [sdk] Source update 6e514f6 → 8cbac4a Diff: https://github.com/dotnet/sdk/compare/6e514f6189902a6422a6ab91324804c37035315b..8cbac4a5cdf27c2bb606a282cc47e60a7c4ced45 From: dotnet/sdk@6e514f6 To: dotnet/sdk@8cbac4a [[ commit created by automation ]] ``` C:\sdk>darc vmr forwardflow --build 303236 --vmr C:\dotnet info: Flowing build 20260224.4 (303236) of commit 8cbac4a... info: Making sure commit '8cbac4a5cdf27c2bb606a282cc47e60a7c4ced45' is present in repository 'C:\sdk'... info: Flowing sdk's commit 8cbac4a to VMR at C:\dotnet... info: Last flow was back flow: d346a57 -> f284d9f49aec157d49233ab5785cbcf78ed1ea58 info: Current flow is in the opposite direction info: Creating a working branch darc/forward/8cbac4a-d346a57 info: Synchronizing sdk from 6e514f6189902a6422a6ab91324804c37035315b to https://github.com/dotnet/sdk / 8cbac4a5cdf27c2bb606a282cc47e60a7c4ced45 info: Updating VMR sdk from 6e514f6 to 8cbac4a.. info: Rebasing darc/forward/8cbac4a-d346a57 onto UpdateSdk1... info: Auto-resolving expected conflicts... info: Successfully auto-resolved 1 expected conflicts info: Resolving dependency updates in source 6e514f6189902a6422a6ab91324804c37035315b..HEAD and target d346a57..UpdateSdk1 info: Changes staged in C:\dotnet info: PRs from original repository included in this codeflow update: - dotnet/sdk#53090 - dotnet/sdk#52347 - dotnet/sdk#53100 - dotnet/sdk#53056 ```

jjonescz added the Area-run-file Items related to the "dotnet run <file>" effort label Jan 7, 2026

jjonescz force-pushed the sprint-include branch from bf9dc98 to d13a3f2 Compare January 7, 2026 16:23

This was referenced Jan 7, 2026

Could Not Resolve SDK - repo testfx issue #51530

Open

[failing test] Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAWindowsRuntimeComponent.ManagedWinRTComponentCanBeReferenced #52131

Closed

jjonescz force-pushed the sprint-include branch from d13a3f2 to c06c1fc Compare January 8, 2026 15:16

File-based apps: add support for #:include

d64bb1a

jjonescz force-pushed the sprint-include branch from c06c1fc to d64bb1a Compare January 8, 2026 16:57

jjonescz marked this pull request as ready for review January 8, 2026 17:59

jjonescz requested a review from a team as a code owner January 8, 2026 17:59

jjonescz commented Jan 8, 2026

View reviewed changes

jjonescz requested a review from a team January 8, 2026 17:59

DamianEdwards reviewed Jan 8, 2026

View reviewed changes

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs Outdated Show resolved Hide resolved

mmitche deleted the branch dotnet:release/10.0.3xx January 17, 2026 00:38

mmitche closed this Jan 17, 2026

jjonescz reopened this Jan 19, 2026

jjonescz changed the base branch from release/10.0.2xx to release/10.0.3xx January 19, 2026 09:28

jjonescz added 5 commits January 19, 2026 10:32

Merge branch 'release/10.0.3xx' into sprint-include

453ea36

Fixup field name

df360ad

Add feature flags

182a739

Allow extending the mapping

3704a1e

Improve item mapping handling

43b0a55

DamianEdwards reviewed Jan 20, 2026

View reviewed changes

MiYanni approved these changes Jan 22, 2026

View reviewed changes

jjonescz requested review from 333fred and RikkiGibson February 4, 2026 14:33

RikkiGibson mentioned this pull request Feb 5, 2026

File-based apps: #:include scenario when entry point opened manually dotnet/roslyn#82292

Open

333fred reviewed Feb 17, 2026

View reviewed changes

jjonescz added 3 commits February 18, 2026 12:05

Hard-code DefaultMapping

c6b665d

Simplify check via a pattern

283594a

Remove duplicated code

b791a15

jjonescz mentioned this pull request Feb 18, 2026

Up-to-date optimization of dotnet run file.cs should check for newly added sources #53068

Closed

Extend tests for dotnet#53068

3e294d0

jjonescz added 6 commits February 19, 2026 14:42

Remove unnecessary interpolation designator

0543766

Fix #:project as transitive directive

4f80d75

Skip up-to-date optimization when there are globs

06da314

Fix assert

745c8fb

Avoid evaluating project twice during run

90f4700

Avoid using shared temp dir

5f1eb1d

build-analysis bot mentioned this pull request Feb 19, 2026

dotnet-watch tests failing #40006

Open

jjonescz mentioned this pull request Feb 19, 2026

VirtualProjectBuilder surface cleanup #53088

Closed

jjonescz requested a review from 333fred February 20, 2026 09:36

333fred reviewed Feb 23, 2026

View reviewed changes

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs Show resolved Hide resolved

src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs Show resolved Hide resolved

333fred approved these changes Feb 23, 2026

View reviewed changes

Merge branch 'release/10.0.3xx' into sprint-include

74ea914

jjonescz enabled auto-merge (squash) February 24, 2026 09:53

jjonescz merged commit 32c9942 into dotnet:release/10.0.3xx Feb 24, 2026
28 checks passed

jjonescz deleted the sprint-include branch February 24, 2026 12:49

This was referenced Feb 24, 2026

[release/10.0.3xx] Source code updates from dotnet/sdk dotnet/dotnet#5052

Closed

[release/10.0.3xx] Source code updates from dotnet/sdk dotnet/dotnet#5177

Closed

dotnet-maestro bot mentioned this pull request Mar 11, 2026

[main] Source code updates from dotnet/sdk dotnet/dotnet#5402

Merged

dotnet-maestro bot mentioned this pull request Mar 12, 2026

[release/10.0.3xx] Source code updates from dotnet/sdk dotnet/dotnet#5421

Open

Conversation

jjonescz commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jjonescz Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

jjonescz Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

jjonescz Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

jjonescz Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

jjonescz Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

jjonescz Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DamianEdwards commented Jan 17, 2026

Uh oh!

jjonescz commented Jan 19, 2026

Uh oh!

DamianEdwards Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

mmitche commented Jan 20, 2026

Uh oh!

jjonescz commented Jan 22, 2026

Uh oh!

333fred left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jjonescz commented Feb 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jjonescz commented Jan 7, 2026 •

edited

Loading