Adding dotnet add package sub command #5122

mishra14 · 2016-12-21T20:07:31Z

Adding the dotnet add package sub command to add package references.

NuGet part of the work : NuGet/NuGet.Client#1063

Fixes add package part of https://github.com/dotnet/cli/issues/4521 and NuGet/Home#3751

//cc: @livarcocc @piotrpMSFT @blackdwarf @krwq @rrelyea @emgarten

dnfclas · 2016-12-21T20:07:36Z

Hi @mishra14, I'm your friendly neighborhood .NET Foundation Pull Request Bot (You can call me DNFBOT). Thanks for your contribution!
You've already signed the contribution license agreement. Thanks!

The agreement was validated by .NET Foundation and real humans are currently evaluating your PR.

TTYL, DNFBOT;

mishra14 · 2016-12-21T22:26:09Z

@dotnet-bot test Debian8.2 x64 Debug Build

mishra14 · 2016-12-21T22:26:24Z

@dotnet-bot test Windows_NT x64 Release Build

mishra14 · 2016-12-21T23:03:40Z

@dotnet-bot test Ubuntu x64 Release Build

src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs

+
+namespace Microsoft.DotNet.Tools.Add.PackageReference
+{
+    internal class LocalizableStrings


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+
+        public static DotNetSubCommandBase Create()
+        {
+            var command = new AddPackageReferenceCommand()


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+        public override int Run(string fileOrDirectory)
+        {
+            var projects = new ProjectCollection();
+            var msbuildProj = MsbuildProject.FromFileOrDirectory(projects, fileOrDirectory);


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+            return result;
+        }
+
+        private void GetProjectDependencyGraph(string projectFilePath,


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+            args.Add("/t:GenerateRestoreGraphFile");
+
+            // Pass Dependency Graph file output path
+            args.Add(string.Format("/p:RestoreGraphOutputPath={0}{1}{2}", '"', dgFilePath, '"'));


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+
+            if (result != 0)
+            {
+                throw new GracefulException(string.Format(LocalizableStrings.CmdDGFileException, projectFilePath));


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+            }
+        }
+
+        private string CreateTemporaryFile(string extension)


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+        public override int Run(string fileOrDirectory)
+        {
+            var projects = new ProjectCollection();
+            var msbuildProj = MsbuildProject.FromFileOrDirectory(projects, fileOrDirectory);


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+                "package",
+                "add",
+                "--package",
+                "Newtonsoft.Json",


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+                "Newtonsoft.Json",
+                "--project",
+                projectFilePath
+            };


mishra14 · 2016-12-22T23:34:16Z

🔔 @livarcocc

mishra14 · 2016-12-23T00:28:35Z

@dotnet-bot test CentOS7.1 x64 Debug Build

src/dotnet/MsbuildProject.cs

@@ -62,6 +62,19 @@ public static MsbuildProject FromFile(ProjectCollection projects, string project

        public static MsbuildProject FromDirectory(ProjectCollection projects, string projectDirectory)
        {
+            FileInfo projectFile = GetProjectFileFromDirectory(projectDirectory);
+
+            var project = TryOpenProject(projects, projectFile.FullName);


src/dotnet/MsbuildProject.cs

-            }
-
-            return new MsbuildProject(projects, project);
+            return files.First();


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+                GetProjectDependencyGraph(projectFilePath, tempDgFilePath);
+            }
+
+            var result = NuGetCommand.Run(TransformArgs(RemainingArguments.First(), tempDgFilePath, projectFilePath));


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+            }
+            else
+            {
+                projectFilePath = fileOrDirectory;


src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

+                "package",
+                "add",
+                "--package",
+                packageId,


livarcocc · 2016-12-27T17:28:56Z

@srivatsn

src/dotnet/MsbuildProject.cs

+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;


src/dotnet/MsbuildProject.cs

@@ -270,4 +268,4 @@ private static ProjectRootElement TryOpenProject(ProjectCollection projects, str
            }
        }
    }
-}
+}


src/dotnet/commands/dotnet-add/Program.cs

@@ -26,4 +28,4 @@ public static int Run(string[] args)
            return command.RunCommand(args);
        }
    }
-}
+}


Ankit Mishra added 4 commits December 20, 2016 14:24

Adding base add package sub command

abd496a

Add package sub command

3a5b89c

FIxing argument adding

0f6e4e3

Clean up before PR

303a267

dnfclas added the cla-already-signed label Dec 21, 2016

mishra14 mentioned this pull request Dec 21, 2016

enable adding package references into csproj from dotnet.exe NuGet/Home#3751

Closed

Merge branch 'rel/1.0.0' into dev-anmishr-dotnetaddpackage

2738ea8

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

public static DotNetSubCommandBase Create()

{

var command = new AddPackageReferenceCommand()

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

public override int Run(string fileOrDirectory)

{

var projects = new ProjectCollection();

var msbuildProj = MsbuildProject.FromFileOrDirectory(projects, fileOrDirectory);

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

return result;

}

private void GetProjectDependencyGraph(string projectFilePath,

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

args.Add("/t:GenerateRestoreGraphFile");

// Pass Dependency Graph file output path

args.Add(string.Format("/p:RestoreGraphOutputPath={0}{1}{2}", '"', dgFilePath, '"'));

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

}

}

private string CreateTemporaryFile(string extension)

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

public override int Run(string fileOrDirectory)

{

var projects = new ProjectCollection();

var msbuildProj = MsbuildProject.FromFileOrDirectory(projects, fileOrDirectory);

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

"package",

"add",

"--package",

"Newtonsoft.Json",

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 22, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

"Newtonsoft.Json",

"--project",

projectFilePath

};

This comment was marked as spam.

Sign in to view

Fixing on PR comments

ac988a4

livarcocc reviewed Dec 23, 2016

View reviewed changes

src/dotnet/MsbuildProject.cs

}

return new MsbuildProject(projects, project);

return files.First();

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 23, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

GetProjectDependencyGraph(projectFilePath, tempDgFilePath);

}

var result = NuGetCommand.Run(TransformArgs(RemainingArguments.First(), tempDgFilePath, projectFilePath));

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 23, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

}

else

{

projectFilePath = fileOrDirectory;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

livarcocc reviewed Dec 23, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs

"package",

"add",

"--package",

packageId,

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

livarcocc approved these changes Dec 27, 2016

View reviewed changes

srivatsn requested review from agocke and removed request for agocke December 27, 2016 18:07

krwq reviewed Dec 27, 2016

View reviewed changes

src/dotnet/MsbuildProject.cs

using System;

using System.Collections.Generic;

using System.IO;

using System.Linq;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

srivatsn added the Approved to merge label Dec 27, 2016

krwq reviewed Dec 27, 2016

View reviewed changes

src/dotnet/MsbuildProject.cs

@@ -270,4 +268,4 @@ private static ProjectRootElement TryOpenProject(ProjectCollection projects, str

}

}

}

}

}

This comment was marked as spam.

Sign in to view

TheRealPiotrP approved these changes Dec 27, 2016

View reviewed changes

src/dotnet/commands/dotnet-add/Program.cs

@@ -26,4 +28,4 @@ public static int Run(string[] args)

return command.RunCommand(args);

}

}

}

}

This comment was marked as spam.

Sign in to view

livarcocc merged commit 47fb245 into dotnet:rel/1.0.0 Dec 27, 2016

mishra14 deleted the dev-anmishr-dotnetaddpackage branch December 28, 2016 18:38

Adding dotnet add package sub command #5122

Adding dotnet add package sub command #5122

Conversation

mishra14 commented Dec 21, 2016

dnfclas commented Dec 21, 2016

mishra14 commented Dec 21, 2016

mishra14 commented Dec 21, 2016

mishra14 commented Dec 21, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

mishra14 commented Dec 22, 2016

mishra14 commented Dec 23, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

livarcocc commented Dec 27, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.