[release/10.0.1xx-preview6] Add dnx support (#49488)

Author: marcpopMSFT

src/Cli/Microsoft.TemplateEngine.Cli/Help/HelpBuilder.cs

@@ -43,11 +43,6 @@ public virtual void Write(HelpContext context)
             throw new ArgumentNullException(nameof(context));
         }
 
-        if (context.Command.Hidden)
-        {
-            return;
-        }
-
         foreach (var writeSection in GetLayout(context))
         {
             if (writeSection(context))

src/Cli/dotnet/Commands/Dnx/DnxCommandParser.cs

@@ -0,0 +1,37 @@
+// 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.Tool;
+using Microsoft.DotNet.Cli.Commands.Tool.Execute;
+
+namespace Microsoft.DotNet.Cli.Commands.Dnx;
+
+internal static class DnxCommandParser
+{
+    public static readonly Command Command = ConstructCommand();
+    public static Command GetCommand()
+    {
+        return Command;
+    }
+
+    private static Command ConstructCommand()
+    {
+        Command command = new("dnx", CliCommandStrings.ToolExecuteCommandDescription);
+        command.Hidden = true;
+
+        foreach (var argument in ToolExecuteCommandParser.Command.Arguments)
+        {
+            command.Arguments.Add(argument);
+        }
+
+        foreach (var option in ToolExecuteCommandParser.Command.Options)
+        {
+            command.Options.Add(option);
+        }
+
+        command.SetAction((parseResult) => new ToolExecuteCommand(parseResult).Execute());
+
+        return command;
+    }
+}

src/Cli/dotnet/Parser.cs

@@ -10,6 +10,7 @@
 using Microsoft.DotNet.Cli.Commands.Build;
 using Microsoft.DotNet.Cli.Commands.BuildServer;
 using Microsoft.DotNet.Cli.Commands.Clean;
+using Microsoft.DotNet.Cli.Commands.Dnx;
 using Microsoft.DotNet.Cli.Commands.Format;
 using Microsoft.DotNet.Cli.Commands.Fsi;
 using Microsoft.DotNet.Cli.Commands.Help;
@@ -66,6 +67,7 @@ public static class Parser
         BuildCommandParser.GetCommand(),
         BuildServerCommandParser.GetCommand(),
         CleanCommandParser.GetCommand(),
+        DnxCommandParser.GetCommand(),
         FormatCommandParser.GetCommand(),
         CompleteCommandParser.GetCommand(),
         FsiCommandParser.GetCommand(),
@@ -313,12 +315,15 @@ public override void Write(HelpContext context)
         {
             var command = context.Command;
             var helpArgs = new string[] { "--help" };
+
+            // custom help overrides
             if (command.Equals(RootCommand))
             {
                 Console.Out.WriteLine(CliUsage.HelpText);
                 return;
             }
 
+            // argument/option cleanups specific to help
             foreach (var option in command.Options)
             {
                 option.EnsureHelpName();

src/Layout/redist/dnx

@@ -0,0 +1,2 @@
+#!/bin/sh
+"$(dirname "$0")/dotnet" dnx "$@"

src/Layout/redist/dnx.cmd

@@ -0,0 +1,2 @@
+@echo off
+"%~dp0dotnet.exe" dnx %*

src/Layout/redist/targets/GenerateInstallerLayout.targets

@@ -64,6 +64,17 @@
                       Overwrite="true" />
   </Target>
 
+  <Target Name="LayoutDnxScript">
+    <PropertyGroup>
+      <DnxScriptSource Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx.cmd</DnxScriptSource>
+      <DnxScriptSource Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx</DnxScriptSource>
+    </PropertyGroup>
+    <Copy SourceFiles="$(DnxScriptSource)" DestinationFolder="$(RedistInstallerLayoutPath)" />
+
+    <!-- Mark script as executable -->
+    <Exec Command="chmod 755 &quot;$(RedistInstallerLayoutPath)/dnx&quot;" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
+  </Target>
+
   <!-- Replace files from the runtime packs with symbolic links to the corresponding shared framework files (and hostfxr) to reduce the size of the runtime pack directories. -->
   <Target Name="ReplaceBundledRuntimePackFilesWithSymbolicLinks" DependsOnTargets="LayoutBundledComponents"
                                                                  Condition="'$(BundleRuntimePacks)' == 'true' and !$([MSBuild]::IsOSPlatform('WINDOWS'))">
@@ -81,6 +92,7 @@
                             LayoutManifests;
                             LayoutBaselineWorkloadSet;
                             LayoutWorkloadUserLocalMarker;
+                            LayoutDnxScript;
                             CrossgenLayout;
                             ReplaceBundledRuntimePackFilesWithSymbolicLinks"
           AfterTargets="AfterBuild" />
@@ -101,6 +113,10 @@
           DestinationFiles="@(SdkOutputFile -> '$(IntermediateSdkInstallerOutputPath)sdk\$(Version)\%(RecursiveDir)%(Filename)%(Extension)')"
           UseHardLinksIfPossible="true"
           SkipUnchangedFiles="true" />
+
+    <!-- Copy dnx script to root dotnet folder (which will map to DOTNETHOME) -->
+    <Copy SourceFiles="dnx.cmd" DestinationFolder="$(IntermediateSdkInstallerOutputPath)" />
+    
   </Target>
 
 </Project>

src/Layout/redist/targets/GenerateLayout.targets

@@ -278,9 +278,6 @@
           DestinationFiles="$(OutputPath)/%(BundledTools.Identity).runtimeconfig.json"
           SkipUnchangedFiles="true" />
 
-    <Delete Files="$(OutputPath)/$(TargetName).deps.json;
-                   $(OutputPath)/$(TargetName).runtimeconfig.json" />
-
     <Delete Files="$(OutputPath)/%(BundledToolProjects.Identity).dll;
                    $(OutputPath)/%(BundledToolProjects.Identity).pdb" />