dnup code review

Directory.Packages.props

@@ -104,6 +104,7 @@
     <PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
+    <PackageVersion Include="Spectre.Console" Version="0.48.0" />
     <PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />

dnup.slnf

@@ -0,0 +1,8 @@
+{
+  "solution": {
+    "path": "sdk.slnx",
+    "projects": [
+      "src\\Installer\\dnup\\dnup.csproj",
+    ]
+  }
+}

sdk.slnx

@@ -3,7 +3,6 @@
     <File Path="eng/dogfood.cmd" />
     <File Path="eng/dogfood.sh" />
     <File Path="eng/Versions.props" />
-    <File Path="eng/Version.Details.props" />
   </Folder>
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
@@ -86,6 +85,9 @@
     <Project Path="src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj" />
     <Project Path="src/Containers/packaging/package.csproj" />
   </Folder>
+  <Folder Name="/src/Installer/">
+    <Project Path="src/Installer/dnup/dnup.csproj" />
+  </Folder>
   <Folder Name="/src/Layout/">
     <Project Path="src/Layout/finalizer/finalizer.csproj" />
     <Project Path="src/Layout/pkg/dotnet-sdk.proj" Type="C#" />
@@ -292,6 +294,7 @@
     <Project Path="test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj" />
     <Project Path="test/dotnet-watch.Tests/dotnet-watch.Tests.csproj" />
     <Project Path="test/dotnet.Tests/dotnet.Tests.csproj" />
+    <Project Path="test/dnup.Tests/dnup.Tests.csproj" />
     <Project Path="test/EndToEnd.Tests/EndToEnd.Tests.csproj" />
     <Project Path="test/HelixTasks/HelixTasks.csproj" />
     <Project Path="test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj" />

src/Cli/dotnet/CliUsage.cs

@@ -43,6 +43,7 @@ internal static class CliUsage
   clean             {CliCommandStrings.CleanDefinition}
   format            {CliCommandStrings.FormatDefinition}
   help              {CliCommandStrings.HelpDefinition}
+  install           Installs the .NET SDK
   msbuild           {CliCommandStrings.MsBuildDefinition}
   new               {CliCommandStrings.NewDefinition}
   nuget             {CliCommandStrings.NugetDefinition}
@@ -57,6 +58,7 @@ internal static class CliUsage
   store             {CliCommandStrings.StoreDefinition}
   test              {CliCommandStrings.TestDefinition}
   tool              {CliCommandStrings.ToolDefinition}
+  update            Updates the .NET SDK
   vstest            {CliCommandStrings.VsTestDefinition}
   workload          {CliCommandStrings.WorkloadDefinition}
 

src/Cli/dotnet/Commands/Sdk/SdkCommandParser.cs

@@ -5,6 +5,8 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Commands.Sdk.Check;
+//using Microsoft.DotNet.Cli.Commands.Sdk.Install;
+using Microsoft.DotNet.Cli.Commands.Sdk.Update;
 using Microsoft.DotNet.Cli.Extensions;
 
 namespace Microsoft.DotNet.Cli.Commands.Sdk;
@@ -24,8 +26,10 @@ private static Command ConstructCommand()
     {
         DocumentedCommand command = new("sdk", DocsLink, CliCommandStrings.SdkAppFullName);
         command.Subcommands.Add(SdkCheckCommandParser.GetCommand());
+        //command.Subcommands.Add(SdkInstallCommandParser.GetSdkInstallCommand());
+        command.Subcommands.Add(SdkUpdateCommandParser.GetSdkUpdateCommand());
 
-        command.SetAction((parseResult) => parseResult.HandleMissingCommand());
+        //command.SetAction((parseResult) => parseResult.HandleMissingCommand());
 
         return command;
     }

src/Cli/dotnet/Commands/Sdk/Update/SdkUpdateCommandParser.cs

@@ -0,0 +1,55 @@
+// 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.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.DotNet.Cli.Commands.Sdk.Update;
+
+internal static class SdkUpdateCommandParser
+{
+
+    public static readonly Option<bool> UpdateAllOption = new("--all")
+    {
+        Description = "Update all installed SDKs",
+        Arity = ArgumentArity.Zero
+    };
+
+    public static readonly Option<bool> UpdateGlobalJsonOption = new("--update-global-json")
+    {
+        Description = "Update the sdk version in applicable global.json files to the updated SDK version",
+        Arity = ArgumentArity.Zero
+    };
+
+    public static readonly Option<bool> InteractiveOption = CommonOptions.InteractiveOption();
+
+    private static readonly Command SdkUpdateCommand = ConstructCommand();
+
+    public static Command GetSdkUpdateCommand()
+    {
+        return SdkUpdateCommand;
+    }
+
+    //  Trying to use the same command object for both "dotnet udpate" and "dotnet sdk update" causes an InvalidOperationException
+    //  So we create a separate instance for each case
+    private static readonly Command RootUpdateCommand = ConstructCommand();
+
+    public static Command GetRootUpdateCommand()
+    {
+        return RootUpdateCommand;
+    }
+
+    private static Command ConstructCommand()
+    {
+        Command command = new("update", "Updates the .NET SDK");
+
+        command.Options.Add(UpdateAllOption);
+        command.Options.Add(UpdateGlobalJsonOption);
+
+        command.Options.Add(InteractiveOption);
+
+        command.SetAction(parseResult => 0);
+
+        return command;
+    }
+}

src/Cli/dotnet/Parser.cs

@@ -35,6 +35,8 @@
 using Microsoft.DotNet.Cli.Commands.Run;
 using Microsoft.DotNet.Cli.Commands.Run.Api;
 using Microsoft.DotNet.Cli.Commands.Sdk;
+//using Microsoft.DotNet.Cli.Commands.Sdk.Install;
+using Microsoft.DotNet.Cli.Commands.Sdk.Update;
 using Microsoft.DotNet.Cli.Commands.Solution;
 using Microsoft.DotNet.Cli.Commands.Store;
 using Microsoft.DotNet.Cli.Commands.Test;
@@ -87,6 +89,8 @@ public static class Parser
         VSTestCommandParser.GetCommand(),
         HelpCommandParser.GetCommand(),
         SdkCommandParser.GetCommand(),
+        //SdkInstallCommandParser.GetRootInstallCommand(),
+        SdkUpdateCommandParser.GetRootUpdateCommand(),
         InstallSuccessCommand,
         WorkloadCommandParser.GetCommand(),
         new System.CommandLine.StaticCompletions.CompletionsCommand()

src/Cli/dotnet/dotnet.csproj

@@ -61,6 +61,7 @@
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" />
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Deployment.DotNet.Releases" />
+    <PackageReference Include="Spectre.Console" />
     <PackageReference Include="System.ServiceProcess.ServiceController" />
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="All" ExcludeAssets="Runtime" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
     <PackageReference Include="Microsoft.Windows.CsWin32" IncludeAssets="all" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />

src/Installer/dnup/.gitignore

@@ -0,0 +1,2 @@
+# Override the root .gitignore to NOT ignore the .vscode folder
+!.vscode/

src/Installer/dnup/.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch dnup",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/../../../artifacts/bin/dnup/Debug/net10.0/dnup.dll",
+            "args": "${input:commandLineArgs}",
+            "cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "requireExactSource": false
+        }
+    ],
+    "inputs": [
+        {
+            "id": "commandLineArgs",
+            "type": "promptString",
+            "description": "Command line arguments",
+            "default": ""
+        }
+    ]
+}

src/Installer/dnup/.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+  "dotnet.defaultSolution": "dnup.csproj",
+  "csharp.debug.console": "externalTerminal",
+  "editor.formatOnSave": true,
+  "omnisharp.enableRoslynAnalyzers": true,
+  "omnisharp.useModernNet": true,
+  "dotnetAcquisitionExtension.existingDotnetPath": [
+    {
+      "extensionId": "ms-dotnettools.csharp",
+      "path": "C:\\Program Files\\dotnet\\dotnet.exe"
+    }
+  ],
+  "launch": {
+    "configurations": [],
+    "compounds": []
+  },
+  "omnisharp.defaultLaunchSolution": "dnup.csproj"
+}

src/Installer/dnup/.vscode/tasks.json

@@ -0,0 +1,56 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/dnup.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary",
+                "${input:buildArgs}"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/dnup.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary",
+                "${input:buildArgs}"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/dnup.csproj",
+                "${input:buildArgs}"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "buildArgs",
+            "type": "promptString",
+            "description": "Additional build arguments",
+            "default": ""
+        }
+    ]
+}