Improve pruned package data loading and handling

src/Installer/redist-installer/targets/GenerateBundledVersions.targets

@@ -28,7 +28,6 @@
        <Output TaskParameter="DependencyVersion" PropertyName="DepAspNetCoreVersion" />
        <Output TaskParameter="DependencyCommit" PropertyName="DepAspNetCoreCommit" />
     </GetDependencyInfo>
-
     <GetDependencyInfo
       VersionDetailsXmlFile="$(RepoRoot)eng/Version.Details.xml"
       DependencyName="Microsoft.WindowsDesktop.App.Ref">
@@ -535,6 +534,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
     <NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
+    <PrunePackageDataRoot Condition="'%24(PrunePackageDataRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(MSBuildThisFileDirectory)'))PrunePackageData</PrunePackageDataRoot>
 
     <_NetFrameworkHostedCompilersVersion>$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)</_NetFrameworkHostedCompilersVersion>
     <NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>

src/Layout/redist/redist.csproj

@@ -22,6 +22,7 @@
   <Import Project="targets\BundledTools.targets" />
   <Import Project="targets\PublishDotnetWatch.targets" />
   <Import Project="targets\GenerateLayout.targets" />
+  <Import Project="targets\GeneratePackagePruneData.targets" />
   <Import Project="targets\OverlaySdkOnLKG.targets" Condition="'$(DotNetBuild)' != 'true'" />
 
   <ItemGroup>

src/Layout/redist/targets/GenerateLayout.targets

@@ -459,6 +459,7 @@
                             PublishFSharp;
                             PublishBlazorWasmTools;
                             PublishStaticWebAssetsTools;
+                            GeneratePackagePruneData;
                             GenerateCliRuntimeConfigurationFiles;
                             MakeFscRunnableAndMoveToPublishDir;
                             RemoveFscFilesAfterPublish;

src/Layout/redist/targets/GeneratePackagePruneData.targets

@@ -0,0 +1,60 @@
+<Project>
+
+  <Target Name="GeneratePackagePruneData">
+
+    <GeneratePackagePruneDataDownloads
+          NETCoreAppTargetFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)">
+       <Output TaskParameter="TargetingPackDownloads" ItemName="TargetingPackForPruneData" />
+    </GeneratePackagePruneDataDownloads>
+
+    <CollatePackageDownloads Packages="@(TargetingPackForPruneData)">
+      <Output TaskParameter="PackageDownloads" ItemName="TargetingPackForPruneDataCollated" />
+    </CollatePackageDownloads>
+
+    <!-- Can't run custom tasks in the build before NuGet restore, so create a separate project and restore that to download the packages -->
+    <PropertyGroup>
+      <PrunePackDownloadProjectContent>
+        <![CDATA[
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(TargetFramework)</TargetFramework>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+  <ItemGroup>
+    @(TargetingPackForPruneDataCollated->'<PackageDownload Include="%(Identity)" Version="%(Version)" />', '
+    ')
+  </ItemGroup>
+</Project>
+]]>
+      </PrunePackDownloadProjectContent>
+      <!-- Escape semicolons as %3B in order to avoid being interpreted as line splits in WriteLinesToFile -->
+      <PrunePackDownloadProjectContent>$(PrunePackDownloadProjectContent.Replace(';', '%3B'))</PrunePackDownloadProjectContent>
+      <PrunePackDownloadProjectDirectory>$(IntermediateOutputPath)PrunePackDownloader\</PrunePackDownloadProjectDirectory>
+      <PrunePackDownloadProjectPath>$(PrunePackDownloadProjectDirectory)PrunePackPackageDownloader.csproj</PrunePackDownloadProjectPath>
+    </PropertyGroup>
+
+    <MakeDir Directories="$(PrunePackDownloadProjectDirectory)" />
+    <WriteLinesToFile Lines="$(PrunePackDownloadProjectContent)"
+                      File="$(PrunePackDownloadProjectPath)"
+                      Overwrite="True" WriteOnlyWhenDifferent="True" />
+
+    <MSBuild Projects="$(PrunePackDownloadProjectPath)"
+             Targets="Restore" />
+
+
+    <ItemGroup>
+      <PrunePackageCopyData Include="@(TargetingPackForPruneData)">
+        <Source>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/%(PackageVersion)/data/PackageOverrides.txt</Source>
+        <Destination>$(OutputPath)/PrunePackageData/%(TargetFrameworkVersion)/%(FrameworkName)/PackageOverrides.txt</Destination>
+      </PrunePackageCopyData>
+    </ItemGroup>
+
+    <Copy SourceFiles="%(PrunePackageCopyData.Source)"
+      DestinationFiles="%(Destination)"
+      SkipUnchangedFiles="true"
+      Condition="Exists(%(PrunePackageCopyData.Source))"
+          />
+
+  </Target>
+
+</Project>

src/Tasks/Common/ConflictResolution/PackageOverride.cs

@@ -25,14 +25,14 @@ internal class PackageOverride
         public string PackageName { get; }
         public Dictionary<string, OverrideVersion> OverriddenPackages { get; }
 
-        private PackageOverride(string packageName, IEnumerable<Tuple<string, OverrideVersion>> overriddenPackages)
+        private PackageOverride(string packageName, IEnumerable<(string id, OverrideVersion version)> overriddenPackages)
         {
             PackageName = packageName;
 
             OverriddenPackages = new Dictionary<string, OverrideVersion>(StringComparer.OrdinalIgnoreCase);
-            foreach (Tuple<string, OverrideVersion> package in overriddenPackages)
+            foreach (var package in overriddenPackages)
             {
-                OverriddenPackages[package.Item1] = package.Item2;
+                OverriddenPackages[package.id] = package.version;
             }
         }
 
@@ -44,27 +44,34 @@ public static PackageOverride Create(ITaskItem packageOverrideItem)
             return new PackageOverride(packageName, CreateOverriddenPackages(overriddenPackagesString));
         }
 
-        private static IEnumerable<Tuple<string, OverrideVersion>> CreateOverriddenPackages(string overriddenPackagesString)
+        private static IEnumerable<(string id, OverrideVersion version)> CreateOverriddenPackages(string overriddenPackagesString)
         {
             if (!string.IsNullOrEmpty(overriddenPackagesString))
             {
                 overriddenPackagesString = overriddenPackagesString.Trim();
                 string[] overriddenPackagesAndVersions = overriddenPackagesString.Split(new char[] { ';', '\r', '\n', ' ' }, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string overriddenPackagesAndVersion in overriddenPackagesAndVersions)
+                return CreateOverriddenPackages(overriddenPackagesAndVersions);
+            }
+            return Enumerable.Empty<(string id, OverrideVersion version)>();
+        }
+
+        public static IEnumerable<(string id, OverrideVersion version)> CreateOverriddenPackages(IEnumerable<string> packageOverrideFileLines)
+        {
+            foreach (string overriddenPackagesAndVersion in packageOverrideFileLines)
+            {
+                string trimmedOverriddenPackagesAndVersion = overriddenPackagesAndVersion.Trim();
+                int separatorIndex = trimmedOverriddenPackagesAndVersion.IndexOf('|');
+                if (separatorIndex != -1)
                 {
-                    string trimmedOverriddenPackagesAndVersion = overriddenPackagesAndVersion.Trim();
-                    int separatorIndex = trimmedOverriddenPackagesAndVersion.IndexOf('|');
-                    if (separatorIndex != -1)
+                    string versionString = trimmedOverriddenPackagesAndVersion.Substring(separatorIndex + 1);
+                    string overriddenPackage = trimmedOverriddenPackagesAndVersion.Substring(0, separatorIndex);
+                    if (OverrideVersion.TryParse(versionString, out OverrideVersion? version))
                     {
-                        string versionString = trimmedOverriddenPackagesAndVersion.Substring(separatorIndex + 1);
-                        string overriddenPackage = trimmedOverriddenPackagesAndVersion.Substring(0, separatorIndex);
-                        if (OverrideVersion.TryParse(versionString, out OverrideVersion? version))
-                        {
-                            yield return Tuple.Create(overriddenPackage, version);
-                        }
+                        yield return (overriddenPackage, version);
                     }
                 }
             }
+
         }
     }
 }

src/Tasks/Common/Resources/Strings.resx

@@ -978,9 +978,13 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1224: ASP.NET Core framework assets are not supported for the target framework.</value>
     <comment>{StrBegins="NETSDK1224: "}</comment>
   </data>
-  <!-- The latest message added is NativeCompilationRequiresPublishing. Please update this value with each PR to catch parallel PRs both adding a new message -->
   <data name="NativeCompilationRequiresPublishing" xml:space="preserve">
     <value>NETSDK1225: Native compilation is not supported when invoking the Publish target directly. Try running dotnet publish.</value>
     <comment>{StrBegins="NETSDK1225: "}</comment>
   </data>
+  <!-- The latest message added is PrunePackageDataNotFound. Please update this value with each PR to catch parallel PRs both adding a new message -->
+  <data name="PrunePackageDataNotFound" xml:space="preserve">
+    <value>NETSDK1226: Prune Package data not found {0} {1} {2}.  To ignore this error, set the AllowMissingPrunePackageData to true.</value>
+    <comment>{StrBegins="NETSDK1226: "}</comment>
+  </data>
 </root>