From 3209a5995278eadb5fe76a5f33cdbe083ba81964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcelo=20Lynch=20=F0=9F=A7=89?= Date: Tue, 5 Mar 2024 18:42:25 +0000 Subject: [PATCH] Merged PR 770317: Enable CredScan on ADO by default --- Public/Src/Pips/Dll/BuildXL.Pips.dsc | 5 ++++- Public/Src/Utilities/Configuration/ConfigurationProvider.cs | 1 + config.dsc | 3 +++ config.microsoftInternal.dsc | 1 - 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Public/Src/Pips/Dll/BuildXL.Pips.dsc b/Public/Src/Pips/Dll/BuildXL.Pips.dsc index f00d58c3a..4b2a7eccd 100644 --- a/Public/Src/Pips/Dll/BuildXL.Pips.dsc +++ b/Public/Src/Pips/Dll/BuildXL.Pips.dsc @@ -3,6 +3,8 @@ import * as Managed from "Sdk.Managed"; +const includeCredScan = BuildXLSdk.Flags.isMicrosoftInternal && BuildXLSdk.isDotNetCore; + @@public export const dll = BuildXLSdk.library({ assemblyName: "BuildXL.Pips", @@ -26,7 +28,7 @@ export const dll = BuildXLSdk.library({ importFrom("BuildXL.Utilities").Configuration.dll, importFrom("BuildXL.Utilities").Utilities.Core.dll, importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.dll, - ...addIf(BuildXLSdk.Flags.isMicrosoftInternal && BuildXLSdk.isDotNetCore, + ...addIf(includeCredScan, importFrom("Microsoft.Automata.SRM").pkg, importFrom("Microsoft.ApplicationInsights").pkg, importFrom("Microsoft.Security.RegularExpressions").pkg, @@ -35,6 +37,7 @@ export const dll = BuildXLSdk.library({ importFrom("Microsoft.Security.CredScan.KnowledgeBase.Ruleset").pkg ), ], + runtimeReferences: includeCredScan ? [ importFrom("Crc32.NET").pkg ] : undefined, internalsVisibleTo: [ "BuildXL.Scheduler", "Test.BuildXL.EngineTestUtilities", diff --git a/Public/Src/Utilities/Configuration/ConfigurationProvider.cs b/Public/Src/Utilities/Configuration/ConfigurationProvider.cs index 836b7c984..ed04526d1 100644 --- a/Public/Src/Utilities/Configuration/ConfigurationProvider.cs +++ b/Public/Src/Utilities/Configuration/ConfigurationProvider.cs @@ -120,6 +120,7 @@ namespace BuildXL.Utilities.Configuration config.Sandbox.TimeoutMultiplier = 3; config.Schedule.UseHistoricalCpuUsageInfo = true; config.Schedule.UseHistoricalRamUsageInfo = false; + config.FrontEnd.EnableCredScan = true; return config; } diff --git a/config.dsc b/config.dsc index 8eaa0667e..e49234082 100644 --- a/config.dsc +++ b/config.dsc @@ -344,6 +344,9 @@ config({ { id: "packageurl-dotnet", version: "1.1.0" }, { id: "System.Reactive", version: "4.4.1" }, + // CredScan + { id: "Crc32.NET", version: "1.2.0" }, + // Windows CoW on ReFS { id: "CopyOnWrite", version: "0.3.7" }, diff --git a/config.microsoftInternal.dsc b/config.microsoftInternal.dsc index 7900d0f1e..2f6a1774f 100644 --- a/config.microsoftInternal.dsc +++ b/config.microsoftInternal.dsc @@ -94,7 +94,6 @@ export const pkgs = isMicrosoftInternal ? [ { id: "Strings.Interop", version: "1.10.0" }, { id: "RE2.Managed", version: "1.10.0" }, { id: "Microsoft.Automata.SRM", version: "2.0.0-alpha3" }, - { id: "Crc32.NET", version: "1.2.0" }, { id: "Microsoft.Security.RegularExpressions", version: "1.7.1.6" } , { id: "Microsoft.Security.CredScan.KnowledgeBase.SharedDomains", version: "1.7.1.6" }, { id: "Microsoft.Security.CredScan.KnowledgeBase", version: "1.7.1.6" },