Use the same release index so we don't download it twice

Author: nagilson

src/Installer/Microsoft.Dotnet.Installation/Internal/ArchiveDotnetExtractor.cs

@@ -19,22 +19,24 @@ internal class ArchiveDotnetExtractor : IDisposable
     private readonly DotnetInstallRequest _request;
     private readonly ReleaseVersion _resolvedVersion;
     private readonly IProgressTarget _progressTarget;
+    private readonly ReleaseManifest _releaseManifest;
     private string scratchDownloadDirectory;
     private string? _archivePath;
 
-    public ArchiveDotnetExtractor(DotnetInstallRequest request, ReleaseVersion resolvedVersion, IProgressTarget progressTarget)
+    public ArchiveDotnetExtractor(DotnetInstallRequest request, ReleaseVersion resolvedVersion, ReleaseManifest releaseManifest, IProgressTarget progressTarget)
     {
         _request = request;
         _resolvedVersion = resolvedVersion;
         _progressTarget = progressTarget;
+        _releaseManifest = new();
         scratchDownloadDirectory = Directory.CreateTempSubdirectory().FullName;
     }
 
     public void Prepare()
     {
         using var activity = InstallationActivitySource.ActivitySource.StartActivity("DotnetInstaller.Prepare");
 
-        using var archiveDownloader = new DotnetArchiveDownloader();
+        using var archiveDownloader = new DotnetArchiveDownloader(_releaseManifest);
         var archiveName = $"dotnet-{Guid.NewGuid()}";
         _archivePath = Path.Combine(scratchDownloadDirectory, archiveName + DnupUtilities.GetArchiveFileExtensionForPlatform());
 

src/Installer/Microsoft.Dotnet.Installation/Internal/ChannelVersionResolver.cs

@@ -10,11 +10,21 @@ namespace Microsoft.Dotnet.Installation.Internal;
 
 internal class ChannelVersionResolver
 {
-    public IEnumerable<string> GetSupportedChannels()
+    private ReleaseManifest _releaseManifest = new();
+
+    public ChannelVersionResolver()
     {
-        // TODO: Share this with other methods from this class
-        var productIndex = ProductCollection.GetAsync().GetAwaiter().GetResult();
 
+    }
+
+    public ChannelVersionResolver(ReleaseManifest releaseManifest)
+    {
+        _releaseManifest = releaseManifest;
+    }
+
+    public IEnumerable<string> GetSupportedChannels()
+    {
+        var productIndex = _releaseManifest.GetReleasesIndex();
         return ["latest", "preview", "lts", "sts",
             ..productIndex
                 .Where(p => p.IsSupported)
@@ -85,17 +95,17 @@ static IEnumerable<string> GetChannelsForProduct(Product product)
         if (string.Equals(channel.Name, "lts", StringComparison.OrdinalIgnoreCase) || string.Equals(channel.Name, "sts", StringComparison.OrdinalIgnoreCase))
         {
             var releaseType = string.Equals(channel.Name, "lts", StringComparison.OrdinalIgnoreCase) ? ReleaseType.LTS : ReleaseType.STS;
-            var productIndex = ProductCollection.GetAsync().GetAwaiter().GetResult();
+            var productIndex = _releaseManifest.GetReleasesIndex();
             return GetLatestVersionByReleaseType(productIndex, releaseType, component);
         }
         else if (string.Equals(channel.Name, "preview", StringComparison.OrdinalIgnoreCase))
         {
-            var productIndex = ProductCollection.GetAsync().GetAwaiter().GetResult();
+            var productIndex = _releaseManifest.GetReleasesIndex();
             return GetLatestPreviewVersion(productIndex, component);
         }
         else if (string.Equals(channel.Name, "latest", StringComparison.OrdinalIgnoreCase))
         {
-            var productIndex = ProductCollection.GetAsync().GetAwaiter().GetResult();
+            var productIndex = _releaseManifest.GetReleasesIndex();
             return GetLatestActiveVersion(productIndex, component);
         }
 
@@ -114,7 +124,7 @@ static IEnumerable<string> GetChannelsForProduct(Product product)
         }
 
         // Load the index manifest
-        var index = ProductCollection.GetAsync().GetAwaiter().GetResult();
+        var index = _releaseManifest.GetReleasesIndex();
         if (minor < 0)
         {
             return GetLatestVersionForMajorOrMajorMinor(index, major, component); // Major Only (e.g., "9")
@@ -241,7 +251,7 @@ private static int NormalizeFeatureBandInput(string band)
 
         var validProducts = GetProductsInMajorOrMajorMinor(index, major, minor);
         var latestProduct = validProducts.FirstOrDefault();
-        var releases = latestProduct?.GetReleasesAsync().GetAwaiter().GetResult().ToList() ?? new List<ProductRelease>();
+        var releases = latestProduct?.GetReleasesAsync().GetAwaiter().GetResult().ToList() ?? [];
         var normalizedFeatureBand = NormalizeFeatureBandInput(featureBand);
 
         foreach (var release in releases)

src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetArchiveDownloader.cs

@@ -32,6 +32,12 @@ public DotnetArchiveDownloader()
     {
     }
 
+    public DotnetArchiveDownloader(ReleaseManifest releaseManifest)
+        : this(CreateDefaultHttpClient())
+    {
+        _releaseManifest = releaseManifest ?? throw new ArgumentNullException(nameof(releaseManifest));
+    }
+
     /// <summary>
     /// Creates an HttpClient with enhanced proxy support for enterprise environments.
     /// </summary>

src/Installer/Microsoft.Dotnet.Installation/Internal/DotnetInstaller.cs

@@ -26,9 +26,11 @@ public void Install(DotnetInstallRoot dotnetRoot, InstallComponent component, Re
             activity?.SetTag("install.component", component.ToString());
             activity?.SetTag("install.version", version.ToString());
 
+            ReleaseManifest releaseManifest = new();
+
             var installRequest = new DotnetInstallRequest(dotnetRoot, new UpdateChannel(version.ToString()), component, new InstallRequestOptions());
 
-            using ArchiveDotnetExtractor installer = new(installRequest, version, _progressTarget);
+            using ArchiveDotnetExtractor installer = new(installRequest, version, releaseManifest, _progressTarget);
             installer.Prepare();
             installer.Commit();
         }

src/Installer/dnup/InstallerOrchestratorSingleton.cs

@@ -25,7 +25,8 @@ private InstallerOrchestratorSingleton()
     public DotnetInstall? Install(DotnetInstallRequest installRequest, bool noProgress = false)
     {
         // Map InstallRequest to DotnetInstallObject by converting channel to fully specified version
-        ReleaseVersion? versionToInstall = new ChannelVersionResolver().Resolve(installRequest);
+        ReleaseManifest releaseManifest = new();
+        ReleaseVersion? versionToInstall = new ChannelVersionResolver(releaseManifest).Resolve(installRequest);
 
         if (versionToInstall == null)
         {
@@ -53,7 +54,7 @@ private InstallerOrchestratorSingleton()
 
         IProgressTarget progressTarget = noProgress ? new NonUpdatingProgressTarget() : new SpectreProgressTarget();
 
-        using ArchiveDotnetExtractor installer = new(installRequest, versionToInstall, progressTarget);
+        using ArchiveDotnetExtractor installer = new(installRequest, versionToInstall, releaseManifest, progressTarget);
         installer.Prepare();
 
         // Extract and commit the install to the directory