From af0793bb5545d8f33cdd262291de8c9e0a5e6c6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 13:37:02 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20220211.10 (#1302) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/templates/steps/generate-sbom.yml | 2 ++ global.json | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8347e14d..fe2c8e5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb https://github.com/dotnet/arcade-services diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 3acba705..4cea8c33 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -18,7 +18,9 @@ steps: filePath: ./eng/common/generate-sbom-prep.ps1 arguments: ${{parameters.manifestDirPath}} +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 - script: | + chmod +x ./eng/common/generate-sbom-prep.sh ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} displayName: Prep for SBOM generation in (Linux) condition: eq(variables['Agent.Os'], 'Linux') diff --git a/global.json b/global.json index 3a69376a..8b0253fd 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22110.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22111.10" } }