From e980cf592ca18bf60aa63f8187471e7d270e586e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jul 2023 12:09:25 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230720.6 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.23370.6 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/sdl/configure-sdl-tool.ps1 | 4 +++- global.json | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91990cb5..47882e40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 - + https://github.com/dotnet/arcade - 9fba71ca242ef84c4b7696c380cc00efe734adb3 + a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745 https://github.com/dotnet/arcade-services diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index e4108e39..27f5a411 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -93,7 +93,9 @@ try { } 'binskim' { if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory\**`"" + # Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924. + # We are excluding all `_.pdb` files from the scan. + $tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`"" } $tool.Args += $BinskimAdditionalRunConfigParams } diff --git a/global.json b/global.json index 6b74a1d8..93390b60 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23370.6" } }