Implementation of dotnet nuget add|remove|list|etc... source (#3206)

Fixes: NuGet/Home#4126 Fixes: NuGet/Home#8668 Spec link: https://github.com/NuGet/Home/blob/dev/designs/DotNet-Sources-Support.md ## Main Work - `dotnet nuget add|remove|* source` implementation Moves and refactors existing `NuGet.exe sources add|remove|*` command into NuGet.Commands.csproj, so that it can be called by NuGet.exe and by DotNet.exe. ## Localization fixes were then necessary Dealt with some localization challenges as part of the strings that moved into NuGet.Commands.dll. Needed to make the ILMerge command that makes NuGet.exe to get localization strings from the 13 NuGet.Commands.resources.dll. ## CodeGeneration templates and datafile for commands/verbs Also implemented a CodeGeneration engine (see .tt files) based on data in commands.xml - which automated code creation of much of the infrastructure. As we add more commands into dotnet.exe, this should be useful.
NuGet · Feb 6, 2020 · a746cd6 · a746cd6
1 parent 319fa10
commit a746cd6
Show file tree

Hide file tree

Showing 56 changed files with 2,840 additions and 1,355 deletions.
diff --git a/build/common.targets b/build/common.targets
@@ -135,7 +135,7 @@
           TaskParameter="TargetOutputs"
           ItemName="DllsToSign" />
     </MSBuild>
-    <MsBuild Condition="'$(BuildRTM)' != 'true'"
+    <MsBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GetLocalizedDllsForSigning"
       Properties="BuildProjectReferences=false;">

diff --git a/build/loc.proj b/build/loc.proj
@@ -15,7 +15,7 @@
     <IntermediateOutputPath>$(ArtifactsDirectory)</IntermediateOutputPath>
   </PropertyGroup>
 
-  <Target Name="LocalizeNonProjectFiles"  Condition="'$(BuildRTM)' != 'true'">
+  <Target Name="LocalizeNonProjectFiles">
     <ItemGroup>
       <NonProjectFilesToMove Include="$(SolutionPackagesFolder)microsoft.web.xdt\2.1.2\lib\net40\Microsoft.Web.XmlTransform.dll">
         <DestinationDir>$(ArtifactsDirectory)microsoft.web.xdt\2.1.2\lib\net40\Microsoft.Web.XmlTransform.dll</DestinationDir>
@@ -37,7 +37,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="BatchLocalize" Condition="'$(BuildRTM)' != 'true'">
+  <Target Name="BatchLocalize">
     <MSBuild
       Projects="@(SolutionProjectsWithoutVSIX)"
       Properties="BuildProjectReferences=false;"
@@ -50,7 +50,7 @@
     <Message Text="Files to localize : @(FilesToLocalize, '%0a')" Importance="High"/>
   </Target>
 
-  <Target Name="MoveLocalizedFilesToProjectSpecificArtifacts" AfterTargets="Localize" Condition="'$(BuildRTM)' != 'true'">
+  <Target Name="MoveLocalizedFilesToProjectSpecificArtifacts" AfterTargets="Localize">
     <ItemGroup>
       <_MoveLocalizedFiles Include="@(LocalizedUserFiles)">
         <DestinationDir>$(ArtifactsDirectory)$([MSBuild]::MakeRelative($(ArtifactsDirectory)localize\%(LocalizedUserFiles.lang), %(LocalizedUserFiles.RootDir)%(LocalizedUserFiles.Directory)))%(LocalizedUserFiles.Culture)\%(LocalizedUserFiles.Filename)%(LocalizedUserFiles.Extension)</DestinationDir>
@@ -60,7 +60,7 @@
     <Delete Files="$(ArtifactsDirectory)vsixlangpack\extension.vsixlangpack"/>
   </Target>
 
-  <Target Name="MoveEulasToArtifacts" AfterTargets="Localize" Condition="'$(BuildRTM)' != 'true'">
+  <Target Name="MoveEulasToArtifacts" AfterTargets="Localize">
     <ItemGroup>
       <!-- SupportedCultures is defined in MicroBuild.Plugins.Localization.targets which is installed as a plugin
       in VSTS MicroBuild -->
@@ -72,7 +72,7 @@
     <Copy SourceFiles="@(EulaFiles->'%(Identity)')" DestinationFiles="@(EulaFiles->'%(DestinationDir)')"/>
   </Target>
 
-  <Target Name="MoveLcgFilesToArtifacts" AfterTargets="Localize" Condition="'$(BuildRTM)' != 'true'">
+  <Target Name="MoveLcgFilesToArtifacts" AfterTargets="Localize">
     <ItemGroup>
       <_MoveLcgFiles Include="@(LocalizedToolFiles)" Condition="'%(LocalizedToolFiles.Extension)'== '.lcg'">
         <DestinationDir>$(ArtifactsDirectory)$([MSBuild]::MakeRelative($(ArtifactsDirectory)localize\%(LocalizedToolFiles.lang), %(LocalizedToolFiles.RootDir)%(LocalizedToolFiles.Directory)))%(LocalizedToolFiles.Culture)\%(LocalizedToolFiles.Filename)%(LocalizedToolFiles.Extension)</DestinationDir>

diff --git a/build/vsts_build.yaml b/build/vsts_build.yaml
@@ -77,6 +77,9 @@ phases:
     FullVstsBuildNumber: $[dependencies.Initialize_Build.outputs['updatebuildnumber.FullVstsBuildNumber']]
     VsTargetChannel: $[dependencies.Initialize_Build.outputs['updatebuildnumber.VsTargetChannel']]
     VsTargetMajorVersion: $[dependencies.Initialize_Build.outputs['updatebuildnumber.VsTargetMajorVersion']]
+    LocalizedLanguageCount: "13"
+    DesktopTargetFramework: "net472"
+
   queue:
     name: VSEng-MicroBuildVS2019
     timeoutInMinutes: 90
@@ -178,7 +181,7 @@ phases:
       solution: "build\\build.proj"
       msbuildVersion: "16.0"
       configuration: "$(BuildConfiguration)"
-      msbuildArguments: "/t:BuildNoVSIX /p:BuildRTM=$(BuildRTM) /p:BuildNumber=$(BuildNumber)"
+      msbuildArguments: "/t:BuildNoVSIX /p:BuildRTM=$(BuildRTM) /p:BuildNumber=$(BuildNumber) /p:SkipILMergeOfNuGetExe=true"
 
   - task: MSBuild@1
     displayName: "Ensure msbuild.exe can parse nuget.sln"
@@ -189,14 +192,39 @@ phases:
       msbuildArguments: "/t:EnsureNewtonsoftJsonVersion"
     condition: "succeeded()"
 
+  - task: MSBuild@1	
+    displayName: "Localize Assemblies"	
+    inputs:	
+      solution: "build\\loc.proj"	
+      msbuildVersion: "16.0"	
+      configuration: "$(BuildConfiguration)"	
+      msbuildArguments: "/t:AfterBuild"	
+
+  - task: MSBuild@1	
+    displayName: "Build Final NuGet.exe (via ILMerge)"	
+    inputs:	
+      solution: "src\\NuGet.Clients\\NuGet.CommandLine\\NuGet.CommandLine.csproj"	
+      msbuildVersion: "16.0"	
+      configuration: "$(BuildConfiguration)"	
+      msbuildArguments: "/t:ILMergeNuGetExe /p:ExpectedLocalizedArtifactCount=$(LocalizedLanguageCount)"
+
+  - task: MSBuild@1	
+    displayName: "Publish NuGet.exe (ILMerged) into NuGet.CommandLine.Test (Mac tests use this)"	
+    inputs:	
+      solution: "test\\NuGet.Clients.Tests\\NuGet.CommandLine.Test\\NuGet.CommandLine.Test.csproj"	
+      msbuildVersion: "16.0"	
+      configuration: "$(BuildConfiguration)"	
+      msbuildArguments: "/t:CopyFinalNuGetExeToOutputPath"
+    condition: "and(succeeded(),eq(variables['BuildRTM'], 'true'))"
+
   - task: MSBuild@1
     displayName: "Run unit tests"
     continueOnError: "true"
     inputs:
       solution: "build\\build.proj"
       msbuildVersion: "16.0"
       configuration: "$(BuildConfiguration)"
-      msbuildArguments: "/t:CoreUnitTests;UnitTestsVS /p:BuildRTM=$(BuildRTM) /p:BuildNumber=$(BuildNumber) /p:TestResultOutputFormat=xml"
+      msbuildArguments: "/t:CoreUnitTests;UnitTestsVS /p:BuildRTM=$(BuildRTM) /p:BuildNumber=$(BuildNumber) /p:TestResultOutputFormat=xml /p:SkipILMergeOfNuGetExe=true"
     condition: "and(succeeded(),eq(variables['BuildRTM'], 'true'))"
 
   - task: PublishTestResults@2
@@ -228,15 +256,6 @@ phases:
       ArtifactType: "Container"
     condition: "and(succeeded(),eq(variables['BuildRTM'], 'true'))"
 
-  - task: MSBuild@1
-    displayName: "Localize Assemblies"
-    inputs:
-      solution: "build\\loc.proj"
-      msbuildVersion: "16.0"
-      configuration: "$(BuildConfiguration)"
-      msbuildArguments: "/t:AfterBuild"
-    condition: " and(succeeded(),eq(variables['BuildRTM'], 'false')) "
-
   - task: MSBuild@1
     displayName: "Sign Assemblies"
     inputs:

diff --git a/src/NuGet.Clients/NuGet.CommandLine/CommandLineParser.cs b/src/NuGet.Clients/NuGet.CommandLine/CommandLineParser.cs
@@ -1,10 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using NuGet.Commands;
 using NuGet.Packaging;
 
 namespace NuGet.CommandLine
@@ -66,7 +70,7 @@ public void ExtractOptions(ICommand command, IEnumerator<string> argsEnumerator)
 
                 if (value == null)
                 {
-                    throw new CommandLineException(LocalizedResourceManager.GetString("MissingOptionValueError"), option);
+                    throw new CommandException(LocalizedResourceManager.GetString("MissingOptionValueError"), option);
                 }
 
                 AssignValue(command, propInfo, option, value);
@@ -118,13 +122,13 @@ internal static void AssignValue(object command, PropertyInfo property, string o
                     property.SetValue(command, TypeHelper.ChangeType(value, property.PropertyType), index: null);
                 }
             }
-            catch (CommandLineException)
+            catch (CommandException)
             {
                 throw;
             }
             catch
             {
-                throw new CommandLineException(LocalizedResourceManager.GetString("InvalidOptionValueError"), option, value);
+                throw new CommandException(LocalizedResourceManager.GetString("InvalidOptionValueError"), option, value);
             }
         }
 
@@ -143,7 +147,7 @@ public ICommand ParseCommandLine(IEnumerable<string> commandLineArgs)
             ICommand cmd = _commandManager.GetCommand(cmdName);
             if (cmd == null)
             {
-                throw new CommandLineException(LocalizedResourceManager.GetString("UnknowCommandError"), cmdName);
+                throw new CommandException(LocalizedResourceManager.GetString("UnknowCommandError"), cmdName);
             }
 
             ExtractOptions(cmd, argsEnumerator);
@@ -168,7 +172,7 @@ where getDisplayName(item).StartsWith(value, StringComparison.OrdinalIgnoreCase)
             var result = results.FirstOrDefault();
             if (!results.Any())
             {
-                throw new CommandLineException(LocalizedResourceManager.GetString("UnknownOptionError"), option);
+                throw new CommandException(LocalizedResourceManager.GetString("UnknownOptionError"), option);
             }
             else if (results.Skip(1).Any())
             {
@@ -180,7 +184,7 @@ where getDisplayName(item).StartsWith(value, StringComparison.OrdinalIgnoreCase)
                 }
                 catch (InvalidOperationException)
                 {
-                    throw new CommandLineException(String.Format(CultureInfo.CurrentCulture, LocalizedResourceManager.GetString("AmbiguousOption"), value,
+                    throw new CommandException(String.Format(CultureInfo.CurrentCulture, LocalizedResourceManager.GetString("AmbiguousOption"), value,
                         String.Join(" ", from c in results select getDisplayName(c))));
                 }
             }

diff --git a/src/NuGet.Clients/NuGet.CommandLine/CommandManager.cs b/src/NuGet.Clients/NuGet.CommandLine/CommandManager.cs
@@ -1,9 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using NuGet.Commands;
 
 namespace NuGet.CommandLine
 {
@@ -26,7 +30,7 @@ where command.CommandAttribute.CommandName.StartsWith(commandName, StringCompari
 
             if (!results.Any())
             {
-                throw new CommandLineException(LocalizedResourceManager.GetString("UnknowCommandError"), commandName);
+                throw new CommandException(LocalizedResourceManager.GetString("UnknowCommandError"), commandName);
             }
 
             var matchedCommand = results.First();
@@ -39,7 +43,7 @@ where command.CommandAttribute.CommandName.StartsWith(commandName, StringCompari
                 if (matchedCommand == null)
                 {
                     // No exact match was found and the result returned multiple prefixes.
-                    throw new CommandLineException(String.Format(CultureInfo.CurrentCulture, LocalizedResourceManager.GetString("AmbiguousCommand"), commandName,
+                    throw new CommandException(String.Format(CultureInfo.CurrentCulture, LocalizedResourceManager.GetString("AmbiguousCommand"), commandName,
                         String.Join(" ", from c in results select c.CommandAttribute.CommandName)));
                 }
             }

diff --git a/src/NuGet.Clients/NuGet.CommandLine/Commands/AddCommand.cs b/src/NuGet.Clients/NuGet.CommandLine/Commands/AddCommand.cs
@@ -3,6 +3,7 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using NuGet.Commands;
 using NuGet.Packaging;
 using NuGet.Packaging.PackageExtraction;
 using NuGet.Packaging.Signing;
@@ -29,7 +30,7 @@ public override async Task ExecuteCommandAsync()
 
             if (string.IsNullOrEmpty(Source))
             {
-                throw new CommandLineException(
+                throw new CommandException(
                     LocalizedResourceManager.GetString(nameof(NuGetResources.AddCommand_SourceNotProvided)));
             }
 

diff --git a/src/NuGet.Clients/NuGet.CommandLine/Commands/DownloadCommandBase.cs b/src/NuGet.Clients/NuGet.CommandLine/Commands/DownloadCommandBase.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
+using NuGet.Commands;
 using NuGet.Configuration;
 using NuGet.Packaging;
 using NuGet.Protocol;
@@ -111,7 +112,7 @@ internal void CalculateEffectivePackageSaveMode()
                         projectConfigFilePath,
                         ex.Message);
 
-                    throw new CommandLineException(message);
+                    throw new CommandException(message);
                 }
             }
 

diff --git a/src/NuGet.Clients/NuGet.CommandLine/Commands/InstallCommand.cs b/src/NuGet.Clients/NuGet.CommandLine/Commands/InstallCommand.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using NuGet.Commands;
 using NuGet.Common;
 using NuGet.Configuration;
 using NuGet.Frameworks;
@@ -250,7 +251,7 @@ private DependencyBehavior TryGetDependencyBehavior(string behaviorStr)
 
             if (!Enum.TryParse<DependencyBehavior>(behaviorStr, ignoreCase: true, result: out dependencyBehavior) || !Enum.IsDefined(typeof(DependencyBehavior), dependencyBehavior))
             {
-                throw new CommandLineException(string.Format(CultureInfo.CurrentCulture, LocalizedResourceManager.GetString("InstallCommandUnknownDependencyVersion"), behaviorStr));
+                throw new CommandException(string.Format(CultureInfo.CurrentCulture, LocalizedResourceManager.GetString("InstallCommandUnknownDependencyVersion"), behaviorStr));
             }
 
             return dependencyBehavior;
@@ -341,7 +342,7 @@ private async Task InstallPackageAsync(
                             LocalizedResourceManager.GetString("InstallCommandUnableToFindPackage"),
                             packageId);
 
-                        throw new CommandLineException(message);
+                        throw new CommandException(message);
                     }
 
                     version = resolvePackage.LatestVersion;

diff --git a/src/NuGet.Clients/NuGet.CommandLine/Commands/PackCommand.cs b/src/NuGet.Clients/NuGet.CommandLine/Commands/PackCommand.cs
@@ -1,3 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -129,7 +132,7 @@ public override void ExecuteCommand()
             {
                 if (!System.Version.TryParse(MinClientVersion, out _minClientVersionValue))
                 {
-                    throw new CommandLineException(LocalizedResourceManager.GetString("PackageCommandInvalidMinClientVersion"));
+                    throw new CommandException(LocalizedResourceManager.GetString("PackageCommandInvalidMinClientVersion"));
                 }
             }
 

diff --git a/src/NuGet.Clients/NuGet.CommandLine/Commands/RestoreCommand.cs b/src/NuGet.Clients/NuGet.CommandLine/Commands/RestoreCommand.cs
@@ -475,7 +475,7 @@ private void CheckRequireConsent()
                         LocalizedResourceManager.GetString("InstallCommandPackageRestoreConsentNotFound"),
                         NuGetResources.PackageRestoreConsentCheckBoxText.Replace("&", ""));
 
-                    throw new CommandLineException(message);
+                    throw new CommandException(message);
                 }
             }
         }