[automated] Merge branch 'release/10.0.3xx' => 'main'

.merge_file_JsDg5L

@@ -0,0 +1,51 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.CommandLine;
+using Microsoft.DotNet.Cli.Commands.MSBuild;
+using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.DotNet.Cli.Extensions;
+using Microsoft.DotNet.Cli.Utils;
+
+namespace Microsoft.DotNet.Cli.Commands.Store;
+
+public class StoreCommand : MSBuildForwardingApp
+{
+    private StoreCommand(IEnumerable<string> msbuildArgs, string msbuildPath = null)
+        : base(msbuildArgs, msbuildPath)
+    {
+    }
+
+    public static StoreCommand FromArgs(string[] args, string msbuildPath = null)
+    {
+        var result = Parser.Parse(["dotnet", "store", ..args]);
+        return FromParseResult(result, msbuildPath);
+    }
+
+    public static StoreCommand FromParseResult(ParseResult result, string msbuildPath = null)
+    {
+        List<string> msbuildArgs = ["--target:ComposeStore"];
+
+        result.ShowHelpOrErrorIfAppropriate();
+
+        if (!result.HasOption(StoreCommandParser.ManifestOption))
+        {
+            throw new GracefulException(CliCommandStrings.SpecifyManifests);
+        }
+
+        msbuildArgs.AddRange(result.OptionValuesToBeForwarded(StoreCommandParser.GetCommand()));
+
+        msbuildArgs.AddRange(result.GetValue(StoreCommandParser.Argument) ?? []);
+
+        return new StoreCommand(msbuildArgs, msbuildPath);
+    }
+
+    public static int Run(ParseResult parseResult)
+    {
+        parseResult.HandleDebugSwitch();
+
+        return FromParseResult(parseResult).Execute();
+    }
+}

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "dotnet.testWindow.disableAutoDiscovery": true,
     "dotnet.testWindow.disableBuildOnRun": true,
+    "dotnet.enableWorkspaceBasedDevelopment": false,
     "dotnet.defaultSolution": "cli.slnf",
     "files.associations": {
       "*.slnf": "json",

.vsts-ci.yml

@@ -104,7 +104,7 @@ extends:
             publishTaskPrefix: 1ES.
           populateInternalRuntimeVariables: true
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-          locBranch: release/10.0.2xx
+          locBranch: release/10.0.3xx
           # WORKAROUND: BinSkim requires the folder exist prior to scanning.
           preSteps:
           - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force

Directory.Packages.props

@@ -56,6 +56,7 @@
     <PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
     <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />

TemplateEngine.code-workspace

@@ -0,0 +1,10 @@
+{
+    "folders": [
+      {
+        "path": "."
+      }
+    ],
+    "settings": {
+      "dotnet.defaultSolution": "TemplateEngine.slnf"
+    }
+  }

cli.code-workspace

@@ -0,0 +1,10 @@
+{
+    "folders": [
+      {
+        "path": "."
+      }
+    ],
+    "settings": {
+      "dotnet.defaultSolution": "cli.slnf"
+    }
+  }

cli.slnf

@@ -9,7 +9,8 @@
       "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj",
       "test\\dotnet.Tests\\dotnet.Tests.csproj",
       "test\\Microsoft.DotNet.Cli.Utils.Tests\\Microsoft.DotNet.Cli.Utils.Tests.csproj",
-      "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"
+      "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj",
+      "src\\Cli\\Microsoft.DotNet.Cli.Definitions\\Microsoft.DotNet.Cli.Definitions.csproj"
     ]
   }
 }

containers.code-workspace

@@ -0,0 +1,10 @@
+{
+    "folders": [
+      {
+        "path": "."
+      }
+    ],
+    "settings": {
+      "dotnet.defaultSolution": "containers.slnf"
+    }
+  }

documentation/specs/dotnet-run-for-maui.md

@@ -82,6 +82,7 @@ devices`, or `xcrun devicectl list devices`._
     `ComputeAvailableDevices` MSBuild target.
 
 * `build`: unchanged, but is passed `-p:Device`.
+  Environment variables from `-e` are passed as `@(RuntimeEnvironmentVariable)` items.
 
 * `deploy`
 
@@ -91,10 +92,13 @@ devices`, or `xcrun devicectl list devices`._
   * Call the MSBuild target, passing in the identifier for the selected
     `-p:Device` global MSBuild property.
 
+  * Environment variables from `-e` are passed as `@(RuntimeEnvironmentVariable)` items.
+
   * This step needs to run, even with `--no-build`, as you may have
     selected a different device.
 
 * `ComputeRunArguments`: unchanged, but is passed `-p:Device`.
+  Environment variables from `-e` are passed as `@(RuntimeEnvironmentVariable)` items.
 
 * `run`: unchanged. `ComputeRunArguments` should have set a valid
   `$(RunCommand)` and `$(RunArguments)` using the value supplied by
@@ -139,6 +143,103 @@ A new `--device` switch will:
 * The iOS and Android workloads will know how to interpret `$(Device)`
   to select an appropriate device, emulator, or simulator.
 
+## Environment Variables
+
+The `dotnet run` command supports passing environment variables via the
+`-e` or `--environment` option:
+
+```dotnetcli
+dotnet run -e FOO=BAR -e ANOTHER=VALUE
+```
+
+These environment variables are:
+
+1. **Passed to the running application** - as process environment
+   variables when the app is launched.
+
+2. **Passed to MSBuild during build, deploy, and ComputeRunArguments** -
+   as `@(RuntimeEnvironmentVariable)` items that workloads can consume.
+   **This behavior is opt-in**: projects must declare the `RuntimeEnvironmentVariableSupport`
+   project capability to receive these items.
+
+```xml
+<ItemGroup>
+  <RuntimeEnvironmentVariable Include="FOO" Value="BAR" />
+  <RuntimeEnvironmentVariable Include="ANOTHER" Value="VALUE" />
+</ItemGroup>
+```
+
+This allows workloads (iOS, Android, etc.) to access environment
+variables during the `build`, `DeployToDevice`, and `ComputeRunArguments` target execution.
+
+### Opting In
+
+To receive environment variables as MSBuild items, projects must opt in by declaring
+the `RuntimeEnvironmentVariableSupport` project capability:
+
+```xml
+<ItemGroup>
+  <ProjectCapability Include="RuntimeEnvironmentVariableSupport" />
+</ItemGroup>
+```
+
+Mobile workloads (iOS, Android, etc.) should declare this capability in their SDK targets
+so that all projects using those workloads automatically opt in.
+
+Workloads can consume these items in their MSBuild targets:
+
+```xml
+<Target Name="DeployToDevice">
+  <!-- Access environment variables from dotnet run -e -->
+  <Message Text="Environment: @(RuntimeEnvironmentVariable->'%(Identity)=%(Value)')" />
+</Target>
+```
+
+### Implementation Details
+
+For the **build step**, which uses out-of-process MSBuild via `dotnet build`,
+environment variables are injected by creating a temporary `.props` file.
+The file is created in the project's `$(IntermediateOutputPath)` directory
+(e.g., `obj/Debug/net11.0-android/dotnet-run-env.props`). The path is
+obtained from the project evaluation performed during target framework and
+device selection. If `IntermediateOutputPath` is not available, the file
+falls back to the `obj/` directory.
+
+The file is passed to MSBuild via the `CustomBeforeMicrosoftCommonProps` property,
+ensuring the items are available early in evaluation.
+The temporary file is automatically deleted after the build completes.
+
+The generated props file looks like:
+
+```xml
+<Project>
+  <ItemGroup>
+    <RuntimeEnvironmentVariable Include="FOO" Value="BAR" />
+    <RuntimeEnvironmentVariable Include="ANOTHER" Value="VALUE" />
+  </ItemGroup>
+</Project>
+```
+
+For the **deploy step** (`DeployToDevice` target) and
+**ComputeRunArguments target**, which use in-process MSBuild,
+environment variables are added directly as
+`@(RuntimeEnvironmentVariable)` items to the `ProjectInstance` before
+invoking the target.
+
+## Binary Logs for Device Selection
+
+When using `-bl` with `dotnet run`, all MSBuild operations are logged to a single
+binlog file: device selection, build, deploy, and run argument computation.
+
+File naming for `dotnet run` binlogs:
+
+* `-bl:filename.binlog` creates `filename-dotnet-run.binlog`
+* `-bl` creates `msbuild-dotnet-run.binlog`
+
+Note: The build step may also create `msbuild.binlog` separately. Use
+`--no-build` with `-bl` to only capture run-specific MSBuild
+operations.
+
 ## What about Launch Profiles?
 
 The iOS and Android workloads ignore all

eng/Version.Details.props

@@ -142,6 +142,8 @@ This file should be imported by eng/Versions.props
     <SystemWindowsExtensionsPackageVersion>11.0.0-preview.3.26152.106</SystemWindowsExtensionsPackageVersion>
     <!-- dotnet/core-setup dependencies -->
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
+    <!-- _git/dotnet-dotnet dependencies -->
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>11.0.0-preview.3.26152.106</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
     <!-- microsoft/testfx dependencies -->
     <MicrosoftTestingPlatformPackageVersion>2.2.0-preview.26154.1</MicrosoftTestingPlatformPackageVersion>
     <MSTestPackageVersion>4.2.0-preview.26154.1</MSTestPackageVersion>
@@ -285,6 +287,8 @@ This file should be imported by eng/Versions.props
     <SystemWindowsExtensionsVersion>$(SystemWindowsExtensionsPackageVersion)</SystemWindowsExtensionsVersion>
     <!-- dotnet/core-setup dependencies -->
     <NETStandardLibraryRefVersion>$(NETStandardLibraryRefPackageVersion)</NETStandardLibraryRefVersion>
+    <!-- _git/dotnet-dotnet dependencies -->
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
     <!-- microsoft/testfx dependencies -->
     <MicrosoftTestingPlatformVersion>$(MicrosoftTestingPlatformPackageVersion)</MicrosoftTestingPlatformVersion>
     <MSTestVersion>$(MSTestPackageVersion)</MSTestVersion>

eng/Version.Details.xml

@@ -527,6 +527,10 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>5507d7a2f05bb6c073a055ead6ce1c4bbe396cda</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-preview.3.26152.106">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
+      <Sha>4c0aa722933ea491006247bbc0a484fa3c28cd14</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26152.106">

eng/Versions.props

@@ -77,6 +77,7 @@
     <MicrosoftBclAsyncInterfacesToolsetPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
     <MicrosoftDeploymentDotNetReleasesToolsetPackageVersion>2.0.0-preview.1.24427.4</MicrosoftDeploymentDotNetReleasesToolsetPackageVersion>
     <MicrosoftExtensionsLoggingAbstractionsToolsetPackageVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsToolsetPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsToolsetPackageVersion>9.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsToolsetPackageVersion>
     <SystemBuffersToolsetPackageVersion>4.5.1</SystemBuffersToolsetPackageVersion>
     <SystemCollectionsImmutableToolsetPackageVersion>9.0.0</SystemCollectionsImmutableToolsetPackageVersion>
     <SystemMemoryToolsetPackageVersion>4.5.5</SystemMemoryToolsetPackageVersion>

sdk.code-workspace

@@ -0,0 +1,10 @@
+{
+    "folders": [
+      {
+        "path": "."
+      }
+    ],
+    "settings": {
+      "dotnet.defaultSolution": "sdk.slnx"
+    }
+  }

source-build.code-workspace

@@ -0,0 +1,10 @@
+{
+    "folders": [
+      {
+        "path": "."
+      }
+    ],
+    "settings": {
+      "dotnet.defaultSolution": "source-build.slnf"
+    }
+  }