From 243650accecd8c9ed22de136436de13cabc5ab21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 16 Jul 2023 21:41:17 -0500 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230714.2 (#88947) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23362.5 -> To Version 8.0.0-beta.23364.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 72 +++++++++++++-------------- eng/Versions.props | 30 +++++------ eng/common/sdl/configure-sdl-tool.ps1 | 2 +- global.json | 6 +-- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ffe5ac029c1f9..8dfa527d12ee9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c @@ -117,69 +117,69 @@ a171b61473272e5a6d272117963864ba958a012a - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c https://github.com/dotnet/runtime-assets @@ -326,9 +326,9 @@ https://github.com/dotnet/xharness b0548ed270ed98fa14ab0fcc5ef7af99fad00237 - + https://github.com/dotnet/arcade - 7f922d5c3edb921ed36d169263c55065e235b333 + 60ea5b2eca5af06fc63b250f8669d2c70179b18c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 46114e2ed902f6..0dba8b8b4b30a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,21 +83,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 2.5.1-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 - 8.0.0-beta.23362.5 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 2.5.1-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 + 8.0.0-beta.23364.2 6.0.0-preview.1.102 diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index ee9eb893321338..e4108e39d9a51a 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -93,7 +93,7 @@ try { } 'binskim' { if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" + $tool.Args += "`"Target < $TargetDirectory\**`"" } $tool.Args += $BinskimAdditionalRunConfigParams } diff --git a/global.json b/global.json index a3f2590ff65cbc..f2ce11bb161f11 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.6.23330.14" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23362.5", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23362.5", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23364.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23364.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3"