Skip to content

[automated] Merge branch 'release/10.0.4xx' => 'main' #54500

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

Open
github-actions wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[automated] Merge branch 'release/10.0.4xx' => 'main' #54500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6adadc0
Backport CI/product stability fixes from #53424 to release/10.0.4xx
Copilot May 20, 2026
3373a6f
Backport gzip retry logic and redirected-input console guard from #53424
Copilot May 20, 2026
f34ff92
Allow some duplicate #: directives (#54206)
jjonescz May 25, 2026
e9bc8a8
Fix --environment variables not applied without launch profile
Evangelink Mar 6, 2026
15bcfeb
[release/10.0.4xx] Fix --environment variables not applied to test pr…
Evangelink May 26, 2026
45d7066
Add Microsoft.DotNet.ProjectTools.csproj to cli.slnf (#54411)
jjonescz May 27, 2026
73d7c1c
Backport gzip I/O retry logic and redirected-input console guard to r…
marcpopMSFT May 28, 2026
0c06be5
File-based apps: support `#:include .dll` by default (#54396)
jjonescz May 29, 2026
69f55b5
Reset files to main
github-actions[bot] May 29, 2026
013df70
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
DonnaChen888 May 29, 2026
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
1 change: 1 addition & 0 deletions cli.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"src\\Cli\\dn\\dn-native-debug.vcxproj",
"src\\Cli\\dotnet\\dotnet.csproj",
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
"src\\Microsoft.DotNet.ProjectTools\\Microsoft.DotNet.ProjectTools.csproj",
"test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj",
"test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj",
"test\\dotnet-aot.Tests\\dotnet-aot.Tests.csproj",
Expand Down
2 changes: 1 addition & 1 deletion documentation/general/dotnet-run-file.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ The directives are processed as follows:
- Each `#:include` is injected as `<{1} Include="{0}" />` in an `<ItemGroup>`
where `{0}` is the directive's value and `{1}` is determined by its extension.
The mapping can be customized by setting the MSBuild property `FileBasedProgramsItemMapping`
which is by default set to `.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content`.
which is by default set to `.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content;.dll=Reference`.

It is an error if the value is empty.

Expand Down
5 changes: 3 additions & 2 deletions src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ public sealed class IncludeOrExclude(in ParseInfo info) : Named(info)
{
public const string MappingPropertyName = "FileBasedProgramsItemMapping";

public static string DefaultMappingString => ".cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content";
public static string DefaultMappingString => ".cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content;.dll=Reference";

public static ImmutableArray<(string Extension, string ItemType)> DefaultMapping
{
Expand All @@ -706,6 +706,7 @@ public sealed class IncludeOrExclude(in ParseInfo info) : Named(info)
(".resx", "EmbeddedResource"),
(".json", "None"),
(".razor", "Content"),
(".dll", "Reference"),
];
}

Expand Down Expand Up @@ -833,7 +834,7 @@ public string KindToMSBuildString()
SourceFile sourceFile,
ErrorReporter errorReporter)
{
var pairs = value.Split(';');
var pairs = value.Split([';'], StringSplitOptions.RemoveEmptyEntries);

var builder = ImmutableArray.CreateBuilder<(string Extension, string ItemType)>(pairs.Length);

Expand Down
11 changes: 3 additions & 8 deletions test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,6 @@ public static class LibClass
var libDllProjectPath = Path.Join("Lib", "bin", "Debug", ToolsetInfo.CurrentTargetFramework, "Lib.dll");

File.WriteAllText(Path.Join(testInstance.Path, "Program.cs"), $$"""
#:property FileBasedProgramsItemMapping=.dll=Reference
#:include {{libDllDirectivePath}}
Console.WriteLine(Lib.LibClass.GetMessage());
""");
Expand Down Expand Up @@ -1851,7 +1850,6 @@ public static class LibClass
<PublishAot>true</PublishAot>
<PackAsTool>true</PackAsTool>
<UserSecretsId>Program-*</UserSecretsId>
<FileBasedProgramsItemMapping>.dll=Reference</FileBasedProgramsItemMapping>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -1908,7 +1906,6 @@ public static class LibClass
Path.Join(testInstance.Path, "Lib.dll"));

File.WriteAllText(Path.Join(testInstance.Path, "Program.cs"), """
#:property FileBasedProgramsItemMapping=.dll=Reference
#:include *.dll
Console.WriteLine(Lib.LibClass.GetMessage());
""");
Expand Down Expand Up @@ -1976,6 +1973,9 @@ public static class LibClass

File.WriteAllText(Path.Join(srcDir, "Directory.Build.props"), $"""
<Project>
<PropertyGroup>
<{CSharpDirective.IncludeOrExclude.MappingPropertyName}></{CSharpDirective.IncludeOrExclude.MappingPropertyName}>
</PropertyGroup>
<ItemGroup>
<Reference Include="$(MSBuildThisFileDirectory){libDllPropsPath}" />
</ItemGroup>
Expand Down Expand Up @@ -2050,9 +2050,6 @@ public static class LibClass

File.WriteAllText(Path.Join(srcDir, "Directory.Build.props"), $"""
<Project>
<PropertyGroup>
<FileBasedProgramsItemMapping>.dll=Reference</FileBasedProgramsItemMapping>
</PropertyGroup>
<ItemGroup>
<Reference Include="$(MSBuildThisFileDirectory){libDllPropsPath}" />
</ItemGroup>
Expand Down Expand Up @@ -2121,7 +2118,6 @@ public static class LibClass
var libDllProjectPath = Path.Join("Lib", "bin", "Debug", ToolsetInfo.CurrentTargetFramework, "Lib.dll");

File.WriteAllText(Path.Join(testInstance.Path, "extra.cs"), $$"""
#:property FileBasedProgramsItemMapping=.dll=Reference
#:include {{libDllDirectivePath}}
""");

Expand Down Expand Up @@ -2201,7 +2197,6 @@ public static class DependencyClass

File.WriteAllText(Path.Join(libDir, "lib.cs"), $$"""
#:property OutputType=Library
#:property FileBasedProgramsItemMapping=.dll=Reference
#:include {{dependencyDllDirectivePath}}
namespace MyLib;
public static class Wrapper
Expand Down
8 changes: 4 additions & 4 deletions test/dotnet.Tests/CommandTests/Run/RunFileTests_CscOnlyAndApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@ public void Api()
<PackageOutputPath>artifacts/$(AssemblyName)</PackageOutputPath>
<FileBasedProgram>true</FileBasedProgram>
<EntryPointFilePath>{programPath}</EntryPointFilePath>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content</FileBasedProgramsItemMapping>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content;.dll=Reference</FileBasedProgramsItemMapping>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -1447,7 +1447,7 @@ public void Api_Evaluation()
<PackageOutputPath>artifacts/$(AssemblyName)</PackageOutputPath>
<FileBasedProgram>true</FileBasedProgram>
<EntryPointFilePath>{programPath}</EntryPointFilePath>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content</FileBasedProgramsItemMapping>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content;.dll=Reference</FileBasedProgramsItemMapping>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
Expand Down Expand Up @@ -1523,7 +1523,7 @@ public void Api_Diagnostic_01()
<PackageOutputPath>artifacts/$(AssemblyName)</PackageOutputPath>
<FileBasedProgram>true</FileBasedProgram>
<EntryPointFilePath>{programPath}</EntryPointFilePath>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content</FileBasedProgramsItemMapping>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content;.dll=Reference</FileBasedProgramsItemMapping>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
Expand Down Expand Up @@ -1598,7 +1598,7 @@ public void Api_Diagnostic_02()
<PackageOutputPath>artifacts/$(AssemblyName)</PackageOutputPath>
<FileBasedProgram>true</FileBasedProgram>
<EntryPointFilePath>{programPath}</EntryPointFilePath>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content</FileBasedProgramsItemMapping>
<FileBasedProgramsItemMapping>.cs=Compile;.resx=EmbeddedResource;.json=None;.razor=Content;.dll=Reference</FileBasedProgramsItemMapping>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
Expand Down
Loading