Account for framework packages that have been removed (#49882)

Co-authored-by: Copilot <[email protected]>

Author: ericstj

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.cs

@@ -167,8 +167,15 @@ public static FrameworkPackages LoadFrameworkPackagesFromPack(Logger log, NuGetF
 
     private void Add(string id, string version)
     {
-        // intentionally redirect to indexer to allow for overwrite
-        this.Packages[id] = NuGetVersion.Parse(version);
+        if (string.IsNullOrEmpty(version))
+        {
+            this.Packages.Remove(id);
+        }
+        else
+        {
+            // intentionally redirect to indexer to allow for overwrite
+            this.Packages[id] = NuGetVersion.Parse(version);
+        }
     }
 
     public bool IsAFrameworkComponent(string id, NuGetVersion version) => this.Packages.TryGetValue(id, out var frameworkPackageVersion) && frameworkPackageVersion >= version;

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.net5.0.cs

@@ -31,6 +31,10 @@ internal static class NETCoreApp50
             { "System.Text.Json", "5.0.0" },
             { "System.Threading.Channels", "5.0.0" },
             { "System.Threading.Tasks.Dataflow", "5.0.0" },
+            // removed packages
+            { "System.Runtime.InteropServices.WindowsRuntime", null },
+            { "System.Runtime.WindowsRuntime", null },
+            { "System.Runtime.WindowsRuntime.UI.Xaml", null },
         };
 
         internal static FrameworkPackages AspNetCore { get; } = new(Net50, FrameworkNames.AspNetCoreApp, NETCoreApp31.AspNetCore)
@@ -169,6 +173,9 @@ internal static class NETCoreApp50
             { "System.Security.Permissions", "5.0.0" },
             { "System.Security.Principal.Windows", "5.0.0" },
             { "System.Windows.Extensions", "5.0.0" },
+            // removed packages
+            { "Microsoft.Win32.SystemEvents", null },
+            { "System.Drawing.Common", null },
         };
 
         internal static FrameworkPackages WindowsDesktop { get; } = new(Net50, FrameworkNames.WindowsDesktopApp, NETCoreApp31.WindowsDesktop)
@@ -196,6 +203,8 @@ internal static class NETCoreApp50
             { "System.Security.Principal.Windows", "5.0.0" },
             { "System.Threading.AccessControl", "5.0.0" },
             { "System.Windows.Extensions", "5.0.0" },
+            // removed packages
+            { "System.Formats.Asn1", null },
         };
 
         internal static void Register() => FrameworkPackages.Register(Instance, AspNetCore, WindowsDesktop);

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.net6.0.cs

@@ -159,6 +159,13 @@ internal static class NETCoreApp60
             { "System.IO.Pipelines", "6.0.0" },
             { "System.Security.Cryptography.Pkcs", "6.0.0" },
             { "System.Security.Cryptography.Xml", "6.0.0" },
+            // removed packages
+            { "Microsoft.Win32.Registry", null },
+            { "System.Security.AccessControl", null },
+            { "System.Security.Cryptography.Cng", null },
+            { "System.Security.Permissions", null },
+            { "System.Security.Principal.Windows", null },
+            { "System.Windows.Extensions", null },
         };
 
         internal static FrameworkPackages WindowsDesktop { get; } = new(Net60, FrameworkNames.WindowsDesktopApp, NETCoreApp50.WindowsDesktop)
@@ -178,6 +185,13 @@ internal static class NETCoreApp60
             { "System.Security.Permissions", "6.0.0" },
             { "System.Threading.AccessControl", "6.0.0" },
             { "System.Windows.Extensions", "6.0.0" },
+            // removed packages
+            { "Microsoft.Win32.Registry", null },
+            { "System.IO.FileSystem.AccessControl", null },
+            { "System.IO.Pipes.AccessControl", null },
+            { "System.Security.AccessControl", null },
+            { "System.Security.Cryptography.Cng", null },
+            { "System.Security.Principal.Windows", null },
         };
 
         internal static void Register() => FrameworkPackages.Register(Instance, AspNetCore, WindowsDesktop);

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.net9.0.cs

@@ -180,6 +180,8 @@ internal static class NETCoreApp90
             { "System.Security.Cryptography.Pkcs", "8.0.1" },
             { "System.Security.Cryptography.Xml", "9.0.0" },
             { "System.Threading.RateLimiting", "9.0.0" },
+            // removed packages
+            { "System.IO.Pipelines", null },
         };
 
         internal static FrameworkPackages WindowsDesktop { get; } = new(Net90, FrameworkNames.WindowsDesktopApp, NETCoreApp80.WindowsDesktop)

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netcoreapp3.0.cs

@@ -30,7 +30,8 @@ internal static class NETCoreApp30
             { "System.Security.AccessControl", "4.6.0" },
             { "System.Security.Cryptography.Cng", "4.6.0" },
             { "System.Security.Cryptography.OpenSsl", "4.6.0" },
-            { "System.Security.Cryptography.Xml", "4.4.0" },
+            // this package was listed in the package overrides.txt for netcoreapp3.0, but it is not actually in the targeting pack
+            // { "System.Security.Cryptography.Xml", "4.4.0" },
             { "System.Security.Principal.Windows", "4.6.0" },
             { "System.Text.Encoding.CodePages", "4.6.0" },
             { "System.Text.Encodings.Web", "4.6.0" },

src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netstandard2.1.cs

@@ -37,7 +37,8 @@ internal static class NETStandard21
             { "System.Runtime.Numerics", "4.3.0" },
             { "System.Runtime.Serialization.Json", "4.3.0" },
             { "System.Security.AccessControl", "4.4.0" },
-            { "System.Security.Cryptography.Xml", "4.4.0" },
+            // this package was listed in the package overrides.txt for netstandard2.1, but it is not actually in the targeting pack
+            // { "System.Security.Cryptography.Xml", "4.4.0" },
             { "System.Security.Principal", "4.3.0" },
             { "System.Security.Principal.Windows", "4.4.0" },
             { "System.Threading", "4.3.0" },