Merge pull request #1816 from OctopusDeploy/mergebot/from-release-2026.1-to-main-7b327b0f1

[Auto-merge from release/2026.1 to main] Merge mergebot/from-release-2026.1-to-main-7b327b0f1 to main

Author: Octobob

NuGet.Config

@@ -7,6 +7,12 @@
   <packageSourceMapping>
     <packageSource key="feedz.io">
       <package pattern="AlphaFS" />
+      <package pattern="NuGet.Common" />
+      <package pattern="NuGet.Configuration" />
+      <package pattern="NuGet.Frameworks" />
+      <package pattern="NuGet.Packaging" />
+      <package pattern="NuGet.Protocol" />
+      <package pattern="NuGet.Versioning" />
       <package pattern="Octopus.CoreUtilities" />
       <package pattern="Octopus.Data" />
       <package pattern="Octopus.Dependencies.*" />
@@ -19,6 +25,12 @@
       <package pattern="Octopus.TinyTypes" />
     </packageSource>
     <packageSource key="NuGet.org v3">
+      <package pattern="NuGet.Common" />
+      <package pattern="NuGet.Configuration" />
+      <package pattern="NuGet.Frameworks" />
+      <package pattern="NuGet.Packaging" />
+      <package pattern="NuGet.Protocol" />
+      <package pattern="NuGet.Versioning" />
       <package pattern="Octopus.Versioning" />
       <package pattern="Octopus.TinyTypes" />
       <package pattern="*" />

build/NuGet.Config

@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
     <add key="NuGet.org v3" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
     <packageSource key="NuGet.org v3">
+      <package pattern="NuGet.Common" />
+      <package pattern="NuGet.Configuration" />
+      <package pattern="NuGet.Frameworks" />
+      <package pattern="NuGet.Packaging" />
+      <package pattern="NuGet.Protocol" />
+      <package pattern="NuGet.Versioning" />
       <package pattern="*" />
     </packageSource>
   </packageSourceMapping>

source/Calamari.Common/Calamari.Common.csproj

@@ -15,6 +15,7 @@
 
     <ItemGroup>
         <PackageReference Include="NuGet.Commands" Version="7.0.1" />
+        <PackageReference Include="NuGet.Packaging" Version="7.4.0-octopus-release.17001" />
         <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
         <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
         <PackageReference Include="System.Threading.AccessControl" Version="4.3.0" />

source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj

@@ -10,7 +10,7 @@
         <PackageReference Include="Assent" Version="1.5.0" />
         <PackageReference Include="FluentAssertions" Version="7.2.0" />
         <PackageReference Include="NSubstitute" Version="4.2.1" />
-        <PackageReference Include="NuGet.Packaging" Version="7.0.1" />
+        <PackageReference Include="NuGet.Packaging" Version="7.4.0-octopus-release.17001" />
         <PackageReference Include="nunit" Version="3.14.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />

source/Calamari.Terraform/Calamari.Terraform.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.11" />
-    <PackageReference Include="NuGet.Versioning" Version="7.0.1" />
+    <PackageReference Include="NuGet.Versioning" Version="7.4.0-octopus-release.17001" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj" />

source/Calamari.Tests/Fixtures/Deployment/Conventions/ExtractPackageFixture.cs

@@ -18,6 +18,8 @@ public class ExtractPackageFixture
         ExtractPackage extractPackage;
         ICalamariFileSystem fileSystem;
         static readonly PathToPackage PathToPackage = new PathToPackage(TestEnvironment.ConstructRootedPath("Acme.Web.1.0.0.zip"));
+        static readonly PathToPackage PathToPackageWithLeadingZeros = new PathToPackage(TestEnvironment.ConstructRootedPath("Acme.Core.1.0.01.nupkg"));
+        static readonly PathToPackage PathToPackageWithMetadata = new PathToPackage(TestEnvironment.ConstructRootedPath("Acme.Core.1.0.1+ace8cda.nupkg"));
 
         [SetUp]
         public void SetUp()
@@ -96,7 +98,6 @@ public void ShouldAppendToVersionedFolderIfAlreadyExisting()
 
             Assert.That(variables.Get("OctopusOriginalPackageDirectoryPath"), Does.EndWith(Path.Combine("Acme.Web", "1.0.0_3")));
         }
-        
 
         [Test]
         public void ShouldExtractToEnvironmentSpecificFolderIfProvided()

source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs

@@ -182,6 +182,25 @@ public void ExtractTakesIntoAccountEncoding(Type extractorType, string extension
             }
         }
 
+        // Ensure package extraction maintains support for:
+        // - leading zeros
+        // - build metadata
+        // see: https://docs.octopushq.com/docs/features-and-subsystems/NugetFork
+        [Test]
+        [TestCase("1.0.01")]
+        [TestCase("1.0.1+ace8cda")]
+        public void ExtractTakesIntoAccountForOctopusVersions(string version)
+        {
+            var fileName = GetFixtureResource("Samples", $"{PackageId}.{version}.nupkg");
+            var extractor = new NupkgExtractor(ConsoleLog.Instance);
+            var targetDir = GetTargetDir(typeof(NupkgExtractor), fileName);
+
+            extractor.Extract(fileName, targetDir);
+
+            var metadata = PackageName.FromFile(fileName);
+            Assert.That(metadata.Version.ToString(), Is.EqualTo(version));
+        }
+
         [Test]
         //Latest version of SharpCompress throws an exception if a symbolic link is encountered and we haven't provided a handler for it.
         public void ExtractIgnoresSymbolicLinks()