Merge branch 'main' of https://github.com/dotnet/SDK into darc-main-835cd6c5-a3a2-4816-bd44-a1a27df4212f

Author: Simon Zhao (BEYONDSOFT CONSULTING INC)

.github/workflows/copilot-setup-steps.yml

@@ -25,6 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Do an initial build to ensure all dependencies are restored
+        continue-on-error: true
         run: |
           ./build.sh
       - name: Put repo-local dotnet install on PATH

CODEOWNERS

@@ -34,12 +34,16 @@
 /test/dotnet-format.UnitTests @arunchndr
 
 # Area-NuGet
-/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
-/test/dotnet-add-package.Tests @dotnet/nuget-team
-/src/Cli/dotnet/commands/dotnet-nuget @dotnet/nuget-team
-/test/dotnet-nuget.UnitTests @dotnet/nuget-team
-/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package @dotnet/nuget-team
-/test/dotnet-list-package.Tests @dotnet/nuget-team
+/src/Cli/dotnet/Commands/NuGet @dotnet/nuget-team
+/src/Cli/dotnet/Commands/Pack @dotnet/nuget-team
+/src/Cli/dotnet/Commands/Package @dotnet/nuget-team
+/src/Cli/dotnet/Commands/Restore @dotnet/nuget-team
+/test/Microsoft.NET.Restore.Tests @dotnet/nuget-team
+/test/Microsoft.NET.Pack.Tests @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/NuGet @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/Pack @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/Package @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
 
 # Area-FSharp
 /src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp

Directory.Packages.props

@@ -108,6 +108,7 @@
     <PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
     <PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
     <PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
     <PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
     <!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->

documentation/general/dotnet-run-file.md

@@ -45,6 +45,8 @@ Additionally, the implicit project file has the following customizations:
     string? directoryPath = AppContext.GetData("EntryPointFileDirectoryPath") as string;
     ```
 
+  - `FileBasedProgram` property is set to `true` and can be used by SDK targets to detect file-based apps.
+
 ## Grow up
 
 When file-based programs reach an inflection point where build customizations in a project file are needed,
@@ -78,6 +80,7 @@ The file-based build and run kicks in only when:
 - if the target file exists, and has the `.cs` file extension or contents that start with `#!`.
 
 Otherwise, project-based `dotnet run` fallback is used and you might get an error like "Couldn't find a project to run."
+You can explicitly use the `--file` option to avoid the fallback behavior.
 
 File-based programs are processed by `dotnet run` equivalently to project-based programs unless specified otherwise in this document.
 For example, the remaining command-line arguments after the first argument (the target path) are passed through to the target app
@@ -88,7 +91,7 @@ If a dash (`-`) is given instead of the target path (i.e., `dotnet run -`), the
 In this case, the current working directory is not used to search for other files (launch profiles, other sources in case of multi-file apps);
 the compilation consists solely of the single file read from the standard input.
 
-`dotnet path.cs` is a shortcut for `dotnet run path.cs` provided that `path.cs` is a valid [target path](#target-path) (`dotnet -` is currently not supported).
+`dotnet path.cs` is a shortcut for `dotnet run --file path.cs` provided that `path.cs` is a valid [target path](#target-path) (`dotnet -` is currently not supported).
 
 ### Other commands
 
@@ -100,6 +103,9 @@ To opt out, use `#:property PublishAot=false` directive in your `.cs` file.
 
 Command `dotnet clean file.cs` can be used to clean build artifacts of the file-based program.
 
+Commands `dotnet package add PackageName --file app.cs` and `dotnet package remove PackageName --file app.cs`
+can be used to manipulate `#:package` directives in the C# files, similarly to what the commands do for project-based apps.
+
 ## Entry points
 
 If a file is given to `dotnet run`, it has to be an *entry-point file*, otherwise an error is reported.
@@ -306,7 +312,7 @@ would need to search for a file-based program in the current directory instead o
 
 We could add a universal option that works with both project-based and file-based programs,
 like `dotnet run --directory ./dir/`. For inspiration, `dotnet test` also has a `--directory` option.
-Furthermore, users might expect there to be a `--file` option, as well. Both could be unified as `--path`.
+We already have a `--file` option. Both could be unified as `--path`.
 
 If we want to also support [multi-entry-point scenarios](#multiple-entry-points),
 we might need an option like `dotnet run --entry ./dir/name` which would work for both `./dir/name.cs` and `./dir/name/name.csproj`.
@@ -376,8 +382,7 @@ We could also add `dotnet compile` command that would be the equivalent of `dotn
 `dotnet clean` could be extended to support cleaning all file-based app outputs,
 e.g., `dotnet clean --all-file-based-apps`.
 
-Adding references via `dotnet package add`/`dotnet reference add` could be supported for file-based programs as well,
-i.e., the command would add a `#:package`/`#:project` directive to the top of a `.cs` file.
+More NuGet commands (like `dotnet nuget why` or `dotnet package list`) could be supported for file-based programs as well.
 
 ### Explicit importing
 

eng/Packages.props

@@ -4,9 +4,10 @@
   <!-- Packages must be set to their package version property if it exists (ex. BenchmarkDotNetVersion) since source-build uses
   these properties to override package versions if necessary. -->
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-    <PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
-    <PackageVersion Update="Verify.DiffPlex" Condition="'$(VerifyDiffPlexVersion)' != ''" Version="$(VerifyDiffPlexVersion)" />
+    <PackageVersion Update="DiffPlex" Condition="'$(DiffPlexVersion)' != ''" Version="$(DiffPlexVersion)" />
     <PackageVersion Update="FakeItEasy" Condition="'$(FakeItEasyVersion)' != ''" Version="$(FakeItEasyVersion)" />
+    <PackageVersion Update="Verify.DiffPlex" Condition="'$(VerifyDiffPlexVersion)' != ''" Version="$(VerifyDiffPlexVersion)" />
+    <PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
     <PackageVersion Update="Wcwidth.Sources" Condition="'$(WcwidthSourcesVersion)' != ''" Version="$(WcwidthSourcesVersion)" />
   </ItemGroup>
 </Project>

eng/Version.Details.props

@@ -0,0 +1 @@
+<!-- will get filled in the next backflow -->