Merge pull request #814 from DustinCampbell/fix-version-ranges

Handle package reference version ranges in .csproj files
OmniSharp · Apr 6, 2017 · 24fe1b0 · 24fe1b0
2 parents 47609c7 + 573400a
commit 24fe1b0
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 38 deletions.
diff --git a/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs b/src/OmniSharp.MSBuild/MSBuildProjectSystem.cs
@@ -495,24 +495,6 @@ private void UpdateReferences(Project project, IList<string> references)
             }
         }
 
-        private List<PackageDependency> CreatePackageDependencies(IEnumerable<PackageReference> packageReferences)
-        {
-            var list = new List<PackageDependency>();
-
-            foreach (var packageReference in packageReferences)
-            {
-                var dependency = new PackageDependency
-                {
-                    Name = packageReference.Identity.Id,
-                    Version = packageReference.Identity.Version?.ToNormalizedString()
-                };
-
-                list.Add(dependency);
-            }
-
-            return list;
-        }
-
         private void CheckForUnresolvedDependences(ProjectFileInfo projectFileInfo, ProjectFileInfo previousProjectFileInfo = null, bool allowAutoRestore = false)
         {
             List<PackageDependency> unresolvedDependencies;
@@ -534,22 +516,22 @@ private void CheckForUnresolvedDependences(ProjectFileInfo projectFileInfo, Proj
                 // Did the project file change? Diff the package references and see if there are unresolved dependencies.
                 if (previousProjectFileInfo != null)
                 {
-                    var packageReferencesToRemove = new HashSet<PackageReference>(previousProjectFileInfo.PackageReferences);
+                    var remainingPackageReferences = new HashSet<PackageReference>(previousProjectFileInfo.PackageReferences);
                     var packageReferencesToAdd = new HashSet<PackageReference>();
 
                     foreach (var packageReference in projectFileInfo.PackageReferences)
                     {
-                        if (packageReferencesToRemove.Contains(packageReference))
+                        if (remainingPackageReferences.Contains(packageReference))
                         {
-                            packageReferencesToRemove.Remove(packageReference);
+                            remainingPackageReferences.Remove(packageReference);
                         }
                         else
                         {
                             packageReferencesToAdd.Add(packageReference);
                         }
                     }
 
-                    unresolvedPackageReferences = packageReferencesToAdd.Concat(packageReferencesToRemove);
+                    unresolvedPackageReferences = packageReferencesToAdd.Concat(remainingPackageReferences);
                 }
                 else
                 {
@@ -561,7 +543,7 @@ private void CheckForUnresolvedDependences(ProjectFileInfo projectFileInfo, Proj
                     var lockFile = lockFileFormat.Read(projectFileInfo.ProjectAssetsFile);
 
                     unresolvedPackageReferences = projectFileInfo.PackageReferences
-                        .Where(pr => lockFile.GetLibrary(pr.Identity.Id, pr.Identity.Version) == null);
+                        .Where(pr => !ContainsPackageReference(lockFile, pr));
                 }
 
                 unresolvedDependencies = CreatePackageDependencies(unresolvedPackageReferences);
@@ -583,6 +565,38 @@ private void CheckForUnresolvedDependences(ProjectFileInfo projectFileInfo, Proj
             }
         }
 
+        private List<PackageDependency> CreatePackageDependencies(IEnumerable<PackageReference> packageReferences)
+        {
+            var list = new List<PackageDependency>();
+
+            foreach (var packageReference in packageReferences)
+            {
+                var dependency = new PackageDependency
+                {
+                    Name = packageReference.Dependency.Id,
+                    Version = packageReference.Dependency.VersionRange.ToNormalizedString()
+                };
+
+                list.Add(dependency);
+            }
+
+            return list;
+        }
+
+        private static bool ContainsPackageReference(LockFile lockFile, PackageReference reference)
+        {
+            foreach (var library in lockFile.Libraries)
+            {
+                if (string.Equals(library.Name, reference.Dependency.Id) &&
+                    reference.Dependency.VersionRange.Satisfies(library.Version))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private void FireUnresolvedDependenciesEvent(ProjectFileInfo projectFileInfo, List<PackageDependency> unresolvedDependencies)
         {
             _eventEmitter.Emit(EventTypes.UnresolvedDependencies,

diff --git a/src/OmniSharp.MSBuild/ProjectFile/PackageReference.cs b/src/OmniSharp.MSBuild/ProjectFile/PackageReference.cs
@@ -5,26 +5,25 @@ namespace OmniSharp.MSBuild.ProjectFile
 {
     public class PackageReference : IEquatable<PackageReference>
     {
-        public PackageIdentity Identity { get; }
+        public PackageDependency Dependency { get; }
         public bool IsImplicitlyDefined { get; }
 
-        public PackageReference(PackageIdentity identity, bool isImplicitlyDefined)
+        public PackageReference(PackageDependency dependency, bool isImplicitlyDefined)
         {
-            this.Identity = identity;
+            this.Dependency = dependency;
             this.IsImplicitlyDefined = isImplicitlyDefined;
         }
 
         public override string ToString()
         {
-            var version = Identity.HasVersion ? ", " + Identity.Version.ToNormalizedString() : string.Empty;
             var implicitSuffix = IsImplicitlyDefined ? " (implicit)" : string.Empty;
 
-            return Identity.Id + version + implicitSuffix;
+            return Dependency.Id + ", " + Dependency.VersionRange + implicitSuffix;
         }
 
         public bool Equals(PackageReference other)
         {
-            if (!Identity.Equals(other.Identity))
+            if (!Dependency.Equals(other.Dependency))
             {
                 return false;
             }
@@ -34,7 +33,7 @@ public bool Equals(PackageReference other)
 
         public override int GetHashCode()
         {
-            return this.Identity.GetHashCode() + (IsImplicitlyDefined ? 1 : 0);
+            return this.Dependency.GetHashCode() + (IsImplicitlyDefined ? 1 : 0);
         }
     }
 }
diff --git a/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs b/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs
@@ -9,7 +9,6 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.Extensions.Logging;
 using NuGet.Packaging.Core;
-using OmniSharp.Models;
 using OmniSharp.Options;
 using OmniSharp.Utilities;
 
@@ -114,7 +113,7 @@ public static ProjectFileInfo Create(
             string solutionDirectory,
             ILogger logger,
             MSBuildOptions options = null,
-            ICollection<MSBuildDiagnosticsMessage> diagnostics = null,
+            ICollection<Models.MSBuildDiagnosticsMessage> diagnostics = null,
             bool isUnityProject = false)
         {
             if (!File.Exists(projectFilePath))
@@ -250,11 +249,11 @@ private static IList<PackageReference> GetPackageReferences(ICollection<ProjectI
             foreach (var item in items)
             {
                 var name = item.EvaluatedInclude;
-                var version = PropertyConverter.ToNuGetVersion(item.GetMetadataValue(MetadataNames.Version));
-                var identity = new PackageIdentity(name, version);
+                var versionRange = PropertyConverter.ToVersionRange(item.GetMetadataValue(MetadataNames.Version));
+                var dependency = new PackageDependency(name, versionRange);
                 var isImplicitlyDefined = PropertyConverter.ToBoolean(item.GetMetadataValue(MetadataNames.IsImplicitlyDefined), false);
 
-                list.Add(new PackageReference(identity, isImplicitlyDefined));
+                list.Add(new PackageReference(dependency, isImplicitlyDefined));
             }
 
             return list;

diff --git a/src/OmniSharp.MSBuild/ProjectFile/PropertyConverter.cs b/src/OmniSharp.MSBuild/ProjectFile/PropertyConverter.cs
@@ -165,10 +165,9 @@ public static OutputKind ToOutputKind(string propertyValue)
             }
         }
 
-        public static NuGetVersion ToNuGetVersion(string propertyValue)
+        public static VersionRange ToVersionRange(string propertyValue)
         {
-            NuGetVersion version;
-            if (NuGetVersion.TryParse(propertyValue.Trim(), out version))
+            if (VersionRange.TryParse(propertyValue.Trim(), out var version))
             {
                 return version;
             }