Allow publishing file-based apps #49310
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.CommandLine; | ||
| using Microsoft.DotNet.Cli.Commands.Restore; | ||
| using Microsoft.DotNet.Cli.Commands.Run; | ||
| using Microsoft.DotNet.Cli.Extensions; | ||
|
|
||
| namespace Microsoft.DotNet.Cli.Commands.Publish; | ||
|
|
@@ -14,49 +13,75 @@ public class PublishCommand : RestoringCommand | |
| private PublishCommand( | ||
| IEnumerable<string> msbuildArgs, | ||
| bool noRestore, | ||
| string? msbuildPath = null) | ||
| : base(msbuildArgs, noRestore, msbuildPath) | ||
| { | ||
| } | ||
|
|
||
| public static CommandBase FromArgs(string[] args, string? msbuildPath = null) | ||
| { | ||
| var parser = Parser.Instance; | ||
| var parseResult = parser.ParseFrom("dotnet publish", args); | ||
| return FromParseResult(parseResult); | ||
| } | ||
|
|
||
| public static CommandBase FromParseResult(ParseResult parseResult, string? msbuildPath = null) | ||
| { | ||
| parseResult.HandleDebugSwitch(); | ||
| parseResult.ShowHelpOrErrorIfAppropriate(); | ||
|
|
||
| var msbuildArgs = new List<string>() | ||
| { | ||
| "--property:_IsPublishing=true" // This property will not hold true for MSBuild /t:Publish or in VS. | ||
| }; | ||
|
|
||
| string[] args = parseResult.GetValue(PublishCommandParser.SlnOrProjectOrFileArgument) ?? []; | ||
|
|
||
| LoggerUtility.SeparateBinLogArguments(args, out var binLogArgs, out var nonBinLogArgs); | ||
|
|
||
| CommonOptions.ValidateSelfContainedOptions(parseResult.HasOption(PublishCommandParser.SelfContainedOption), | ||
| parseResult.HasOption(PublishCommandParser.NoSelfContainedOption)); | ||
|
|
||
| msbuildArgs.AddRange(parseResult.OptionValuesToBeForwarded(PublishCommandParser.GetCommand())); | ||
|
|
||
| bool noBuild = parseResult.HasOption(PublishCommandParser.NoBuildOption); | ||
|
|
||
| bool noRestore = noBuild || parseResult.HasOption(PublishCommandParser.NoRestoreOption); | ||
|
|
||
| if (nonBinLogArgs is [{ } arg] && VirtualProjectBuildingCommand.IsValidEntryPointPath(arg)) | ||
|
There was a problem hiding this comment. @chsienki has a PR out to remove the need for the There was a problem hiding this comment. It shouldn't need any adjusting - Chris's logic lives inside There was a problem hiding this comment. Def want it to work. I just want to make sure we're confident these PRs will converge correctly. |
||
| { | ||
| if (!parseResult.HasOption(PublishCommandParser.ConfigurationOption)) | ||
| { | ||
| msbuildArgs.Add("-p:Configuration=Release"); | ||
| } | ||
|
|
||
| msbuildArgs.AddRange(binLogArgs); | ||
|
|
||
| return new VirtualProjectBuildingCommand( | ||
| entryPointFileFullPath: Path.GetFullPath(arg), | ||
| msbuildArgs: msbuildArgs, | ||
| verbosity: parseResult.GetValue(CommonOptions.VerbosityOption), | ||
| interactive: parseResult.GetValue(CommonOptions.InteractiveMsBuildForwardOption)) | ||
| { | ||
| NoBuild = noBuild, | ||
| NoRestore = noRestore, | ||
| NoCache = true, | ||
| BuildTarget = "Publish", | ||
| }; | ||
| } | ||
|
|
||
| ReleasePropertyProjectLocator projectLocator = new(parseResult, MSBuildPropertyNames.PUBLISH_RELEASE, | ||
| new ReleasePropertyProjectLocator.DependentCommandOptions( | ||
| nonBinLogArgs, | ||
| parseResult.HasOption(PublishCommandParser.ConfigurationOption) ? parseResult.GetValue(PublishCommandParser.ConfigurationOption) : null, | ||
| parseResult.HasOption(PublishCommandParser.FrameworkOption) ? parseResult.GetValue(PublishCommandParser.FrameworkOption) : null | ||
| ) | ||
| ); | ||
| msbuildArgs.AddRange(projectLocator.GetCustomDefaultConfigurationValueIfSpecified()); | ||
|
|
||
| msbuildArgs.AddRange(args ?? []); | ||
|
|
||
| msbuildArgs.Insert(0, "-target:Publish"); | ||
|
|
||
| return new PublishCommand( | ||
| msbuildArgs, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -62,7 +62,7 @@ internal sealed class VirtualProjectBuildingCommand : CommandBase | |||||
|
|
||||||
| public VirtualProjectBuildingCommand( | ||||||
| string entryPointFileFullPath, | ||||||
| IReadOnlyList<string> msbuildArgs, | ||||||
| VerbosityOptions? verbosity, | ||||||
| bool interactive) | ||||||
| { | ||||||
|
|
@@ -77,12 +77,12 @@ public VirtualProjectBuildingCommand( | |||||
|
|
||||||
| public string EntryPointFileFullPath { get; } | ||||||
| public Dictionary<string, string> GlobalProperties { get; } | ||||||
| public IReadOnlyList<string> BinaryLoggerArgs { get; } | ||||||
| public VerbosityOptions Verbosity { get; } | ||||||
| public bool NoRestore { get; init; } | ||||||
| public bool NoCache { get; init; } | ||||||
| public bool NoBuild { get; init; } | ||||||
| public string? BuildTarget { get; init; } | ||||||
|
There was a problem hiding this comment.
Suggested change
That would remove an annotation but get the same result. |
||||||
|
|
||||||
| public override int Execute() | ||||||
| { | ||||||
|
|
@@ -170,7 +170,7 @@ public override int Execute() | |||||
| { | ||||||
| var buildRequest = new BuildRequestData( | ||||||
| CreateProjectInstance(projectCollection), | ||||||
| targetsToBuild: [BuildTarget ?? "Build"]); | ||||||
|
There was a problem hiding this comment.
Suggested change
Could do this if you take the above suggestion. |
||||||
| var buildResult = BuildManager.DefaultBuildManager.BuildRequest(buildRequest); | ||||||
| if (buildResult.OverallResult != BuildResultCode.Success) | ||||||
| { | ||||||
|
|
@@ -201,10 +201,10 @@ public override int Execute() | |||||
| consoleLogger.Shutdown(); | ||||||
| } | ||||||
|
|
||||||
| static ILogger? GetBinaryLogger(IReadOnlyList<string> args) | ||||||
| { | ||||||
| // Like in MSBuild, only the last binary logger is used. | ||||||
| for (int i = args.Count - 1; i >= 0; i--) | ||||||
| { | ||||||
| var arg = args[i]; | ||||||
| if (LoggerUtility.IsBinLogArgument(arg)) | ||||||
|
|
@@ -540,6 +540,7 @@ public static void WriteProjectFile( | |||||
| <TargetFramework>net10.0</TargetFramework> | ||||||
| <ImplicitUsings>enable</ImplicitUsings> | ||||||
| <Nullable>enable</Nullable> | ||||||
| <PublishAot>true</PublishAot> | ||||||
|
There was a problem hiding this comment. Should we unconditionally do this? What if the user has the following code? #:property PublishAot falseThere was a problem hiding this comment. The project will get |
||||||
| </PropertyGroup> | ||||||
| """); | ||||||
|
|
||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we mention here that this default to AOT and how to override that if it's not desirable?