Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add TargetFramework awareness to NuGet detector #1266

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

Add TargetFramework awareness to NuGet detector #1266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3df6338
WIP: Make NuGet detectors better handle target framework
ericstj Oct 2, 2024
dc6278e
Add a tool for finding the last package that will lose in conflict re…
ericstj Oct 4, 2024
ae22db9
Add FrameworkPackages lookup
ericstj Oct 8, 2024
ef3e082
Update frameworks with latest targeting packs
ericstj Oct 8, 2024
cd28ca9
Refactor static fields into singleton classes
ericstj Oct 8, 2024
407a41b
Update source generation tool.
ericstj Oct 8, 2024
7b38156
Merge branch 'main' of https://github.com/microsoft/component-detecti…
ericstj Oct 8, 2024
dac5d58
Simplify collection initializer in FrameworkPackages
ericstj Oct 8, 2024
6e9d01c
Comments and indenting
ericstj Oct 8, 2024
0a378c6
Add readme for findLastPackage tool
ericstj Oct 17, 2024
46e066e
Improve NuGet detector support of development dependency
ericstj Oct 17, 2024
fed423b
Merge remote-tracking branch 'upstream/main' into NuGetDetectorFramework
ericstj Oct 17, 2024
903af51
Merge branch 'main' of https://github.com/microsoft/component-detecti…
ericstj Oct 21, 2024
f97e17d
Address some feedback
ericstj Oct 21, 2024
5b5ac57
Fix tests
ericstj Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update frameworks with latest targeting packs
  • Loading branch information
@ericstj
ericstj committed Oct 8, 2024
commit ef3e082f2ae7bd67c530c49829e3973c210d4452
12 changes: 6 additions & 6 deletions ...icrosoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net6.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ internal partial class FrameworkPackages
{
{ "Microsoft.Win32.Registry", "5.0.0" },
{ "System.Collections.Immutable", "6.0.0" },
{ "System.Diagnostics.DiagnosticSource", "6.0.0" },
{ "System.Formats.Asn1", "6.0.0" },
{ "System.Diagnostics.DiagnosticSource", "6.0.1" },
{ "System.Formats.Asn1", "6.0.1" },
{ "System.IO.FileSystem.AccessControl", "5.0.0" },
{ "System.IO.Pipes.AccessControl", "5.0.0" },
{ "System.Net.Http.Json", "6.0.0" },
{ "System.Reflection.Metadata", "6.0.0" },
{ "System.Net.Http.Json", "6.0.1" },
{ "System.Reflection.Metadata", "6.0.1" },
{ "System.Runtime.CompilerServices.Unsafe", "6.0.0" },
{ "System.Security.AccessControl", "6.0.0" },
{ "System.Security.AccessControl", "6.0.1" },
{ "System.Security.Cryptography.Cng", "5.0.0" },
{ "System.Security.Cryptography.OpenSsl", "5.0.0" },
{ "System.Security.Principal.Windows", "5.0.0" },
{ "System.Text.Encoding.CodePages", "6.0.0" },
{ "System.Text.Encodings.Web", "6.0.0" },
{ "System.Text.Json", "6.0.0" },
{ "System.Text.Json", "6.0.9" },
{ "System.Threading.Channels", "6.0.0" },
{ "System.Threading.Tasks.Dataflow", "6.0.0" },
};
Expand Down
9 changes: 4 additions & 5 deletions ...icrosoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net7.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ internal partial class FrameworkPackages
internal static FrameworkPackages NETCoreApp70Packages { get; } = new(NETCoreApp70, NETCoreApp60Packages)
{
{ "System.Collections.Immutable", "7.0.0" },
{ "System.Diagnostics.DiagnosticSource", "7.0.0" },
{ "System.Diagnostics.DiagnosticSource", "7.0.2" },
{ "System.Formats.Asn1", "7.0.0" },
{ "System.Net.Http.Json", "7.0.0" },
{ "System.Reflection.Metadata", "7.0.0" },
{ "System.Security.AccessControl", "6.0.1" },
{ "System.Net.Http.Json", "7.0.1" },
{ "System.Reflection.Metadata", "7.0.2" },
{ "System.Text.Encoding.CodePages", "7.0.0" },
{ "System.Text.Encodings.Web", "7.0.0" },
{ "System.Text.Json", "7.0.0" },
{ "System.Text.Json", "7.0.4" },
{ "System.Threading.Channels", "7.0.0" },
{ "System.Threading.Tasks.Dataflow", "7.0.0" },
};
Expand Down
14 changes: 10 additions & 4 deletions ...icrosoft.ComponentDetection.Detectors/nuget/FrameworkPackages/FrameworkPackages.net8.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ internal partial class FrameworkPackages

internal static FrameworkPackages NETCoreApp80Packages { get; } = new(NETCoreApp80, NETCoreApp70Packages)
{
{ "System.Diagnostics.DiagnosticSource", "7.0.2" },
{ "System.Net.Http.Json", "7.0.1" },
{ "System.Reflection.Metadata", "7.0.2" },
{ "System.Text.Json", "7.0.4" },
{ "System.Collections.Immutable", "8.0.0" },
{ "System.Diagnostics.DiagnosticSource", "8.0.1" },
{ "System.Formats.Asn1", "8.0.1" },
{ "System.Net.Http.Json", "8.0.0" },
{ "System.Reflection.Metadata", "8.0.0" },
{ "System.Text.Encoding.CodePages", "8.0.0" },
{ "System.Text.Encodings.Web", "8.0.0" },
{ "System.Text.Json", "8.0.4" },
{ "System.Threading.Channels", "8.0.0" },
{ "System.Threading.Tasks.Dataflow", "8.0.1" },
};
}