Fix channel ordering in aspire update - staging before daily (dotnet#12760)

* Initial plan

* Fix channel ordering - staging now appears before daily and PR channels

Co-authored-by: eerhardt <8291187+eerhardt@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: eerhardt <8291187+eerhardt@users.noreply.github.com>

Author: Copilot

src/Aspire.Cli/Packaging/PackagingService.cs

@@ -51,9 +51,9 @@ public Task<IEnumerable<PackageChannel>> GetChannelsAsync(CancellationToken canc
             }
         }
 
-        var channels = new List<PackageChannel>([defaultChannel, stableChannel, dailyChannel, ..prPackageChannels]);
+        var channels = new List<PackageChannel>([defaultChannel, stableChannel]);
 
-        // Add staging channel if feature is enabled
+        // Add staging channel if feature is enabled (after stable, before daily)
         if (features.IsFeatureEnabled(KnownFeatures.StagingChannelEnabled, false))
         {
             var stagingChannel = CreateStagingChannel();
@@ -63,6 +63,10 @@ public Task<IEnumerable<PackageChannel>> GetChannelsAsync(CancellationToken canc
             }
         }
 
+        // Add daily and PR channels after staging
+        channels.Add(dailyChannel);
+        channels.AddRange(prPackageChannels);
+
         return Task.FromResult<IEnumerable<PackageChannel>>(channels);
     }
 

tests/Aspire.Cli.Tests/Packaging/PackagingServiceTests.cs

@@ -229,4 +229,102 @@ public async Task NuGetConfigMerger_WhenChannelRequiresGlobalPackagesFolder_Adds
         Assert.NotNull(globalPackagesFolderAdd);
         Assert.Equal(".nugetpackages", (string?)globalPackagesFolderAdd.Attribute("value"));
     }
+
+    [Fact]
+    public async Task GetChannelsAsync_WhenStagingChannelEnabled_StagingAppearsAfterStableBeforeDaily()
+    {
+        // Arrange
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var tempDir = workspace.WorkspaceRoot;
+        var hivesDir = new DirectoryInfo(Path.Combine(tempDir.FullName, ".aspire", "hives"));
+        var cacheDir = new DirectoryInfo(Path.Combine(tempDir.FullName, ".aspire", "cache"));
+        
+        // Create some PR hives to ensure staging appears before them
+        hivesDir.Create();
+        Directory.CreateDirectory(Path.Combine(hivesDir.FullName, "pr-10167"));
+        Directory.CreateDirectory(Path.Combine(hivesDir.FullName, "pr-11832"));
+        
+        var executionContext = new CliExecutionContext(tempDir, hivesDir, cacheDir, new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
+        
+        var features = new TestFeatures();
+        features.SetFeature(KnownFeatures.StagingChannelEnabled, true);
+        
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["overrideStagingHash"] = "12345678"
+            })
+            .Build();
+
+        var packagingService = new PackagingService(executionContext, new FakeNuGetPackageCache(), features, configuration);
+
+        // Act
+        var channels = await packagingService.GetChannelsAsync();
+
+        // Assert
+        var channelNames = channels.Select(c => c.Name).ToList();
+        
+        // Verify all expected channels are present
+        Assert.Contains("default", channelNames);
+        Assert.Contains("stable", channelNames);
+        Assert.Contains("staging", channelNames);
+        Assert.Contains("daily", channelNames);
+        Assert.Contains("pr-10167", channelNames);
+        Assert.Contains("pr-11832", channelNames);
+        
+        // Verify the order: default, stable, staging, daily, pr-*
+        var defaultIndex = channelNames.IndexOf("default");
+        var stableIndex = channelNames.IndexOf("stable");
+        var stagingIndex = channelNames.IndexOf("staging");
+        var dailyIndex = channelNames.IndexOf("daily");
+        var pr10167Index = channelNames.IndexOf("pr-10167");
+        var pr11832Index = channelNames.IndexOf("pr-11832");
+        
+        Assert.True(defaultIndex < stableIndex, $"default should come before stable (default: {defaultIndex}, stable: {stableIndex})");
+        Assert.True(stableIndex < stagingIndex, $"stable should come before staging (stable: {stableIndex}, staging: {stagingIndex})");
+        Assert.True(stagingIndex < dailyIndex, $"staging should come before daily (staging: {stagingIndex}, daily: {dailyIndex})");
+        Assert.True(dailyIndex < pr10167Index, $"daily should come before pr-10167 (daily: {dailyIndex}, pr-10167: {pr10167Index})");
+        Assert.True(dailyIndex < pr11832Index, $"daily should come before pr-11832 (daily: {dailyIndex}, pr-11832: {pr11832Index})");
+    }
+
+    [Fact]
+    public async Task GetChannelsAsync_WhenStagingChannelDisabled_OrderIsDefaultStableDailyPr()
+    {
+        // Arrange
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var tempDir = workspace.WorkspaceRoot;
+        var hivesDir = new DirectoryInfo(Path.Combine(tempDir.FullName, ".aspire", "hives"));
+        var cacheDir = new DirectoryInfo(Path.Combine(tempDir.FullName, ".aspire", "cache"));
+        
+        // Create some PR hives
+        hivesDir.Create();
+        Directory.CreateDirectory(Path.Combine(hivesDir.FullName, "pr-12345"));
+        
+        var executionContext = new CliExecutionContext(tempDir, hivesDir, cacheDir, new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
+        
+        var features = new TestFeatures();
+        // Staging disabled by default
+        var configuration = new ConfigurationBuilder().Build();
+
+        var packagingService = new PackagingService(executionContext, new FakeNuGetPackageCache(), features, configuration);
+
+        // Act
+        var channels = await packagingService.GetChannelsAsync();
+
+        // Assert
+        var channelNames = channels.Select(c => c.Name).ToList();
+        
+        // Verify staging is not present
+        Assert.DoesNotContain("staging", channelNames);
+        
+        // Verify the order: default, stable, daily, pr-*
+        var defaultIndex = channelNames.IndexOf("default");
+        var stableIndex = channelNames.IndexOf("stable");
+        var dailyIndex = channelNames.IndexOf("daily");
+        var pr12345Index = channelNames.IndexOf("pr-12345");
+        
+        Assert.True(defaultIndex < stableIndex, "default should come before stable");
+        Assert.True(stableIndex < dailyIndex, "stable should come before daily");
+        Assert.True(dailyIndex < pr12345Index, "daily should come before pr-12345");
+    }
 }