Fixed nuget version casing mismatch

- Always update the nuspec with the resolved version and id on install. #2970
aspnet · Oct 13, 2015 · ca79ade · ca79ade
1 parent 82ee48c
commit ca79ade
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 16 deletions.
diff --git a/misc/MismatchedVersionCasing/global.json b/misc/MismatchedVersionCasing/global.json
@@ -0,0 +1,4 @@
+{
+  "projects": [ "src" ],
+  "packages": "packages"
+}
diff --git a/misc/MismatchedVersionCasing/src/A/project.json b/misc/MismatchedVersionCasing/src/A/project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "dnx451": { }
+  },
+  "dependencies": {
+    "Contentful.NET": "0.0.5-Alpha"
+  }
+}
diff --git a/src/Microsoft.Dnx.Tooling/Utils/NuGetPackageUtils.cs b/src/Microsoft.Dnx.Tooling/Utils/NuGetPackageUtils.cs
@@ -77,23 +77,21 @@ await ConcurrencyUtilities.ExecuteWithFileLocked(targetNupkg, action: async _ =>
                     // Fixup the casing of the nuspec on disk to match what we expect
                     var nuspecFile = Directory.EnumerateFiles(targetPath, "*" + NuGet.Constants.ManifestExtension).Single();
 
-                    if (!string.Equals(nuspecFile, targetNuspec, StringComparison.Ordinal))
+                    Manifest manifest = null;
+                    using (var nuspecStream = File.OpenRead(nuspecFile))
                     {
-                        Manifest manifest = null;
-                        using (var nuspecStream = File.OpenRead(nuspecFile))
-                        {
-                            manifest = Manifest.ReadFrom(nuspecStream, validateSchema: false);
-                            manifest.Metadata.Id = library.Name;
-                        }
-
-                        // Delete the previous nuspec file
-                        File.Delete(nuspecFile);
-
-                        // Write the new manifest
-                        using (var targetNuspecStream = File.OpenWrite(targetNuspec))
-                        {
-                            manifest.Save(targetNuspecStream);
-                        }
+                        manifest = Manifest.ReadFrom(nuspecStream, validateSchema: false);
+                        manifest.Metadata.Id = library.Name;
+                        manifest.Metadata.Version = library.Version;
+                    }
+
+                    // Delete the previous nuspec file
+                    File.Delete(nuspecFile);
+
+                    // Write the new manifest
+                    using (var targetNuspecStream = File.OpenWrite(targetNuspec))
+                    {
+                        manifest.Save(targetNuspecStream);
                     }
 
                     // Note: PackageRepository relies on the hash file being written out as the final operation as part of a package install

diff --git a/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuRestoreTests.cs b/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuRestoreTests.cs
@@ -87,5 +87,16 @@ public void Restore_DoNotRestoreNestProjects(DnxSdk sdk)
             Assert.Equal(1, lockFiles.Length);
             Assert.Equal("Main", Path.GetFileName(Path.GetDirectoryName(lockFiles[0])));
         }
+
+        [Theory, TraceTest]
+        [MemberData(nameof(DnxSdks))]
+        public void Restore_NormalizesVersionCasing(DnxSdk sdk)
+        {
+            var solution = TestUtils.GetSolution<DnuRestoreTests>(sdk, "MismatchedVersionCasing");
+
+            var result = sdk.Dnu.Restore(solution.GetProject("A"));
+
+            Assert.Equal(0, result.ExitCode);
+        }
     }
 }