Fix TFM ordering in Dependencies tab using NuGetFrameworkSorter

src/NuGetGallery/ViewModels/DependencySetsViewModel.cs

@@ -24,21 +24,41 @@ public DependencySetsViewModel(IEnumerable<PackageDependency> packageDependencie
 
                 OnlyHasAllFrameworks = dependencySets.Count() == 1 && dependencySets.First().Key == null;
 
+                // Create a list to hold TFM string, parsed framework, and dependencies for proper sorting
+                var frameworkGroups = new List<(string tfmString, NuGetFramework framework, string friendlyName, IEnumerable<DependencyViewModel> dependencies)>();
+
                 foreach (var dependencySet in dependencySets)
                 {
-                    var targetFramework = dependencySet.Key == null
-                                              ? "All Frameworks"
-                                              : NuGetFramework.Parse(dependencySet.Key).ToFriendlyName();
+                    string tfmString = dependencySet.Key;
+                    string friendlyName;
+                    NuGetFramework framework;
 
-                    if (!DependencySets.ContainsKey(targetFramework))
+                    if (tfmString == null)
+                    {
+                        friendlyName = "All Frameworks";
+                        framework = null;
+                    }
+                    else
                     {
-                        DependencySets.Add(targetFramework,
-                            dependencySet.OrderBy(x => x.Id).Select(d => d.Id == null ? null : new DependencyViewModel(d.Id, d.VersionSpec)));
+                        framework = NuGetFramework.Parse(tfmString);
+                        friendlyName = framework.ToFriendlyName();
                     }
+
+                    var dependencies = dependencySet.OrderBy(x => x.Id, StringComparer.OrdinalIgnoreCase).Select(d => d.Id == null ? null : new DependencyViewModel(d.Id, d.VersionSpec));
+                    frameworkGroups.Add((tfmString, framework, friendlyName, dependencies));
                 }
 
-                // Order the top level frameworks by their resulting friendly name
-                DependencySets = DependencySets.OrderBy(x => x.Key).ToDictionary(x => x.Key, x => x.Value);
+                // Sort by framework using NuGetFrameworkSorter, with null frameworks (All Frameworks) first
+                var sortedGroups = frameworkGroups.OrderBy(g => g.framework, NullableFrameworkComparer.Instance);
+
+                // Build the final dictionary with friendly names
+                foreach (var group in sortedGroups)
+                {
+                    if (!DependencySets.ContainsKey(group.friendlyName))
+                    {
+                        DependencySets.Add(group.friendlyName, group.dependencies);
+                    }
+                }
             }
             catch (Exception e)
             {
@@ -72,5 +92,20 @@ public DependencyViewModel(string id, string versionSpec)
             public string VersionSpec { get; private set; }
             public string PackageUrl { get; private set; }
         }
+
+        private class NullableFrameworkComparer : IComparer<NuGetFramework>
+        {
+            public static readonly NullableFrameworkComparer Instance = new NullableFrameworkComparer();
+
+            public int Compare(NuGetFramework x, NuGetFramework y)
+            {
+                // Put "All Frameworks" (null) first
+                if (x == null && y == null) return 0;
+                if (x == null) return -1;
+                if (y == null) return 1;
+                // Use NuGetFrameworkSorter for actual frameworks
+                return NuGetFrameworkSorter.Instance.Compare(x, y);
+            }
+        }
     }
 }

tests/NuGetGallery.Facts/ViewModels/DependencySetsViewModelFacts.cs

@@ -91,6 +91,57 @@ public void GivenAListOfDependenciesPackageIdsWillBeOrdered()
                 Assert.Equal("cde", dependencyViewModels[2].Id);
                 Assert.Equal("def", dependencyViewModels[3].Id);
             }
+
+            [Fact]
+            public void GivenAListOfDependenciesPackageIdsWillBeOrderedCaseInsensitively()
+            {
+                // Arrange
+                var dependencies = new[]
+                {
+                    new PackageDependency { TargetFramework = null, Id = "Zebra" },
+                    new PackageDependency { TargetFramework = null, Id = "apple" },
+                    new PackageDependency { TargetFramework = null, Id = "Banana" },
+                    new PackageDependency { TargetFramework = null, Id = "cherry" }
+                };
+
+                // Act
+                var viewModel = new DependencySetsViewModel(dependencies);
+
+                // Assert
+                Assert.Single(viewModel.DependencySets);
+                Assert.Equal(4, viewModel.DependencySets.First().Value.Count());
+
+                var dependencyViewModels = viewModel.DependencySets.First().Value.ToList();
+
+                Assert.Equal("apple", dependencyViewModels[0].Id);
+                Assert.Equal("Banana", dependencyViewModels[1].Id);
+                Assert.Equal("cherry", dependencyViewModels[2].Id);
+                Assert.Equal("Zebra", dependencyViewModels[3].Id);
+            }
+
+            [Fact]
+            public void GivenAListOfDependenciesNet10WillBeOrderedAfterNet9()
+            {
+                // Arrange
+                var dependencies = new[]
+                {
+                    new PackageDependency { TargetFramework = "net10.0" },
+                    new PackageDependency { TargetFramework = "net8.0" },
+                    new PackageDependency { TargetFramework = "net9.0" }
+                };
+
+                // Act
+                var viewModel = new DependencySetsViewModel(dependencies);
+
+                // Assert
+                Assert.Equal(3, viewModel.DependencySets.Count);
+
+                var dependencySetsList = viewModel.DependencySets.Keys.ToList();
+
+                Assert.Equal("net8.0", dependencySetsList[0]);
+                Assert.Equal("net9.0", dependencySetsList[1]);
+                Assert.Equal("net10.0", dependencySetsList[2]);
+            }
         }
     }
 }