Skip to content

Promote DotNet detector out of experiment #1388

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

Merged
merged 4 commits into from
Apr 29, 2025
Merged

Promote DotNet detector out of experiment #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7938c9b
Fix a coup[e potential NullRefs in dotnet detector
ericstj Apr 29, 2025
a00e59f
Promote DotNet detector
ericstj Apr 29, 2025
70ee949
Remove IExperimentalDetector
ericstj Apr 29, 2025
84c06b2
Merge branch 'main' into promoteDotNetDetector
grvillic Apr 29, 2025
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
11 changes: 7 additions & 4 deletions src/Microsoft.ComponentDetection.Detectors/dotnet/DotNetComponentDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Extensions.Logging;

public class DotNetComponentDetector : FileComponentDetector, IExperimentalDetector
public class DotNetComponentDetector : FileComponentDetector
{
private const string GlobalJsonFileName = "global.json";
private readonly ICommandLineInvocationService commandLineInvocationService;
Expand Down Expand Up @@ -138,9 +138,12 @@
{
var lockFile = this.lockFileFormat.Read(processRequest.ComponentStream.Stream, processRequest.ComponentStream.Location);

if (lockFile.PackageSpec is null)
if (lockFile.PackageSpec is null || lockFile.PackageSpec.RestoreMetadata is null)
{
this.Logger.LogWarning("Lock file {LockFilePath} does not contain a PackageSpec.", processRequest.ComponentStream.Location);
// The lock file is not valid, or does not contain a PackageSpec.
// This could be due to the lock file being generated by a different version of the SDK.
// We should not fail the detector, but we should log a warning.
this.Logger.LogWarning("Lock file {LockFilePath} does not contain project information.", processRequest.ComponentStream.Location);

Check warning on line 146 in src/Microsoft.ComponentDetection.Detectors/dotnet/DotNetComponentDetector.cs

View check run for this annotation

Codecov / codecov/patch

src/Microsoft.ComponentDetection.Detectors/dotnet/DotNetComponentDetector.cs#L146 

Added line #L146 was not covered by tests
return;
}

Expand Down Expand Up @@ -181,7 +184,7 @@
var targetType = this.GetProjectType(projectOutputPath, projectName, cancellationToken);

var componentReporter = this.ComponentRecorder.CreateSingleFileComponentRecorder(projectPath);
foreach (var target in lockFile.Targets)
foreach (var target in lockFile.Targets ?? [])
{
var targetFramework = target.TargetFramework?.GetShortFolderName();

Expand Down
22 changes: 0 additions & 22 deletions src/Microsoft.ComponentDetection.Orchestrator/Experiments/DotNetDetectorExperiment.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Microsoft.ComponentDetection.Orchestrator/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public static IServiceCollection AddComponentDetection(this IServiceCollection s
services.AddSingleton<IExperimentConfiguration, SimplePipExperiment>();
services.AddSingleton<IExperimentConfiguration, RustCliDetectorExperiment>();
services.AddSingleton<IExperimentConfiguration, Go117DetectorExperiment>();
services.AddSingleton<IExperimentConfiguration, DotNetDetectorExperiment>();

// Detectors
// CocoaPods
Expand Down
Loading