From 225d4e9cf690ea7c2db6598fa234ab0f87781f9c Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 5 Nov 2024 10:28:25 -0800 Subject: [PATCH] Remove duplicate runtime package information These runtime packages were all part of .NETCore 1.x. They should have been consistently suppressed from .NETCore 2.0 and later, but were missing from the PackageOverrides.txt list. They were part of the platform manifest though and would be excluded by conflict resolution when doing a metadata comparison. --- .../FrameworkPackages.net5.0.cs | 50 --------------- .../FrameworkPackages.net9.0.cs | 61 ------------------- .../FrameworkPackages.netcoreapp2.0.cs | 21 +++++++ .../FrameworkPackages.netcoreapp3.0.cs | 11 ---- 4 files changed, 21 insertions(+), 122 deletions(-) diff --git a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net5.0.cs b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net5.0.cs index 0326c7dfb..70f60088e 100644 --- a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net5.0.cs +++ b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net5.0.cs @@ -12,56 +12,6 @@ internal static class NETCoreApp50 internal static FrameworkPackages Instance { get; } = new(NuGetFramework.Parse("net5.0"), NETCoreApp31.Instance) { { "Microsoft.CSharp", "4.7.0" }, - { "runtime.debian.8-x64.runtime.native.System", "4.3.0" }, - { "runtime.debian.8-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.debian.8-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.debian.8-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.debian.8-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.fedora.23-x64.runtime.native.System", "4.3.0" }, - { "runtime.fedora.23-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.fedora.23-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.fedora.23-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.fedora.24-x64.runtime.native.System", "4.3.0" }, - { "runtime.fedora.24-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.fedora.24-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.fedora.24-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.opensuse.13.2-x64.runtime.native.System", "4.3.0" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.opensuse.42.1-x64.runtime.native.System", "4.3.0" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.rhel.7-x64.runtime.native.System", "4.3.0" }, - { "runtime.rhel.7-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.rhel.7-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.rhel.7-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System", "4.3.0" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System", "4.3.0" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System", "4.3.0" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression", "4.3.0" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http", "4.3.0" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security", "4.3.0" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography", "4.3.0" }, { "System.Buffers", "4.5.1" }, { "System.Collections.Immutable", "5.0.0" }, { "System.ComponentModel.Annotations", "5.0.0" }, diff --git a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net9.0.cs b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net9.0.cs index 484c7e8a3..49ed30430 100644 --- a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net9.0.cs +++ b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net9.0.cs @@ -12,67 +12,6 @@ internal static class NETCoreApp90 internal static FrameworkPackages Instance { get; } = new(NuGetFramework.Parse("net9.0"), NETCoreApp80.Instance) { { "Microsoft.VisualBasic", "10.4.0" }, - { "runtime.debian.8-x64.runtime.native.System", "4.3.1" }, - { "runtime.debian.8-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.debian.8-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.debian.8-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.debian.8-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.fedora.23-x64.runtime.native.System", "4.3.1" }, - { "runtime.fedora.23-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.fedora.23-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.fedora.23-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.fedora.24-x64.runtime.native.System", "4.3.1" }, - { "runtime.fedora.24-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.fedora.24-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.fedora.24-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.opensuse.13.2-x64.runtime.native.System", "4.3.1" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.opensuse.42.1-x64.runtime.native.System", "4.3.1" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.osx.10.10-x64.runtime.native.System", "4.3.1" }, - { "runtime.osx.10.10-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.osx.10.10-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.osx.10.10-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "4.3.1" }, - { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.rhel.7-x64.runtime.native.System", "4.3.1" }, - { "runtime.rhel.7-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.rhel.7-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.rhel.7-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System", "4.3.1" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System", "4.3.1" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System", "4.3.1" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression", "4.3.2" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http", "4.3.1" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security", "4.3.1" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "System.Buffers", "5.0.0" }, { "System.Collections.Immutable", "9.0.0" }, { "System.Diagnostics.DiagnosticSource", "9.0.0" }, diff --git a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs index 8d7116934..133dd1b68 100644 --- a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs +++ b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs @@ -82,6 +82,8 @@ internal static class NETCoreApp20 { "runtime.debian.8-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.debian.8-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.debian.8-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.debian.8-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.debian.9-x64.runtime.native.System", "4.3.1" }, { "runtime.debian.9-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.debian.9-x64.runtime.native.System.Net.Http", "4.3.1" }, @@ -90,10 +92,14 @@ internal static class NETCoreApp20 { "runtime.fedora.23-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.fedora.23-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.fedora.23-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.fedora.24-x64.runtime.native.System", "4.3.1" }, { "runtime.fedora.24-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.fedora.24-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.fedora.24-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.fedora.27-x64.runtime.native.System", "4.3.1" }, { "runtime.fedora.27-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.fedora.27-x64.runtime.native.System.Net.Http", "4.3.1" }, @@ -106,10 +112,14 @@ internal static class NETCoreApp20 { "runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.opensuse.13.2-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.opensuse.13.2-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.opensuse.42.1-x64.runtime.native.System", "4.3.1" }, { "runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.opensuse.42.1-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.opensuse.42.1-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.opensuse.42.3-x64.runtime.native.System", "4.3.1" }, { "runtime.opensuse.42.3-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.opensuse.42.3-x64.runtime.native.System.Net.Http", "4.3.1" }, @@ -118,22 +128,33 @@ internal static class NETCoreApp20 { "runtime.osx.10.10-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.osx.10.10-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.osx.10.10-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "4.3.1" }, + { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.rhel.7-x64.runtime.native.System", "4.3.1" }, { "runtime.rhel.7-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.rhel.7-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.rhel.7-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.ubuntu.14.04-x64.runtime.native.System", "4.3.1" }, { "runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.ubuntu.16.04-x64.runtime.native.System", "4.3.1" }, { "runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.ubuntu.16.10-x64.runtime.native.System", "4.3.1" }, { "runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http", "4.3.1" }, { "runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security", "4.3.1" }, + { "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography", "4.3.4" }, + { "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.3" }, { "runtime.ubuntu.18.04-x64.runtime.native.System", "4.3.1" }, { "runtime.ubuntu.18.04-x64.runtime.native.System.IO.Compression", "4.3.2" }, { "runtime.ubuntu.18.04-x64.runtime.native.System.Net.Http", "4.3.1" }, diff --git a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp3.0.cs b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp3.0.cs index 84f3c854d..bc1bda0b4 100644 --- a/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp3.0.cs +++ b/src/Microsoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.netcoreapp3.0.cs @@ -13,17 +13,6 @@ internal static class NETCoreApp30 { { "Microsoft.CSharp", "4.4.0" }, { "Microsoft.Win32.Registry", "4.4.0" }, - { "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "4.3.0" }, - { "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, - { "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "4.3.0" }, { "System.Collections.Immutable", "1.6.0" }, { "System.ComponentModel.Annotations", "4.6.0" }, { "System.Data.DataSetExtensions", "4.5.0" },