From 648cff30462d6e26ed019bcb89e0231d21f616e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Jul 2023 12:12:53 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230720.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23369.2 -> To Version 8.0.0-beta.23370.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdl/configure-sdl-tool.ps1 | 4 +++- global.json | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31c90e624..2910580e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + 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/Versions.props b/eng/Versions.props index 54a53b685..66ec5be39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ - 8.0.0-beta.23369.2 + 8.0.0-beta.23370.6 diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index e4108e39d..27f5a4115 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 423ebf99c..b66f48ef3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23369.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23370.6", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23370.6" } }