From 17846e0f4c2acd14285d30dec2c2c0225fdbc54d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Aug 2023 12:09:57 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230803.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23403.7 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/templates/steps/source-build.yml | 9 +++++++++ global.json | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66bc4455..8c6a8f09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 - + https://github.com/dotnet/arcade - 3addc5d978d01e864792d2c6bce0b50ec105f857 + bbafffba44a4dcfce6eee08bdd59db29b919f306 https://github.com/dotnet/arcade-services diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 11005218..41bbb915 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -118,3 +118,12 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/global.json b/global.json index 4ba62b21..b2d84825 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23403.7" } }