remove warnings for single file publishing (#1606)

* resolve warnings for single file publishing

* alternative argv[0] approach for root command exe path

Author: jonsequitur

src/System.CommandLine.Tests/CommandLineConfigurationTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;

src/System.CommandLine.Tests/TrimmingTests.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Text;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace System.CommandLine.Tests;
@@ -24,15 +25,29 @@ public TrimmingTests(ITestOutputHelper output)
         _systemCommandLineDllPath = typeof(Command).Assembly.Location;
     }
 
-    [ReleaseBuildOnlyFact]
-    public void App_referencing_system_commandline_can_be_trimmed()
+    [ReleaseBuildOnlyTheory]
+    [InlineData("")]
+    [InlineData("-p:PublishSingleFile=true")]
+    public void App_referencing_system_commandline_can_be_trimmed(string additionalArgs)
     {
         var stdOut = new StringBuilder();
         var stdErr = new StringBuilder();
+
+        var workingDirectory = Path.Combine(Directory.GetCurrentDirectory(), "TrimmingTestApp");
 
+        Process.RunToCompletion(
+            DotnetMuxer.Path.FullName,
+            "clean -c Release -r win-x64",
+            workingDirectory: workingDirectory);
+
+        var commandLine = string.Format(
+            "publish -c Release -r win-x64 --self-contained -p:SystemCommandLineDllPath=\"{0}\" -p:TreatWarningsAsErrors=true -p:PublishTrimmed=true {1}",
+            _systemCommandLineDllPath,
+            additionalArgs);
+
         var exitCode = Process.RunToCompletion(
             DotnetMuxer.Path.FullName,
-            $"publish -c Release -r win-x64 --self-contained /p:PublishTrimmed=true /p:SystemCommandLineDllPath=\"{_systemCommandLineDllPath}\" /p:TreatWarningsAsErrors=true",
+            commandLine,
             s =>
             {
                 _output.WriteLine(s);
@@ -43,7 +58,7 @@ public void App_referencing_system_commandline_can_be_trimmed()
                 _output.WriteLine(s);
                 stdErr.Append(s);
             },
-            workingDirectory: Path.Combine(Directory.GetCurrentDirectory(), "TrimmingTestApp"));
+            workingDirectory);
 
         stdOut.ToString().Should().NotContain("warning IL");
         stdErr.ToString().Should().BeEmpty();

src/System.CommandLine.Tests/Utility/ReleaseBuildOnlyTheoryAttribute.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Xunit;
+
+namespace System.CommandLine.Tests.Utility;
+
+public class ReleaseBuildOnlyTheoryAttribute : TheoryAttribute
+{
+    public ReleaseBuildOnlyTheoryAttribute()
+    {
+#if DEBUG
+            Skip = "This test runs only on Release builds.";
+#endif
+    }
+}

src/System.CommandLine/Command.cs

@@ -57,7 +57,7 @@ public IEnumerable<Symbol> Children
         public IReadOnlyList<Argument> Arguments => _arguments is not null ? _arguments : Array.Empty<Argument>();
 
         /// <summary>
-        /// Represents all of the options for the command, including global options.
+        /// Represents all of the options for the command, including global options that have been applied to any of the command's ancestors.
         /// </summary>
         public IReadOnlyList<Option> Options => _options is not null ? _options : Array.Empty<Option>();
 

src/System.CommandLine/CommandExtensions.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Linq;

src/System.CommandLine/RootCommand.cs

@@ -23,7 +23,7 @@ public class RootCommand : Command
                 LazyThreadSafetyMode.PublicationOnly);
 
         private static readonly Lazy<string> _executablePath =
-            new(() => GetAssembly().Location,
+            new(() => Environment.GetCommandLineArgs()[0],
                 LazyThreadSafetyMode.PublicationOnly);
 
         private static readonly Lazy<string> _executableName =
@@ -49,7 +49,7 @@ public RootCommand(string description = "") : base(ExecutableName, description)
         {
         }
 
-        internal static Assembly GetAssembly() => _assembly.Value!;
+        internal static Assembly GetAssembly() => _assembly.Value;
 
         /// <summary>
         /// The name of the currently running executable.

src/System.CommandLine/System.CommandLine.csproj

@@ -17,6 +17,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsTrimmable>true</IsTrimmable>
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">