From de437c7f21d66217668e3f6c37360f1598f86f2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 15:15:48 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230721.1 (#2199) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23364.2 -> To Version 8.0.0-beta.23371.1 Co-authored-by: dotnet-maestro[bot] --- 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 d0043c00a..31f2a1462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 602351e3681015ea789b2aeaa7b2a9156a8baf38 - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 602351e3681015ea789b2aeaa7b2a9156a8baf38 - + https://github.com/dotnet/arcade - 60ea5b2eca5af06fc63b250f8669d2c70179b18c + 602351e3681015ea789b2aeaa7b2a9156a8baf38 diff --git a/eng/Versions.props b/eng/Versions.props index 87c80bbd0..448b28fc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,6 +13,6 @@ 8.0.0-preview.4.23220.7 - 8.0.0-beta.23364.2 + 8.0.0-beta.23371.1 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 abd9c55c1..9fcc4b118 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23364.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23371.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23371.1" } }