Merge pull request #129 from jmarolf/bugix/fix-packages

forward to correct package name
dotnet · Nov 11, 2019 · 33daecc · 33daecc
2 parents 5641c01 + 74e5487
commit 33daecc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/MSBuild.Abstractions/NugetHelpers.cs b/src/MSBuild.Abstractions/NugetHelpers.cs
@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.VisualBasic;
 
 namespace MSBuild.Abstractions
 {
@@ -42,5 +44,15 @@ static string GetVersionFromQueryResponse(Stream result)
                 return null;
             }
         }
+
+        public static string FindPackageNameFromReferenceName(string referenceName)
+        {
+            if (StringComparer.OrdinalIgnoreCase.Compare(referenceName, "System.ComponentModel.DataAnnotations")==0)
+            {
+                return "System.ComponentModel.Annotations";
+            }
+
+            return referenceName;
+        }
     }
 }
diff --git a/src/MSBuild.Conversion.Project/ProjectRootElementExtensions.cs b/src/MSBuild.Conversion.Project/ProjectRootElementExtensions.cs
@@ -155,7 +155,7 @@ public static IProjectRootElement RemoveOrUpdateItems(this IProjectRootElement p
                     }
                     else if (ProjectItemHelpers.IsReferenceConvertibleToPackageReference(item))
                     {
-                        var packageName = item.Include;
+                        string packageName = NugetHelpers.FindPackageNameFromReferenceName(item.Include);
                         string version = null;
                         try
                         {