Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address PR feedback: add spaces, comment, issue links, and update Api…
…_ tests

- Add spaces around != operator in condition
- Add comment explaining why condition is needed
- Link to issue #51785 in test summaries
- Use HaveStdOut instead of HaveStdOutContaining to ensure no warnings
- Update Api_Diagnostic_01 and Api_Diagnostic_02 tests with condition

Co-authored-by: jjonescz <[email protected]>
  • Loading branch information
Copilot and jjonescz committed Nov 18, 2025
commit 0bc03f46b1391be6a94b78ba2b9c47761671cb61
5 changes: 4 additions & 1 deletion src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1412,9 +1412,12 @@ public static void WriteProjectFile(
{
Debug.Assert(targetFilePath is not null);

// Only add explicit Compile item when EnableDefaultCompileItems is not true.
// When EnableDefaultCompileItems=true, the file is included via default MSBuild globbing.
// See https://github.com/dotnet/sdk/issues/51785
writer.WriteLine($"""
<ItemGroup>
<Compile Condition="'$(EnableDefaultCompileItems)'!='true'" Include="{EscapeValue(targetFilePath)}" />
<Compile Condition="'$(EnableDefaultCompileItems)' != 'true'" Include="{EscapeValue(targetFilePath)}" />
</ItemGroup>

""");
Expand Down
12 changes: 6 additions & 6 deletions test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@ public void ClassLibrary_EntryPointFileDoesNotExist()

/// <summary>
/// Other files in the folder are not part of the compilation.
/// See <see href="https://github.com/dotnet/sdk/issues/51785"/>.
/// </summary>
[Fact]
public void MultipleFiles_RunEntryPoint()
Expand All @@ -750,12 +751,12 @@ public void MultipleFiles_RunEntryPoint()
.WithWorkingDirectory(testInstance.Path)
.Execute()
.Should().Pass()
.And.NotHaveStdOutContaining("warning CS2002")
.And.HaveStdOutContaining("Hello, String from Util");
.And.HaveStdOut("Hello, String from Util");
}

/// <summary>
/// Setting EnableDefaultCompileItems=true via Directory.Build.props should not cause CS2002 warning.
/// See <see href="https://github.com/dotnet/sdk/issues/51785"/>.
/// </summary>
[Fact]
public void MultipleFiles_EnableDefaultCompileItemsViaDirectoryBuildProps()
Expand All @@ -775,8 +776,7 @@ public void MultipleFiles_EnableDefaultCompileItemsViaDirectoryBuildProps()
.WithWorkingDirectory(testInstance.Path)
.Execute()
.Should().Pass()
.And.NotHaveStdOutContaining("warning CS2002")
.And.HaveStdOutContaining("Hello, String from Util");
.And.HaveStdOut("Hello, String from Util");
}

/// <summary>
Expand Down Expand Up @@ -4032,7 +4032,7 @@ public void Api_Diagnostic_01()
</PropertyGroup>

<ItemGroup>
<Compile Include="{programPath}" />
<Compile Condition="'$(EnableDefaultCompileItems)' != 'true'" Include="{programPath}" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -4102,7 +4102,7 @@ public void Api_Diagnostic_02()
</PropertyGroup>

<ItemGroup>
<Compile Include="{programPath}" />
<Compile Condition="'$(EnableDefaultCompileItems)' != 'true'" Include="{programPath}" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading