fix #2390 by using normalized version numbers during dnu publish

aspnet · Aug 28, 2015 · a297f5f · a297f5f
1 parent 50aaca4
commit a297f5f
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 1 deletion.
diff --git a/src/Microsoft.Dnx.Tooling/Building/BuildManager.cs b/src/Microsoft.Dnx.Tooling/Building/BuildManager.cs
@@ -413,7 +413,7 @@ private static string Normalize(string projectDir)
 
         private static string GetPackagePath(Runtime.Project project, string outputPath, bool symbols = false)
         {
-            string fileName = project.Name + "." + project.Version + (symbols ? ".symbols" : "") + ".nupkg";
+            string fileName = project.Name + "." + project.Version.GetNormalizedVersionString() + (symbols ? ".symbols" : "") + ".nupkg";
             return Path.Combine(outputPath, fileName);
         }
 

diff --git a/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPublishTests.cs b/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPublishTests.cs
@@ -451,6 +451,67 @@ public void DnuPublishConsoleApp(string flavor, string os, string architecture)
             }
         }
 
+        [Theory]
+        [MemberData(nameof(RuntimeComponents))]
+        public void DnuPublishConsoleAppWithNoSourceOptionNormalizesVersionNumber(string flavor, string os, string architecture)
+        {
+            var runtimeHomeDir = _fixture.GetRuntimeHomeDir(flavor, os, architecture);
+
+            var projectStructure = @"{
+  '.': ['project.json', 'Config.json', 'Program.cs'],
+  'packages': {}
+}";
+            var expectedOutputStructure = @"{
+  'approot': {
+    'global.json': '',
+    'packages': {
+      'PROJECT_NAME': {
+        '1.0.0': {
+          '.': ['PROJECT_NAME.1.0.0.nupkg', 'PROJECT_NAME.1.0.0.nupkg.sha512', 'PROJECT_NAME.nuspec'],
+          'root': {
+            '.': ['Config.json', 'project.json', 'project.lock.json']
+          },
+          'lib': {
+            'dnx451': ['PROJECT_NAME.dll', 'PROJECT_NAME.xml']
+          }
+        }
+      }
+    }
+  }
+}".Replace("PROJECT_NAME", _projectName);
+
+            using (var testEnv = new DnuTestEnvironment(runtimeHomeDir, _projectName, _outputDirName))
+            {
+                DirTree.CreateFromJson(projectStructure)
+                    .WithFileContents("project.json", @"{
+  ""version"": ""1.0.0.0"",
+  ""frameworks"": {
+    ""dnx451"": {}
+  }
+}")
+                    .WriteTo(testEnv.ProjectPath);
+
+                var exitCode = DnuTestUtils.ExecDnu(
+                    runtimeHomeDir,
+                    subcommand: "restore",
+                    arguments: "",
+                    workingDir: testEnv.ProjectPath);
+                Assert.Equal(0, exitCode);
+
+                exitCode = DnuTestUtils.ExecDnu(
+                    runtimeHomeDir,
+                    subcommand: "publish",
+                    arguments: string.Format("--no-source --out {0}",
+                        testEnv.PublishOutputDirPath),
+                    workingDir: testEnv.ProjectPath);
+                Assert.Equal(0, exitCode);
+
+                var expectedOutputDir = DirTree.CreateFromJson(expectedOutputStructure);
+                Assert.True(expectedOutputDir.MatchDirectoryOnDisk(testEnv.PublishOutputDirPath,
+                    compareFileContents: false));
+            }
+        }
+
         [Theory]
         [MemberData(nameof(RuntimeComponents))]
         public void DnuPublishCopiesAllProjectsToOneSrcFolder(string flavor, string os, string architecture)