From 5ae533b7f2bd227bc1a7f595c22db132ac6e1af9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 17 May 2024 13:55:27 -0700 Subject: [PATCH 1/3] Disable CG on PR builds --- .vsts-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 61a96f900..1f2d6b208 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -73,6 +73,9 @@ extends: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows + ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + componentgovernance: + ignoreDirectories: artifacts, .packages # Temporary to workaround MicroBuild issues. credscan: enabled: false From 42e75fad72954000bff89dfd5c68367fe38a3c0f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 4 Jun 2024 09:23:39 -0500 Subject: [PATCH 2/3] Use multiple processes for license scan (#19879) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index 72d71ef07..d6b4ba920 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -150,7 +150,7 @@ public class LicenseScanTests : TestBase string ignoreOptions = string.Join(" ", s_ignoredFilePatterns.Select(pattern => $"--ignore {pattern}")); ExecuteHelper.ExecuteProcessValidateExitCode( "scancode", - $"--license --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}", + $"--license --processes 4 --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}", OutputHelper); JsonDocument doc = JsonDocument.Parse(File.ReadAllText(scancodeResultsPath)); From b042fc44151edae2cedea32f1fee1d32f6c5f6ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:25:22 -0700 Subject: [PATCH 3/3] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19884) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 99e585a24..538dd67ca 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24303.4", + "version": "1.1.0-beta.24304.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 846552d9d..e8bc72c24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 1dafa0baedec752ebd1dfcae5b09cc87c8117967 + 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 - + https://github.com/dotnet/arcade-services - 1dafa0baedec752ebd1dfcae5b09cc87c8117967 + 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e8c3288f8..d1ee58120 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24303.4 + 1.1.0-beta.24304.5