Skip to content

Commit 16e3d8d

Browse files
ericstjericstj
authored
[release/10.0.1xx] Package Pruning data fixes for past frameworks (#51343)
1 parent 79e1882 commit 16e3d8d

9 files changed

+36
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ internal static class NETCoreApp50
168168
{ "System.IO.Pipelines", "5.0.0" },
169169
{ "System.Security.AccessControl", "5.0.0" },
170170
{ "System.Security.Cryptography.Cng", "5.0.0" },
171-
{ "System.Security.Cryptography.Pkcs", "5.0.0" },
172171
{ "System.Security.Cryptography.Xml", "5.0.0" },
173172
{ "System.Security.Permissions", "5.0.0" },
174173
{ "System.Security.Principal.Windows", "5.0.0" },
@@ -188,6 +187,7 @@ internal static class NETCoreApp50
188187
{ "System.Configuration.ConfigurationManager", "5.0.0" },
189188
{ "System.Diagnostics.EventLog", "5.0.0" },
190189
{ "System.Diagnostics.PerformanceCounter", "5.0.0" },
190+
{ "System.DirectoryServices", "5.0.0" },
191191
{ "System.Drawing.Common", "5.0.0" },
192192
{ "System.Formats.Asn1", "5.0.0" },
193193
{ "System.IO.FileSystem.AccessControl", "5.0.0" },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ internal static class NETCoreApp60
157157
{ "Microsoft.Net.Http.Headers", "6.0.0" },
158158
{ "System.Diagnostics.EventLog", "6.0.0" },
159159
{ "System.IO.Pipelines", "6.0.0" },
160-
{ "System.Security.Cryptography.Pkcs", "6.0.0" },
161160
{ "System.Security.Cryptography.Xml", "6.0.0" },
162161
// removed packages
163162
{ "Microsoft.Win32.Registry", null },
@@ -176,6 +175,7 @@ internal static class NETCoreApp60
176175
{ "System.Configuration.ConfigurationManager", "6.0.0" },
177176
{ "System.Diagnostics.EventLog", "6.0.0" },
178177
{ "System.Diagnostics.PerformanceCounter", "6.0.0" },
178+
{ "System.DirectoryServices", "6.0.0" },
179179
{ "System.Drawing.Common", "6.0.0" },
180180
{ "System.IO.Packaging", "6.0.0" },
181181
{ "System.Resources.Extensions", "6.0.0" },

‎src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.net7.0.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ internal static class NETCoreApp70
159159
{ "Microsoft.Net.Http.Headers", "7.0.0" },
160160
{ "System.Diagnostics.EventLog", "7.0.0" },
161161
{ "System.IO.Pipelines", "7.0.0" },
162-
{ "System.Security.Cryptography.Pkcs", "7.0.0" },
163162
{ "System.Security.Cryptography.Xml", "7.0.0" },
164163
{ "System.Threading.RateLimiting", "7.0.0" },
165164
};
@@ -172,6 +171,7 @@ internal static class NETCoreApp70
172171
{ "System.Configuration.ConfigurationManager", "7.0.0" },
173172
{ "System.Diagnostics.EventLog", "7.0.0" },
174173
{ "System.Diagnostics.PerformanceCounter", "7.0.0" },
174+
{ "System.DirectoryServices", "7.0.0" },
175175
{ "System.Drawing.Common", "7.0.0" },
176176
{ "System.IO.Packaging", "7.0.0" },
177177
{ "System.Resources.Extensions", "7.0.0" },

‎src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.net8.0.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ internal static class NETCoreApp80
163163
{ "Microsoft.Net.Http.Headers", "8.0.0" },
164164
{ "System.Diagnostics.EventLog", "8.0.0" },
165165
{ "System.IO.Pipelines", "8.0.0" },
166-
{ "System.Security.Cryptography.Pkcs", "8.0.0" },
167166
{ "System.Security.Cryptography.Xml", "8.0.0" },
168167
{ "System.Threading.RateLimiting", "8.0.0" },
169168
};
@@ -176,6 +175,7 @@ internal static class NETCoreApp80
176175
{ "System.Configuration.ConfigurationManager", "8.0.0" },
177176
{ "System.Diagnostics.EventLog", "8.0.0" },
178177
{ "System.Diagnostics.PerformanceCounter", "8.0.0" },
178+
{ "System.DirectoryServices", "8.0.0" },
179179
{ "System.Drawing.Common", "8.0.0" },
180180
{ "System.IO.Packaging", "8.0.0" },
181181
{ "System.Resources.Extensions", "8.0.0" },

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ internal static class NETCoreApp90
177177
{ "Microsoft.JSInterop", "9.0.0" },
178178
{ "Microsoft.Net.Http.Headers", "9.0.0" },
179179
{ "System.Diagnostics.EventLog", "9.0.0" },
180-
{ "System.Security.Cryptography.Pkcs", "8.0.1" },
181180
{ "System.Security.Cryptography.Xml", "9.0.0" },
182181
{ "System.Threading.RateLimiting", "9.0.0" },
183182
// removed packages
@@ -186,13 +185,22 @@ internal static class NETCoreApp90
186185

187186
internal static FrameworkPackages WindowsDesktop { get; } = new(Net90, FrameworkNames.WindowsDesktopApp, NETCoreApp80.WindowsDesktop)
188187
{
189-
{ "System.Configuration.ConfigurationManager", "8.0.1" },
190-
{ "System.Diagnostics.EventLog", "8.0.1" },
191-
{ "System.Diagnostics.PerformanceCounter", "8.0.1" },
192-
{ "System.Drawing.Common", "8.0.10" },
193-
{ "System.IO.Packaging", "8.0.1" },
194-
{ "System.Security.Cryptography.Pkcs", "8.0.1" },
195-
{ "System.Security.Cryptography.Xml", "8.0.2" },
188+
{ "Microsoft.Win32.Registry.AccessControl", "9.0.0" },
189+
{ "Microsoft.Win32.SystemEvents", "9.0.0" },
190+
{ "System.CodeDom", "9.0.0" },
191+
{ "System.Configuration.ConfigurationManager", "9.0.0" },
192+
{ "System.Diagnostics.EventLog", "9.0.0" },
193+
{ "System.Diagnostics.PerformanceCounter", "9.0.0" },
194+
{ "System.DirectoryServices", "9.0.0" },
195+
{ "System.Drawing.Common", "9.0.0" },
196+
{ "System.IO.Packaging", "9.0.0" },
197+
{ "System.Resources.Extensions", "9.0.0" },
198+
{ "System.Security.Cryptography.Pkcs", "9.0.0" },
199+
{ "System.Security.Cryptography.ProtectedData", "9.0.0" },
200+
{ "System.Security.Cryptography.Xml", "9.0.0" },
201+
{ "System.Security.Permissions", "9.0.0" },
202+
{ "System.Threading.AccessControl", "9.0.0" },
203+
{ "System.Windows.Extensions", "9.0.0" },
196204
};
197205

198206
internal static void Register() => FrameworkPackages.Register(Instance, AspNetCore, WindowsDesktop);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ internal static class NETCoreApp30
184184
{ "System.Diagnostics.EventLog", "4.6.0" },
185185
{ "System.Diagnostics.PerformanceCounter", "4.5.0" },
186186
{ "System.DirectoryServices", "4.6.0" },
187-
{ "System.Drawing.Common", "4.7.3" },
187+
{ "System.Drawing.Common", "4.6.2" },
188188
{ "System.IO.Packaging", "4.6.0" },
189189
{ "System.Resources.Extensions", "4.6.0" },
190190
{ "System.Security.Cryptography.Pkcs", "4.6.0" },

‎src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netcoreapp3.1.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ internal static class NETCoreApp31
165165
{ "System.IO.Pipelines", "4.7.0" },
166166
{ "System.Security.AccessControl", "4.7.0" },
167167
{ "System.Security.Cryptography.Cng", "4.7.0" },
168-
{ "System.Security.Cryptography.Pkcs", "4.7.0" },
169168
{ "System.Security.Cryptography.Xml", "4.7.0" },
170169
{ "System.Security.Permissions", "4.7.0" },
171170
{ "System.Security.Principal.Windows", "4.7.0" },
@@ -180,7 +179,7 @@ internal static class NETCoreApp31
180179
{ "System.Configuration.ConfigurationManager", "4.7.0" },
181180
{ "System.Diagnostics.EventLog", "4.7.0" },
182181
{ "System.Diagnostics.PerformanceCounter", "4.7.0" },
183-
{ "System.DirectoryServices", "8.0.0" },
182+
{ "System.DirectoryServices", "4.7.0" },
184183
{ "System.IO.Packaging", "4.7.0" },
185184
{ "System.Resources.Extensions", "4.7.0" },
186185
{ "System.Security.Cryptography.Pkcs", "4.7.0" },

‎src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netstandard2.0.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ internal static class NETStandard20
1818
{ "System.Collections", "4.3.0" },
1919
{ "System.Collections.NonGeneric", "4.3.0" },
2020
{ "System.Collections.Specialized", "4.3.0" },
21-
{ "System.ComponentModel", "4.0.1" },
22-
{ "System.ComponentModel.EventBasedAsync", "4.0.11" },
21+
{ "System.ComponentModel", "4.3.0" },
22+
{ "System.ComponentModel.EventBasedAsync", "4.3.0" },
2323
{ "System.ComponentModel.Primitives", "4.3.0" },
2424
{ "System.ComponentModel.TypeConverter", "4.3.0" },
2525
{ "System.Console", "4.3.1" },
2626
{ "System.Data.Common", "4.3.0" },
27-
{ "System.Diagnostics.Contracts", "4.0.1" },
27+
{ "System.Diagnostics.Contracts", "4.3.0" },
2828
{ "System.Diagnostics.Debug", "4.3.0" },
2929
{ "System.Diagnostics.FileVersionInfo", "4.3.0" },
3030
{ "System.Diagnostics.Process", "4.3.0" },
@@ -34,7 +34,7 @@ internal static class NETStandard20
3434
{ "System.Diagnostics.TraceSource", "4.3.0" },
3535
{ "System.Diagnostics.Tracing", "4.3.0" },
3636
{ "System.Drawing.Primitives", "4.3.0" },
37-
{ "System.Dynamic.Runtime", "4.0.11" },
37+
{ "System.Dynamic.Runtime", "4.3.0" },
3838
{ "System.Globalization", "4.3.0" },
3939
{ "System.Globalization.Calendars", "4.3.0" },
4040
{ "System.Globalization.Extensions", "4.3.0" },
@@ -51,17 +51,17 @@ internal static class NETStandard20
5151
{ "System.IO.UnmanagedMemoryStream", "4.3.0" },
5252
{ "System.Linq", "4.3.0" },
5353
{ "System.Linq.Expressions", "4.3.0" },
54-
{ "System.Linq.Parallel", "4.0.1" },
55-
{ "System.Linq.Queryable", "4.0.1" },
54+
{ "System.Linq.Parallel", "4.3.0" },
55+
{ "System.Linq.Queryable", "4.3.0" },
5656
{ "System.Net.Http", "4.3.4" },
5757
{ "System.Net.NameResolution", "4.3.0" },
5858
{ "System.Net.NetworkInformation", "4.3.0" },
5959
{ "System.Net.Ping", "4.3.0" },
6060
{ "System.Net.Primitives", "4.3.1" },
61-
{ "System.Net.Requests", "4.0.11" },
61+
{ "System.Net.Requests", "4.3.0" },
6262
{ "System.Net.Security", "4.3.2" },
6363
{ "System.Net.Sockets", "4.3.0" },
64-
{ "System.Net.WebHeaderCollection", "4.0.1" },
64+
{ "System.Net.WebHeaderCollection", "4.3.0" },
6565
{ "System.Net.WebSockets", "4.3.0" },
6666
{ "System.Net.WebSockets.Client", "4.3.2" },
6767
{ "System.Reflection", "4.3.0" },
@@ -76,7 +76,7 @@ internal static class NETStandard20
7676
{ "System.Runtime.Handles", "4.3.0" },
7777
{ "System.Runtime.InteropServices", "4.3.0" },
7878
{ "System.Runtime.InteropServices.RuntimeInformation", "4.3.0" },
79-
{ "System.Runtime.Numerics", "4.0.1" },
79+
{ "System.Runtime.Numerics", "4.3.0" },
8080
{ "System.Runtime.Serialization.Formatters", "4.3.0" },
8181
{ "System.Runtime.Serialization.Primitives", "4.3.0" },
8282
{ "System.Runtime.Serialization.Xml", "4.3.0" },
@@ -86,23 +86,23 @@ internal static class NETStandard20
8686
{ "System.Security.Cryptography.Encoding", "4.3.0" },
8787
{ "System.Security.Cryptography.Primitives", "4.3.0" },
8888
{ "System.Security.Cryptography.X509Certificates", "4.3.2" },
89-
{ "System.Security.Principal", "4.0.1" },
89+
{ "System.Security.Principal", "4.3.0" },
9090
{ "System.Security.SecureString", "4.3.0" },
9191
{ "System.Text.Encoding", "4.3.0" },
9292
{ "System.Text.Encoding.Extensions", "4.3.0" },
9393
{ "System.Text.RegularExpressions", "4.3.0" },
94-
{ "System.Threading", "4.0.11" },
94+
{ "System.Threading", "4.3.0" },
9595
{ "System.Threading.Overlapped", "4.3.0" },
9696
{ "System.Threading.Tasks", "4.3.0" },
97-
{ "System.Threading.Tasks.Parallel", "4.0.1" },
97+
{ "System.Threading.Tasks.Parallel", "4.3.0" },
9898
{ "System.Threading.Thread", "4.3.0" },
9999
{ "System.Threading.ThreadPool", "4.3.0" },
100100
{ "System.Threading.Timer", "4.3.0" },
101101
{ "System.ValueTuple", "4.6.1" },
102102
{ "System.Xml.ReaderWriter", "4.3.1" },
103-
{ "System.Xml.XDocument", "4.0.11" },
103+
{ "System.Xml.XDocument", "4.3.0" },
104104
{ "System.Xml.XmlDocument", "4.3.0" },
105-
{ "System.Xml.XmlSerializer", "4.0.11" },
105+
{ "System.Xml.XmlSerializer", "4.3.0" },
106106
{ "System.Xml.XPath", "4.3.0" },
107107
{ "System.Xml.XPath.XDocument", "4.3.0" },
108108
};

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ internal static class NETStandard21
1515
{
1616
{ "System.Buffers", "4.6.1" },
1717
{ "System.Collections.Concurrent", "4.3.0" },
18-
{ "System.Collections.Immutable", "1.4.0" },
1918
{ "System.ComponentModel", "4.3.0" },
20-
{ "System.ComponentModel.Composition", "4.5.0" },
2119
{ "System.ComponentModel.EventBasedAsync", "4.3.0" },
2220
{ "System.Diagnostics.Contracts", "4.3.0" },
2321
{ "System.Dynamic.Runtime", "4.3.0" },
@@ -27,20 +25,13 @@ internal static class NETStandard21
2725
{ "System.Net.WebHeaderCollection", "4.3.0" },
2826
{ "System.Numerics.Vectors", "4.6.1" },
2927
{ "System.ObjectModel", "4.3.0" },
30-
{ "System.Private.DataContractSerialization", "4.3.0" },
3128
{ "System.Reflection.DispatchProxy", "4.5.1" },
3229
{ "System.Reflection.Emit", "4.7.0" },
3330
{ "System.Reflection.Emit.ILGeneration", "4.7.0" },
3431
{ "System.Reflection.Emit.Lightweight", "4.7.0" },
35-
{ "System.Reflection.TypeExtensions", "4.3.0" },
36-
{ "System.Runtime.Loader", "4.3.0" },
3732
{ "System.Runtime.Numerics", "4.3.0" },
3833
{ "System.Runtime.Serialization.Json", "4.3.0" },
39-
{ "System.Security.AccessControl", "4.4.0" },
40-
// this package was listed in the package overrides.txt for netstandard2.1, but it is not actually in the targeting pack
41-
// { "System.Security.Cryptography.Xml", "4.4.0" },
4234
{ "System.Security.Principal", "4.3.0" },
43-
{ "System.Security.Principal.Windows", "4.4.0" },
4435
{ "System.Threading", "4.3.0" },
4536
{ "System.Threading.Tasks.Extensions", "4.6.3" },
4637
{ "System.Threading.Tasks.Parallel", "4.3.0" },

0 commit comments

Comments
 (0)