merge main

Author: Nigusu-Allehu

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -483,6 +483,13 @@ This is equivalent to deleting project.assets.json.</value>
   <data name="CmdOutputVersionDescription" xml:space="preserve">
     <value>Specifies the version of machine-readable output. Requires the '--format json' option.</value>
   </data>
+  <data name="Error_restore" xml:space="preserve">
+    <value>Restore failed. Run `dotnet restore` for more details on the issue.</value>
+    <comment>{Locked="dotnet restore"}</comment>
+  </data>
+  <data name="CmdNoRestoreDescription" xml:space="preserve">
+    <value>Do not restore before running the command.</value>
+  </data>
   <data name="CmdPackage" xml:space="preserve">
     <value>PACKAGE_NAME</value>
   </data>

src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs

@@ -6,12 +6,8 @@
 using Microsoft.DotNet.Cli.Commands.NuGet;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
-<<<<<<< HEAD:src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs
-=======
-using Microsoft.DotNet.Tools.NuGet;
 using System.Globalization;
-using Microsoft.DotNet.Tools.MSBuild;
->>>>>>> 27439c5902 (dotnet list package restores):src/Cli/dotnet/Commands/Package/List/ListPackageReferencesCommand.cs
+using Microsoft.DotNet.Cli.Commands.MSBuild;
 
 namespace Microsoft.DotNet.Cli.Commands.Package.List;
 
@@ -92,7 +88,7 @@ private int RunRestore(string projectOrSolution, ReportOutputFormat formatOption
    "version": 1,
    "problems": [
       {
-         "text": "{{String.Format(CultureInfo.CurrentCulture, LocalizableStrings.Error_restore)}}",
+         "text": "{{String.Format(CultureInfo.CurrentCulture, CliCommandStrings.Error_restore)}}",
          "level": "error"
       }
    ]
@@ -123,14 +119,9 @@ private string[] TransformArgs(string projectOrSolution)
         {
             "package",
             "list",
-            GetProjectOrSolution()
+            projectOrSolution
         };
 
-<<<<<<< HEAD:src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs
-=======
-        args.Add(projectOrSolution);
-
->>>>>>> 27439c5902 (dotnet list package restores):src/Cli/dotnet/Commands/Package/List/ListPackageReferencesCommand.cs
         args.AddRange(_parseResult.OptionValuesToBeForwarded(PackageListCommandParser.GetCommand()));
 
         EnforceOptionRules(_parseResult);

src/Cli/dotnet/Commands/Package/List/PackageListCommandParser.cs

@@ -74,7 +74,7 @@ internal static class PackageListCommandParser
 
     public static readonly CliOption NoRestore = new CliOption<bool>("--no-restore")
     {
-        Description = LocalizableStrings.CmdNoRestoreDescription,
+        Description = CliCommandStrings.CmdNoRestoreDescription,
         Arity = ArgumentArity.Zero
     };