Merge pull request #168 from credfeto/feat/support-packages-as-product-sdk

Added support for updating SDK packages

Author: credfeto

CHANGELOG.md

@@ -7,6 +7,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 
 ## [Unreleased]
 ### Added
+- Support for packages in Product SDK
 ### Fixed
 ### Changed
 - FF-1429 - Updated SonarAnalyzer.CSharp to 8.30.0.37606

src/Credfeto.Package.Update/Helpers/ProjectHelpers.cs

@@ -22,7 +22,7 @@ internal static class ProjectHelpers
                                                                        CloseOutput = true
                                                                    };
 
-        public static string[] FindProjects(string folder)
+        public static IReadOnlyList<string> FindProjects(string folder)
         {
             return Directory.EnumerateFiles(path: folder, searchPattern: "*.csproj", searchOption: SearchOption.AllDirectories)
                             .ToArray();
@@ -32,10 +32,35 @@ public static IEnumerable<string> GetPackageIds(IReadOnlyList<string> projects)
         {
             return projects.Select(TryLoadDocument)
                            .Where(doc => doc != null)
-                           .Select(doc => doc!.SelectNodes(xpath: "/Project/ItemGroup/PackageReference"))
-                           .Where(nodes => nodes != null)
-                           .SelectMany(nodes => nodes!.OfType<XmlElement>())
-                           .Select(node => node.GetAttribute(name: "Include"));
+                           .Select(doc => doc!)
+                           .SelectMany(doc => GetPackagesFromReferences(doc)
+                                           .Concat(GetPackagesFromSdk(doc)))
+                           .Select(item => item.ToLowerInvariant())
+                           .Distinct();
+        }
+
+        private static IEnumerable<string> GetPackagesFromSdk(XmlDocument doc)
+        {
+            if (doc.SelectSingleNode("/Project") is not XmlElement project)
+            {
+                yield break;
+            }
+
+            IReadOnlyList<string> sdk = project.GetAttribute("Sdk")
+                                               .Split("/");
+
+            if (sdk.Count == 2)
+            {
+                yield return sdk[0];
+            }
+        }
+
+        private static IEnumerable<string> GetPackagesFromReferences(XmlDocument doc)
+        {
+            return doc.SelectNodes(xpath: "/Project/ItemGroup/PackageReference")
+                      ?.OfType<XmlElement>()
+                      .Select(node => node!.GetAttribute(name: "Include"))
+                      .Where(include => !string.IsNullOrWhiteSpace(include)) ?? Array.Empty<string>();
         }
 
         public static XmlDocument? TryLoadDocument(string project)

src/Credfeto.Package.Update/Program.cs

@@ -188,42 +188,109 @@ private static void UpdateProject(string project, IReadOnlyDictionary<string, Nu
                 return;
             }
 
-            int changes = 0;
+            Console.WriteLine();
+            Console.WriteLine($"* {project}");
+
+            bool sdkUpdated = TryUpdateSdk(doc: doc, packages: packages, updates: updates);
+            bool packageReferencesUpdated = TryUpdatePackageReferences(doc: doc, packages: packages, updates: updates);
+
+            if (sdkUpdated || packageReferencesUpdated)
+            {
+                Console.WriteLine(value: "=========== UPDATED ===========");
+
+                ProjectHelpers.SaveProject(project: project, doc: doc);
+            }
+        }
+
+        private static bool TryUpdatePackageReferences(XmlDocument doc, IReadOnlyDictionary<string, NuGetVersion> packages, Dictionary<string, NuGetVersion> updates)
+        {
             XmlNodeList? nodes = doc.SelectNodes(xpath: "/Project/ItemGroup/PackageReference");
 
-            if (nodes != null && nodes.Count != 0)
+            if (nodes == null || nodes.Count == 0)
             {
-                Console.WriteLine();
-                Console.WriteLine($"* {project}");
+                return false;
+            }
+
+            bool packageReferencesUpdated = false;
 
-                foreach (XmlElement node in nodes.OfType<XmlElement>())
+            foreach (XmlElement node in nodes.OfType<XmlElement>())
+            {
+                string package = node.GetAttribute(name: "Include");
+
+                foreach ((string nugetPackageId, NuGetVersion nugetVersion) in packages)
                 {
-                    string package = node.GetAttribute(name: "Include");
+                    if (!PackageIdHelpers.IsExactMatch(package: package, packageId: nugetPackageId))
+                    {
+                        continue;
+                    }
 
-                    foreach ((string nugetPackageId, NuGetVersion nugetVersion) in packages)
+                    bool updated = UpdateOnePackage(node: node, installedPackageId: package, nugetPackageId: nugetPackageId, nugetVersion: nugetVersion);
+
+                    if (updated)
                     {
-                        if (PackageIdHelpers.IsExactMatch(package: package, packageId: nugetPackageId))
-                        {
-                            bool updated = UpdateOnePackage(node: node, installedPackageId: package, nugetPackageId: nugetPackageId, nugetVersion: nugetVersion);
-
-                            if (updated)
-                            {
-                                TrackUpdate(updates: updates, nugetPackageId: nugetPackageId, nugetVersion: nugetVersion);
-                                changes++;
-                            }
-
-                            break;
-                        }
+                        TrackUpdate(updates: updates, nugetPackageId: nugetPackageId, nugetVersion: nugetVersion);
+                        packageReferencesUpdated = true;
                     }
+
+                    break;
+                }
+            }
+
+            return packageReferencesUpdated;
+        }
+
+        private static bool TryUpdateSdk(XmlDocument doc, IReadOnlyDictionary<string, NuGetVersion> packages, Dictionary<string, NuGetVersion> updates)
+        {
+            if (doc.SelectSingleNode("/Project") is not XmlElement projectNode)
+            {
+                return false;
+            }
+
+            string sdk = projectNode.GetAttribute("Sdk");
+
+            if (string.IsNullOrWhiteSpace(sdk))
+            {
+                return false;
+            }
+
+            IReadOnlyList<string> parts = sdk.Split("/");
+
+            if (parts.Count != 2)
+            {
+                return false;
+            }
+
+            string installedPackageId = parts[0];
+            string installedVersion = parts[1];
+
+            foreach ((string nugetPackageId, NuGetVersion nugetVersion) in packages)
+            {
+                if (!PackageIdHelpers.IsExactMatch(package: installedPackageId, packageId: nugetPackageId))
+                {
+                    continue;
                 }
 
-                if (changes != 0)
+                bool upgrade = ShouldUpgrade(installedVersion: installedVersion, nugetVersion: nugetVersion);
+
+                if (!upgrade)
                 {
-                    Console.WriteLine(value: "=========== UPDATED ===========");
+                    Console.WriteLine($"  >> {installedPackageId} Installed: {installedVersion} Upgrade: False.");
 
-                    ProjectHelpers.SaveProject(project: project, doc: doc);
+                    return false;
                 }
+
+                Console.WriteLine($"  >> {installedPackageId} Installed: {installedVersion} Upgrade: True. New Version: {nugetVersion}.");
+                string newSdk = string.Join(separator: "/", nugetPackageId, nugetVersion);
+                projectNode.SetAttribute(name: "Sdk", value: newSdk);
+
+                TrackUpdate(updates: updates, nugetPackageId: nugetPackageId, nugetVersion: nugetVersion);
+
+                return true;
+
+                // Package matched but was not upgraded.
             }
+
+            return false;
         }
 
         private static bool UpdateOnePackage(XmlElement node, string installedPackageId, string nugetPackageId, NuGetVersion nugetVersion)