AOT Compatible: Add overrideVersion to enforce -Version precedence (#7133)

Nigusu-Allehu · web-flow · commit a60358ca1159 · 2026-02-17T15:56:42.000-08:00
diff --git a/src/NuGet.Core/NuGet.Commands/CommandRunners/PackCommandRunner.cs b/src/NuGet.Core/NuGet.Commands/CommandRunners/PackCommandRunner.cs
@@ -453,7 +453,8 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)
                     _packArgs.GetPropertyValue,
                     !_packArgs.ExcludeEmptyDirectories,
                     _packArgs.Deterministic,
-                    _packArgs.Logger);
+                    _packArgs.Logger,
+                    _packArgs.Version);
             }
 
             return new PackageBuilder(
@@ -462,7 +463,8 @@ private PackageBuilder CreatePackageBuilderFromNuspec(string path)
                 _packArgs.GetPropertyValue,
                 !_packArgs.ExcludeEmptyDirectories,
                 _packArgs.Deterministic,
-                _packArgs.Logger);
+                _packArgs.Logger,
+                _packArgs.Version);
         }
 
         private bool BuildFromProjectFile(string path)
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/Manifest.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/Manifest.cs
@@ -116,6 +116,11 @@ public static Manifest ReadFrom(Stream stream, bool validateSchema)
         }
 
         public static Manifest ReadFrom(Stream stream, Func<string, string> propertyProvider, bool validateSchema)
+        {
+            return ReadFrom(stream, propertyProvider, validateSchema, overrideVersion: null);
+        }
+
+        public static Manifest ReadFrom(Stream stream, Func<string, string> propertyProvider, bool validateSchema, NuGetVersion overrideVersion)
         {
             XDocument document;
             if (propertyProvider == null)
@@ -147,14 +152,9 @@ public static Manifest ReadFrom(Stream stream, Func<string, string> propertyProv
             // Deserialize it
             var manifest = ManifestReader.ReadManifest(document);
 
-            // Update manifest metadata version if version was provided by the CLI command
-            if (propertyProvider is not null && propertyProvider.Target.GetType().Name.Equals("PackArgs"))
+            if (overrideVersion != null)
             {
-                var versionProperty = propertyProvider.Target.GetType().GetProperty("Version");
-                if (versionProperty?.GetValue(propertyProvider.Target) is string version)
-                {
-                    manifest.Metadata.Version = NuGetVersion.Parse(version);
-                }
+                manifest.Metadata.Version = overrideVersion;
             }
 
             // Validate before returning
diff --git a/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs b/src/NuGet.Core/NuGet.Packaging/PackageCreation/Authoring/PackageBuilder.cs
@@ -35,6 +35,7 @@ public class PackageBuilder : IPackageMetadata
         private readonly bool _includeEmptyDirectories;
         private readonly bool _deterministic;
         private readonly ILogger _logger;
+        private readonly string _versionOverride;
 
         /// <summary>
         /// Maximum Icon file size: 1 megabyte
@@ -52,7 +53,12 @@ public PackageBuilder(string path, Func<string, string> propertyProvider, bool i
         }
 
         public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)
-            : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger)
+            : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger, versionOverride: "")
+        {
+        }
+
+        public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger, string versionOverride)
+            : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger, versionOverride)
         {
         }
 
@@ -62,12 +68,21 @@ public PackageBuilder(string path, string basePath, Func<string, string> propert
         }
 
         public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)
-            : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic)
+            : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, logger, versionOverride: "")
+        {
+        }
+        public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger, string versionOverride)
+            : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, versionOverride)
         {
             _logger = logger;
         }
 
         public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic)
+            : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, versionOverride: "")
+        {
+
+        }
+        public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, string versionOverride)
             : this(includeEmptyDirectories, deterministic)
         {
             if (!File.Exists(path))
@@ -77,6 +92,8 @@ public PackageBuilder(string path, string basePath, Func<string, string> propert
                     string.Format(CultureInfo.CurrentCulture, Strings.ErrorManifestFileNotFound, path ?? "null"));
             }
 
+            _versionOverride = versionOverride;
+
             using (Stream stream = File.OpenRead(path))
             {
                 ReadManifest(stream, basePath, propertyProvider);
@@ -89,8 +106,14 @@ public PackageBuilder(Stream stream, string basePath)
         }
 
         public PackageBuilder(Stream stream, string basePath, Func<string, string> propertyProvider)
+            : this(stream, basePath, propertyProvider, "")
+        {
+        }
+
+        public PackageBuilder(Stream stream, string basePath, Func<string, string> propertyProvider, string versionOverride)
             : this()
         {
+            _versionOverride = versionOverride;
             ReadManifest(stream, basePath, propertyProvider);
         }
 
@@ -921,7 +944,11 @@ private void ValidateReadmeFile(IEnumerable<IPackageFile> files, string readmePa
         private void ReadManifest(Stream stream, string basePath, Func<string, string> propertyProvider)
         {
             // Deserialize the document and extract the metadata
-            Manifest manifest = Manifest.ReadFrom(stream, propertyProvider, validateSchema: true);
+            Manifest manifest = Manifest.ReadFrom(
+                stream,
+                propertyProvider,
+                validateSchema: true,
+                overrideVersion: !(string.IsNullOrEmpty(_versionOverride)) ? NuGetVersion.Parse(_versionOverride) : null);
 
             Populate(manifest.Metadata);
 
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net472/PublicAPI.Unshipped.txt
@@ -1 +1,6 @@
 #nullable enable
+~NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger, string versionOverride) -> void
+~NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, string versionOverride) -> void
+~NuGet.Packaging.PackageBuilder.PackageBuilder(string path, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger, string versionOverride) -> void
+~NuGet.Packaging.PackageBuilder.PackageBuilder(System.IO.Stream stream, string basePath, System.Func<string, string> propertyProvider, string versionOverride) -> void
+~static NuGet.Packaging.Manifest.ReadFrom(System.IO.Stream stream, System.Func<string, string> propertyProvider, bool validateSchema, NuGet.Versioning.NuGetVersion overrideVersion) -> NuGet.Packaging.Manifest
diff --git a/src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/NuGet.Core/NuGet.Packaging/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -1 +1,6 @@
 #nullable enable
+~NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger, string versionOverride) -> void
+~NuGet.Packaging.PackageBuilder.PackageBuilder(string path, string basePath, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, string versionOverride) -> void
+~NuGet.Packaging.PackageBuilder.PackageBuilder(string path, System.Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, NuGet.Common.ILogger logger, string versionOverride) -> void
+~NuGet.Packaging.PackageBuilder.PackageBuilder(System.IO.Stream stream, string basePath, System.Func<string, string> propertyProvider, string versionOverride) -> void
+~static NuGet.Packaging.Manifest.ReadFrom(System.IO.Stream stream, System.Func<string, string> propertyProvider, bool validateSchema, NuGet.Versioning.NuGetVersion overrideVersion) -> NuGet.Packaging.Manifest

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public class PackageBuilder : IPackageMetadata`
`35`	`35`	`private readonly bool _includeEmptyDirectories;`
`36`	`36`	`private readonly bool _deterministic;`
`37`	`37`	`private readonly ILogger _logger;`
	`38`	`+ private readonly string _versionOverride;`
`38`	`39`
`39`	`40`	`/// <summary>`
`40`	`41`	`/// Maximum Icon file size: 1 megabyte`
`@@ -52,7 +53,12 @@ public PackageBuilder(string path, Func<string, string> propertyProvider, bool i`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)`
`55`		`- : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger)`
	`56`	`+ : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger, versionOverride: "")`
	`57`	`+ {`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ public PackageBuilder(string path, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger, string versionOverride)`
	`61`	`+ : this(path, Path.GetDirectoryName(path), propertyProvider, includeEmptyDirectories, deterministic, logger, versionOverride)`
`56`	`62`	`{`
`57`	`63`	`}`
`58`	`64`
`@@ -62,12 +68,21 @@ public PackageBuilder(string path, string basePath, Func<string, string> propert`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger)`
`65`		`- : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic)`
	`71`	`+ : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, logger, versionOverride: "")`
	`72`	`+ {`
	`73`	`+ }`
	`74`	`+ public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, ILogger logger, string versionOverride)`
	`75`	`+ : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, versionOverride)`
`66`	`76`	`{`
`67`	`77`	`_logger = logger;`
`68`	`78`	`}`
`69`	`79`
`70`	`80`	`public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic)`
	`81`	`+ : this(path, basePath, propertyProvider, includeEmptyDirectories, deterministic, versionOverride: "")`
	`82`	`+ {`
	`83`	`+`
	`84`	`+ }`
	`85`	`+ public PackageBuilder(string path, string basePath, Func<string, string> propertyProvider, bool includeEmptyDirectories, bool deterministic, string versionOverride)`
`71`	`86`	`: this(includeEmptyDirectories, deterministic)`
`72`	`87`	`{`
`73`	`88`	`if (!File.Exists(path))`
`@@ -77,6 +92,8 @@ public PackageBuilder(string path, string basePath, Func<string, string> propert`
`77`	`92`	`string.Format(CultureInfo.CurrentCulture, Strings.ErrorManifestFileNotFound, path ?? "null"));`
`78`	`93`	`}`
`79`	`94`
	`95`	`+ _versionOverride = versionOverride;`
	`96`	`+`
`80`	`97`	`using (Stream stream = File.OpenRead(path))`
`81`	`98`	`{`
`82`	`99`	`ReadManifest(stream, basePath, propertyProvider);`
`@@ -89,8 +106,14 @@ public PackageBuilder(Stream stream, string basePath)`
`89`	`106`	`}`
`90`	`107`
`91`	`108`	`public PackageBuilder(Stream stream, string basePath, Func<string, string> propertyProvider)`
	`109`	`+ : this(stream, basePath, propertyProvider, "")`
	`110`	`+ {`
	`111`	`+ }`
	`112`	`+`
	`113`	`+ public PackageBuilder(Stream stream, string basePath, Func<string, string> propertyProvider, string versionOverride)`
`92`	`114`	`: this()`
`93`	`115`	`{`
	`116`	`+ _versionOverride = versionOverride;`
`94`	`117`	`ReadManifest(stream, basePath, propertyProvider);`
`95`	`118`	`}`
`96`	`119`
`@@ -921,7 +944,11 @@ private void ValidateReadmeFile(IEnumerable<IPackageFile> files, string readmePa`
`921`	`944`	`private void ReadManifest(Stream stream, string basePath, Func<string, string> propertyProvider)`
`922`	`945`	`{`
`923`	`946`	`// Deserialize the document and extract the metadata`
`924`		`- Manifest manifest = Manifest.ReadFrom(stream, propertyProvider, validateSchema: true);`
	`947`	`+ Manifest manifest = Manifest.ReadFrom(`
	`948`	`+ stream,`
	`949`	`+ propertyProvider,`
	`950`	`+ validateSchema: true,`
	`951`	`+ overrideVersion: !(string.IsNullOrEmpty(_versionOverride)) ? NuGetVersion.Parse(_versionOverride) : null);`
`925`	`952`
`926`	`953`	`Populate(manifest.Metadata);`
`927`	`954`