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

NuGet.config

@@ -7,10 +7,6 @@
     <!--  End: Package sources from dotnet-aspire -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-893c2eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-893c2eb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-893c2eb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-893c2eb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-893c2eb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -42,10 +38,6 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-893c2eb-1" value="true" />
-    <add key="darc-int-dotnet-runtime-893c2eb-2" value="true" />
-    <add key="darc-int-dotnet-runtime-893c2eb-3" value="true" />
-    <add key="darc-int-dotnet-runtime-893c2eb-4" value="true" />
     <add key="darc-int-dotnet-runtime-893c2eb" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

eng/common/core-templates/job/publish-build-assets.yml

@@ -40,6 +40,8 @@ parameters:
 
   repositoryAlias: self
 
+  officialBuildId: ''
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -62,6 +64,11 @@ jobs:
       value: false
     # unconditional - needed for logs publishing (redactor tool version)
     - template: /eng/common/core-templates/post-build/common-variables.yml
+  - name: OfficialBuildId
+    ${{ if ne(parameters.officialBuildId, '') }}:
+      value: ${{ parameters.officialBuildId }}
+    ${{ else }}:
+      value: $(Build.BuildNumber)
 
   pool:
     # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)

eng/common/core-templates/jobs/jobs.yml

@@ -44,6 +44,7 @@ parameters:
   artifacts: {}
   is1ESPipeline: ''
   repositoryAlias: self
+  officialBuildId: ''
 
 # Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
 # and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
         artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
         signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
         repositoryAlias: ${{ parameters.repositoryAlias }}
+        officialBuildId: ${{ parameters.officialBuildId }}

src/Cli/dotnet/Commands/CommandFactory.cs

@@ -17,7 +17,8 @@ internal static CommandBase CreateVirtualOrPhysicalCommand(
         Func<MSBuildArgs, string?, CommandBase> createPhysicalCommand,
         IEnumerable<Option> optionsToUseWhenParsingMSBuildFlags,
         ParseResult parseResult,
-        string? msbuildPath = null)
+        string? msbuildPath = null,
+        Func<MSBuildArgs, MSBuildArgs>? transformer = null)
     {
         var args = parseResult.GetValue(catchAllUserInputArgument) ?? [];
         LoggerUtility.SeparateBinLogArguments(args, out var binLogArgs, out var nonBinLogArgs);
@@ -32,11 +33,13 @@ internal static CommandBase CreateVirtualOrPhysicalCommand(
                 CommonOptions.GetTargetResultOption,
                 CommonOptions.GetResultOutputFileOption,
             ]);
+            msbuildArgs = transformer?.Invoke(msbuildArgs) ?? msbuildArgs;
             return configureVirtualCommand(msbuildArgs, Path.GetFullPath(arg));
         }
         else
         {
             var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([.. forwardedArgs, .. args], [.. optionsToUseWhenParsingMSBuildFlags]);
+            msbuildArgs = transformer?.Invoke(msbuildArgs) ?? msbuildArgs;
             return createPhysicalCommand(msbuildArgs, msbuildPath);
         }
     }

src/Cli/dotnet/Commands/Pack/PackCommand.cs

@@ -49,19 +49,10 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
                 NoRestore = noRestore,
                 NoCache = true,
             },
-            (msbuildArgs, msbuildPath) =>
-            {
-                ReleasePropertyProjectLocator projectLocator = new(parseResult, MSBuildPropertyNames.PACK_RELEASE,
-                    new ReleasePropertyProjectLocator.DependentCommandOptions(
-                            nonBinLogArgs,
-                            parseResult.HasOption(PackCommandParser.ConfigurationOption) ? parseResult.GetValue(PackCommandParser.ConfigurationOption) : null
-                        )
-                );
-                return new PackCommand(
-                    msbuildArgs.CloneWithAdditionalProperties(projectLocator.GetCustomDefaultConfigurationValueIfSpecified()),
-                    noRestore,
-                    msbuildPath);
-            },
+            (msbuildArgs, msbuildPath) => new PackCommand(
+                msbuildArgs,
+                noRestore,
+                msbuildPath),
             optionsToUseWhenParsingMSBuildFlags:
             [
                 CommonOptions.PropertiesOption,
@@ -70,7 +61,17 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
                 PackCommandParser.VerbosityOption,
             ],
             parseResult,
-            msbuildPath);
+            msbuildPath,
+            (msbuildArgs) =>
+            {
+                ReleasePropertyProjectLocator projectLocator = new(parseResult, MSBuildPropertyNames.PACK_RELEASE,
+                    new ReleasePropertyProjectLocator.DependentCommandOptions(
+                            nonBinLogArgs,
+                            parseResult.HasOption(PackCommandParser.ConfigurationOption) ? parseResult.GetValue(PackCommandParser.ConfigurationOption) : null
+                        )
+                );
+                return msbuildArgs.CloneWithAdditionalProperties(projectLocator.GetCustomDefaultConfigurationValueIfSpecified());
+            });
     }
 
     private static LogLevel MappingVerbosityToNugetLogLevel(VerbosityOptions? verbosity)

src/Cli/dotnet/Commands/Publish/PublishCommand.cs

@@ -52,23 +52,25 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
                 NoRestore = noRestore,
                 NoCache = true,
             },
-            (msbuildArgs, msbuildPath) => {
+            (msbuildArgs, msbuildPath) => new PublishCommand(
+                msbuildArgs: msbuildArgs,
+                noRestore: noRestore,
+                msbuildPath: msbuildPath
+            ),
+            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, PublishCommandParser.TargetOption, PublishCommandParser.VerbosityOption],
+            parseResult,
+            msbuildPath,
+            (msbuildArgs) =>
+            {
                 var options = new ReleasePropertyProjectLocator.DependentCommandOptions(
                         nonBinLogArgs,
                         parseResult.HasOption(PublishCommandParser.ConfigurationOption) ? parseResult.GetValue(PublishCommandParser.ConfigurationOption) : null,
                         parseResult.HasOption(PublishCommandParser.FrameworkOption) ? parseResult.GetValue(PublishCommandParser.FrameworkOption) : null
                     );
                 var projectLocator = new ReleasePropertyProjectLocator(parseResult, MSBuildPropertyNames.PUBLISH_RELEASE, options);
                 var releaseModeProperties = projectLocator.GetCustomDefaultConfigurationValueIfSpecified();
-                return new PublishCommand(
-                    msbuildArgs: msbuildArgs.CloneWithAdditionalProperties(releaseModeProperties),
-                    noRestore: noRestore,
-                    msbuildPath: msbuildPath
-                );
-            },
-            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, PublishCommandParser.TargetOption, PublishCommandParser.VerbosityOption],
-            parseResult,
-            msbuildPath
+                return msbuildArgs.CloneWithAdditionalProperties(releaseModeProperties);
+            }
         );
     }
 

src/Cli/dotnet/ReleasePropertyProjectLocator.cs

@@ -4,7 +4,9 @@
 using System.Collections.ObjectModel;
 using System.CommandLine;
 using System.Diagnostics;
+using Microsoft.Build.Evaluation;
 using Microsoft.Build.Execution;
+using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.NET.Build.Tasks;
 using Microsoft.VisualStudio.SolutionPersistence.Model;
@@ -108,7 +110,12 @@ DependentCommandOptions commandOptions
     {
         foreach (string arg in _slnOrProjectArgs.Append(Directory.GetCurrentDirectory()))
         {
-            if (IsValidProjectFilePath(arg))
+            if (VirtualProjectBuildingCommand.IsValidEntryPointPath(arg))
+            {
+                return new VirtualProjectBuildingCommand(Path.GetFullPath(arg), MSBuildArgs.FromProperties(globalProps))
+                    .CreateProjectInstance(ProjectCollection.GlobalProjectCollection);
+            }
+            else if (IsValidProjectFilePath(arg))
             {
                 return TryGetProjectInstance(arg, globalProps);
             }

test/dotnet.Tests/CommandTests/Run/RunFileTests.cs

@@ -1504,6 +1504,14 @@ public void Publish()
         new DirectoryInfo(publishDir).Sub("Program")
             .Should().Exist()
             .And.NotHaveFilesMatching("*.deps.json", SearchOption.TopDirectoryOnly); // no deps.json file for AOT-published app
+
+        new RunExeCommand(Log, Path.Join(publishDir, "Program", $"Program{Constants.ExeSuffix}"))
+            .Execute()
+            .Should().Pass()
+            .And.HaveStdOut("""
+                Hello from Program
+                Release config
+                """);
     }
 
     [Fact]
@@ -1689,6 +1697,9 @@ public void Pack()
         File.WriteAllText(programFile, """
             #:property PackAsTool=true
             Console.WriteLine($"Hello; EntryPointFilePath set? {AppContext.GetData("EntryPointFilePath") is string}");
+            #if !DEBUG
+            Console.WriteLine("Release config");
+            #endif
             """);
 
         // Run unpacked.
@@ -1719,7 +1730,10 @@ public void Pack()
             .WithWorkingDirectory(testInstance.Path)
             .Execute()
             .Should().Pass()
-            .And.HaveStdOutContaining("Hello; EntryPointFilePath set? False");
+            .And.HaveStdOutContaining("""
+                Hello; EntryPointFilePath set? False
+                Release config
+                """);
     }
 
     [Fact]