Merge pull request #103 from brandondahler/features/MetadataOnly_Appe…

…ndToVersion Allow metadata-only AppendToVersion
OctopusDeploy · Jan 13, 2019 · 2e5098c · 2e5098c
2 parents 096c446 + 4fbd449
commit 2e5098c
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/source/OctoPack.Tasks/CreateOctoPackPackage.cs b/source/OctoPack.Tasks/CreateOctoPackPackage.cs
@@ -401,7 +401,11 @@ private void UpdateVersionWithAppendValue(XContainer nuSpec)
 
             var version = GetVersionElementFromNuSpec(nuSpec);
 
-            version.Value = $"{PackageVersion ?? version.Value}-{AppendToVersion.Trim()}";
+            if (AppendToVersion[0] != '+')
+                version.Value = $"{PackageVersion ?? version.Value}-{AppendToVersion.Trim()}";
+            else
+                version.Value = $"{PackageVersion ?? version.Value}{AppendToVersion.Trim()}";
+
             PackageVersion = version.Value;
         }
 

diff --git a/source/OctoPack.Tests/Integration/SampleSolutionBuildFixture.cs b/source/OctoPack.Tests/Integration/SampleSolutionBuildFixture.cs
@@ -494,6 +494,54 @@ public void ShouldAllowAppendingValueToVersionWithExplicitPackageVersion()
                     "Web.Debug.config"));
         }
 
+        [Test]
+        public void ShouldAllowAppendingValueToVersionWithMetadataOnly()
+        {
+            MsBuild("Samples.sln /p:RunOctoPack=true /p:OctoPackAppendToVersion=+Foo /p:Configuration=Release /v:m");
+
+            AssertPackage(@"Sample.ConsoleApp\obj\octopacked\Sample.ConsoleApp.2.1.0.1+Foo.nupkg",
+                pkg => pkg.AssertContents(
+                    "Sample.ConsoleApp.exe",
+                    "Sample.ConsoleApp.exe.config",
+                    "Sample.ConsoleApp.pdb"));
+
+            AssertPackage(@"Sample.WebApp\obj\octopacked\Sample.WebApp.3.1.0-dev+Foo.nupkg",
+                pkg => pkg.AssertContents(
+                    "bin\\*.dll",
+                    "bin\\*.xml",
+                    "bin\\Sample.WebApp.dll",
+                    "bin\\Sample.WebApp.pdb",
+                    "Content\\*.css",
+                    "Content\\*.png",
+                    "Content\\LinkedFile.txt",
+                    "Scripts\\*.js",
+                    "Views\\Web.config",
+                    "Views\\*.cshtml",
+                    "Global.asax",
+                    "Web.config",
+                    "Web.Release.config",
+                    "Web.Debug.config"));
+
+            AssertPackage(@"Sample.WebAppWithSpec\obj\octopacked\Sample.WebAppWithSpec.1.0.13-demo+Foo.nupkg",
+                pkg => pkg.AssertContents(
+                    "bin\\*.dll",
+                    "bin\\*.xml",
+                    "bin\\Sample.WebAppWithSpec.dll",
+                    "bin\\Sample.WebAppWithSpec.pdb",
+                    "Content\\*.css",
+                    "Content\\*.png",
+                    "Content\\LinkedFile.txt",
+                    "Scripts\\*.js",
+                    "Views\\Web.config",
+                    "Views\\*.cshtml",
+                    "Views\\Deploy.ps1",
+                    "Deploy.ps1",
+                    "Global.asax",
+                    "Web.config",
+                    "Web.Release.config",
+                    "Web.Debug.config"));
+        }
+
         [Test]
         public void ShouldSupportRelativeOutputDirectories()
         {