Merge branch 'main' into darc-main-dfdd07c8-a19b-4a2f-97c3-11cae5af91fc

Author: zivkan

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25305.3",
+      "version": "1.1.0-beta.25312.2",
       "commands": [
         "darc"
       ]

documentation/general/dotnet-run-file.md

@@ -47,7 +47,8 @@ The command takes a path which can be either
 ## Target path
 
 The path passed to `dotnet run ./some/path.cs` is called *the target path*.
-The target path must be a file which has the `.cs` file extension.
+The target path must be a file which either has the `.cs` file extension,
+or a file whose contents start with `#!`.
 *The target directory* is the directory of the target file.
 
 ## Integration into the existing `dotnet run` command
@@ -57,7 +58,7 @@ specifically `file.cs` is passed as the first command-line argument to the targe
 We preserve this behavior to avoid a breaking change.
 The file-based build and run kicks in only when:
 - a project file cannot be found (in the current directory or via the `--project` option), and
-- if the target file exists and has the `.cs` file extension.
+- if the target file exists, and has the `.cs` file extension or contents that start with `#!`.
 
 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
@@ -86,6 +87,10 @@ other files in the target directory or its subdirectories are included in the co
 For example, other `.cs` files but also `.resx` (embedded resources).
 Similarly, implicit build files like `Directory.Build.props` or `Directory.Packages.props` are used during the build.
 
+> [!CAUTION]
+> Multi-file support is postponed for .NET 11.
+> In .NET 10, only the single file passed as the command-line argument to `dotnet run` is part of the compilation.
+
 ### Nested files
 
 If there are nested project files like
@@ -153,14 +158,15 @@ Other directives result in an error, reserving them for future use.
 
 ```cs
 #:sdk Microsoft.NET.Sdk.Web
-#:property TargetFramework net11.0
-#:property LangVersion preview
+#:property TargetFramework=net11.0
+#:property LangVersion=preview
 #:package System.CommandLine@2.0.0-*
 ```
 
-The value must be separated from the name of the directive by white space (`@` is additionally allowed separator for the package directive)
+The value must be separated from the kind (`package`/`sdk`/`property`) of the directive by whitespace
 and any leading and trailing white space is not considered part of the value.
-Any value can optionally have two parts separated by a space (more whitespace characters could be allowed in the future).
+Any value can optionally have two parts separated by `@` in case of `package`/`sdk` or `=` in case of `property`
+and whitespace is trimmed from the two parts around the separator.
 The value of the first `#:sdk` is injected into `<Project Sdk="{0}">` with the separator (if any) replaced with `/`,
 and the subsequent `#:sdk` directive values are split by the separator and injected as `<Sdk Name="{0}" Version="{1}" />` elements (or without the `Version` attribute if there is no separator).
 It is an error if the first part (name) is empty (the version is allowed to be empty, but that results in empty `Version=""`).

eng/Version.Details.xml

@@ -86,8 +86,7 @@ jobs:
         isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
         ${{ if eq(parameters.CreatePr, true) }}:
           isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
-          ${{ if eq(parameters.RepoType, 'gitHub') }}:
-            isShouldReusePrSelected: ${{ parameters.ReusePr }}
+          isShouldReusePrSelected: ${{ parameters.ReusePr }}
         packageSourceAuth: patAuth
         patVariable: ${{ parameters.CeapexPat }}
         ${{ if eq(parameters.RepoType, 'gitHub') }}:
@@ -118,4 +117,4 @@ jobs:
           pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
           publishLocation: Container
           artifactName: Loc
-          condition: ${{ parameters.condition }}
+          condition: ${{ parameters.condition }}

eng/Versions.props

@@ -14,8 +14,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25304.106",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25304.106",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25311.102",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25311.102",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/common/core-templates/job/onelocbuild.yml

@@ -7,10 +7,14 @@
 
 namespace Microsoft.DotNet.Cli.Utils;
 
-public class Command(Process? process, bool trimTrailingNewlines = false) : ICommand
+public class Command(Process? process, bool trimTrailingNewlines = false, IDictionary<string, string?>? customEnvironmentVariables = null) : ICommand
 {
     private readonly Process _process = process ?? throw new ArgumentNullException(nameof(process));
 
+    private readonly Dictionary<string, string?>? _customEnvironmentVariables =
+        // copy the dictionary to avoid mutating the original
+        customEnvironmentVariables == null ? null : new(customEnvironmentVariables);
+
     private StreamForwarder? _stdOut;
 
     private StreamForwarder? _stdErr;
@@ -98,6 +102,7 @@ public ICommand WorkingDirectory(string? projectDirectory)
     public ICommand EnvironmentVariable(string name, string? value)
     {
         _process.StartInfo.Environment[name] = value;
+        _customEnvironmentVariables?[name] = value;
         return this;
     }
 
@@ -185,6 +190,14 @@ public ICommand OnErrorLine(Action<string> handler)
 
     public string CommandArgs => _process.StartInfo.Arguments;
 
+    public ProcessStartInfo StartInfo => _process.StartInfo;
+
+    /// <summary>
+    /// If set in the constructor, it's used to keep track of environment variables modified via <see cref="EnvironmentVariable"/>
+    /// unlike <see cref="ProcessStartInfo.Environment"/> which includes all environment variables of the current process.
+    /// </summary>
+    public IReadOnlyDictionary<string, string?>? CustomEnvironmentVariables => _customEnvironmentVariables;
+
     public ICommand SetCommandArgs(string commandArgs)
     {
         _process.StartInfo.Arguments = commandArgs;

global.json

@@ -317,7 +317,7 @@
     <value>More than one command is defined for the tool.</value>
   </data>
   <data name="ToolSettingsUnsupportedRunner" xml:space="preserve">
-    <value>Command '{0}' uses unsupported runner '{1}'."</value>
+    <value>Tool '{0}' uses unsupported runner '{1}'."</value>
   </data>
   <data name="ToolUnsupportedRuntimeIdentifier" xml:space="preserve">
     <value>The tool does not support the current architecture or operating system ({0}). Supported runtimes: {1}</value>
@@ -808,4 +808,7 @@ The default is 'false.' However, when targeting .NET 7 or lower, the default is
     <value>Cannot specify --version when the package argument already contains a version.</value>
     <comment>{Locked="--version"}</comment>
   </data>
+  <data name="YesOptionDescription" xml:space="preserve">
+    <value>Accept all confirmation prompts using "yes."</value>
+  </data>
 </root>

src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs

@@ -113,6 +113,6 @@ public static Command Create(CommandSpec commandSpec)
             StartInfo = psi
         };
 
-        return new Command(_process);
+        return new Command(_process, customEnvironmentVariables: commandSpec.EnvironmentVariables);
     }
 }

src/Cli/dotnet/CliStrings.resx

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using Microsoft.DotNet.Cli.Commands.Tool;
 using Microsoft.DotNet.Cli.ToolManifest;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
@@ -91,31 +92,8 @@ private CommandSpec GetPackageCommandSpecUsingMuxer(CommandResolverArguments arg
                     toolCommandName.ToString()));
             }
 
-            if (toolCommand.Runner == "dotnet")
-            {
-                if (toolManifestPackage.RollForward || allowRollForward)
-                {
-                    arguments.CommandArguments = ["--allow-roll-forward", .. arguments.CommandArguments];
-                }
-
-                return MuxerCommandSpecMaker.CreatePackageCommandSpecUsingMuxer(
-                    toolCommand.Executable.Value,
-                    arguments.CommandArguments);
-            }
-            else if (toolCommand.Runner == "executable")
-            {
-                var escapedArgs = ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(
-                    arguments.CommandArguments);
-
-                return new CommandSpec(
-                    toolCommand.Executable.Value,
-                    escapedArgs);
-            }
-            else
-            {
-                throw new GracefulException(string.Format(CliStrings.ToolSettingsUnsupportedRunner,
-                    toolCommand.Name, toolCommand.Runner));
-            }
+            return ToolCommandSpecCreator.CreateToolCommandSpec(toolCommand.Name.Value, toolCommand.Executable.Value, toolCommand.Runner,
+                toolManifestPackage.RollForward || allowRollForward, arguments.CommandArguments);
         }
         else
         {