From 41f17ec8cc66912cec8c19ea84188d64d109baad Mon Sep 17 00:00:00 2001 From: Greg Villicana Date: Tue, 23 Aug 2022 09:07:37 -0700 Subject: [PATCH 1/3] Make Vcpkg Experimental detector --- .../vcpkg/VcpkgComponentDetector.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs b/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs index f2195bb0f..61147e087 100644 --- a/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs +++ b/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Composition; using System.IO; @@ -13,7 +13,7 @@ namespace Microsoft.ComponentDetection.Detectors.Vcpkg { [Export(typeof(IComponentDetector))] - public class VcpkgComponentDetector : FileComponentDetector, IDefaultOffComponentDetector + public class VcpkgComponentDetector : FileComponentDetector, IExperimentalDetector { [Import] public ICommandLineInvocationService CommandLineInvocationService { get; set; } From aa85567109b658ee79e16458f7294d886ae571ec Mon Sep 17 00:00:00 2001 From: Greg Villicana Date: Tue, 23 Aug 2022 09:10:23 -0700 Subject: [PATCH 2/3] nit about experimental doc --- .../IComponentDetector.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.ComponentDetection.Contracts/IComponentDetector.cs b/src/Microsoft.ComponentDetection.Contracts/IComponentDetector.cs index 67f12603b..06691f648 100644 --- a/src/Microsoft.ComponentDetection.Contracts/IComponentDetector.cs +++ b/src/Microsoft.ComponentDetection.Contracts/IComponentDetector.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.ComponentDetection.Contracts.TypedComponent; @@ -53,7 +53,7 @@ public interface IDefaultOffComponentDetector : IComponentDetector /// /// Component detectors implementing this interface are in an experimental state. /// The detector processing service guarantees that: - /// They should NOT return their components as part of the scan result or be allowed to run too long (e.g. 2 min or less). + /// They should NOT return their components as part of the scan result or be allowed to run too long (e.g. 4 min or less). /// They SHOULD submit telemetry about how they ran. /// If opted in, they should behave like a normal detector. /// From ac72f26a57bd04a631f2ebfb3911ee1fbb5e92b2 Mon Sep 17 00:00:00 2001 From: Greg Villicana Date: Tue, 23 Aug 2022 09:37:44 -0700 Subject: [PATCH 3/3] Detector version bump for experimental changes --- .../vcpkg/VcpkgComponentDetector.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs b/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs index 61147e087..1a4ecaf51 100644 --- a/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs +++ b/src/Microsoft.ComponentDetection.Detectors/vcpkg/VcpkgComponentDetector.cs @@ -29,7 +29,7 @@ public class VcpkgComponentDetector : FileComponentDetector, IExperimentalDetect public override IEnumerable SupportedComponentTypes { get; } = new[] { ComponentType.Vcpkg }; - public override int Version => 1; + public override int Version => 2; private HashSet projectRoots = new HashSet();