From ebebad79b1b499251caf188929dd5de96531bcb9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 20:04:49 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#17221)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23415.1 to 1.0.0-beta.23416.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 2 +-
eng/common/native/init-compiler.sh | 2 +-
eng/common/sdl/trim-assets-version.ps1 | 2 +-
eng/common/templates/job/execute-sdl.yml | 5 +++++
global.json | 4 ++--
6 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7faf38d65..4535bb8e3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -206,18 +206,18 @@
-
+
https://github.com/dotnet/arcade
- 46ff142f43e887d5f9a4d87ef39d72166f61db8d
+ 7837a0b504ed9a598daebd50f20520ccda5fe2b1
-
+
https://github.com/dotnet/arcade
- 46ff142f43e887d5f9a4d87ef39d72166f61db8d
+ 7837a0b504ed9a598daebd50f20520ccda5fe2b1
-
+
https://github.com/dotnet/arcade
- 46ff142f43e887d5f9a4d87ef39d72166f61db8d
+ 7837a0b504ed9a598daebd50f20520ccda5fe2b1
https://github.com/dotnet/arcade-services
@@ -236,9 +236,9 @@
45f5554ac6813e1e155c47fd80ec146c684f65e8
-
+
https://github.com/dotnet/xliff-tasks
- 649a1e75101b701d753ee41efbe9038f9b23a0db
+ 1d688e4b21c1782d802beb1e9478535f647a28ec
diff --git a/eng/Versions.props b/eng/Versions.props
index fc2cc9e09..5d43fdbd6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,7 +39,7 @@
- 8.0.0-beta.23415.4
+ 8.0.0-beta.23417.3
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
index 517401b68..f5c1ec7ea 100644
--- a/eng/common/native/init-compiler.sh
+++ b/eng/common/native/init-compiler.sh
@@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
# Set default versions
if [ -z "$majorVersion" ]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
- if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
+ if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
for version in $versions; do
diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1
index d8cfec910..a2e004877 100644
--- a/eng/common/sdl/trim-assets-version.ps1
+++ b/eng/common/sdl/trim-assets-version.ps1
@@ -25,7 +25,7 @@ function Install-VersionTools-Cli {
Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
- $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
+ $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
}
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 7aabaa180..7870f93bc 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -105,6 +105,11 @@ jobs:
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
checkDownloadedFiles: true
+ - powershell: eng/common/sdl/trim-assets-version.ps1
+ -InputPath $(Build.ArtifactStagingDirectory)\artifacts
+ displayName: Trim the version from the NuGet packages
+ continueOnError: ${{ parameters.sdlContinueOnError }}
+
- powershell: eng/common/sdl/extract-artifact-packages.ps1
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
diff --git a/global.json b/global.json
index ad6c72f15..9cadff4ee 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.23415.4",
- "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23415.4"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3",
+ "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23417.3"
}
}