dotnet add package cli support for cpm projects (#4700)

NuGet · Jul 12, 2022 · 93da94e · 93da94e
1 parent 0707bff
commit 93da94e
Show file tree

Hide file tree

Showing 7 changed files with 941 additions and 54 deletions.
diff --git a/...t.CommandLine.XPlat/Commands/PackageReferenceCommands/AddPackageReferenceCommandRunner.cs b/...t.CommandLine.XPlat/Commands/PackageReferenceCommands/AddPackageReferenceCommandRunner.cs
@@ -57,7 +57,7 @@ public async Task<int> ExecuteCommand(PackageReferenceArgs packageReferenceArgs,
                         typeConstraint: LibraryDependencyTarget.Package)
                 };
 
-                msBuild.AddPackageReference(packageReferenceArgs.ProjectPath, libraryDependency);
+                msBuild.AddPackageReference(packageReferenceArgs.ProjectPath, libraryDependency, packageReferenceArgs.NoVersion);
                 return 0;
             }
 
@@ -219,7 +219,7 @@ public async Task<int> ExecuteCommand(PackageReferenceArgs packageReferenceArgs,
                 // generate a library dependency with all the metadata like Include, Exlude and SuppressParent
                 var libraryDependency = GenerateLibraryDependency(updatedPackageSpec, packageReferenceArgs, restorePreviewResult, userSpecifiedFrameworks, packageDependency);
 
-                msBuild.AddPackageReference(packageReferenceArgs.ProjectPath, libraryDependency);
+                msBuild.AddPackageReference(packageReferenceArgs.ProjectPath, libraryDependency, packageReferenceArgs.NoVersion);
             }
             else
             {
@@ -239,7 +239,8 @@ public async Task<int> ExecuteCommand(PackageReferenceArgs packageReferenceArgs,
 
                 msBuild.AddPackageReferencePerTFM(packageReferenceArgs.ProjectPath,
                     libraryDependency,
-                    compatibleOriginalFrameworks);
+                    compatibleOriginalFrameworks,
+                    packageReferenceArgs.NoVersion);
             }
 
             // 6. Commit restore result
@@ -276,6 +277,9 @@ private static LibraryDependency GenerateLibraryDependency(
             // update default packages path if user specified custom package directory
             var packagesPath = project.RestoreMetadata.PackagesPath;
 
+            // get if the project is onboarded to CPM
+            var isCentralPackageManagementEnabled = project.RestoreMetadata.CentralPackageVersionsEnabled;
+
             if (!string.IsNullOrEmpty(packageReferenceArgs.PackageDirectory))
             {
                 packagesPath = packageReferenceArgs.PackageDirectory;
@@ -314,6 +318,7 @@ private static LibraryDependency GenerateLibraryDependency(
                     if (dependency != null)
                     {
                         dependency.LibraryRange.VersionRange = version;
+                        dependency.VersionCentrallyManaged = isCentralPackageManagementEnabled;
                         return dependency;
                     }
                 }
@@ -324,7 +329,8 @@ private static LibraryDependency GenerateLibraryDependency(
                 LibraryRange = new LibraryRange(
                     name: packageReferenceArgs.PackageId,
                     versionRange: version,
-                    typeConstraint: LibraryDependencyTarget.Package)
+                    typeConstraint: LibraryDependencyTarget.Package),
+                VersionCentrallyManaged = isCentralPackageManagementEnabled
             };
         }
 

diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.Designer.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.Designer.cs
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx b/src/NuGet.Core/NuGet.CommandLine.XPlat/Strings.resx
@@ -753,4 +753,8 @@ The search is a case-insensitive string comparison using the supplied value, whi
 Non-HTTPS access will be removed in a future version. Consider migrating to 'HTTPS' sources.</value>
     <comment>0 - The command name. Ex. Push/Delete. 1 - list of server uris</comment>
   </data>
+  <data name="Info_AddPkgCPM" xml:space="preserve">
+    <value>PackageReference for package '{0}' added to '{1}' and PackageVersion added to central package management file '{2}'.</value>
+    <comment>0 - The package ID. 1 - Directory.Packages.props file path. 2 - Project file path.</comment>
+  </data>
 </root>