From cb390a926cead79594817ca735a95f8bbfab9dee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Aug 2023 17:46:12 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230817.3 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.23415.4 -> To Version 8.0.0-beta.23417.3 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23415.1 -> To Version 1.0.0-beta.23416.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 76 ++++++++++++------------ eng/Versions.props | 30 +++++----- 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 | 6 +- 6 files changed, 63 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d255bdbc9f2af..79f0efe706fdbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,79 +107,79 @@ - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + https://github.com/dotnet/xliff-tasks - 649a1e75101b701d753ee41efbe9038f9b23a0db + 1d688e4b21c1782d802beb1e9478535f647a28ec - + 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 - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + 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 - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + 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 - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 - + 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 - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 46ff142f43e887d5f9a4d87ef39d72166f61db8d + 7837a0b504ed9a598daebd50f20520ccda5fe2b1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 314fcfd8e52f16..8740ad6523e5ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,21 +85,21 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 2.5.1-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 - 8.0.0-beta.23415.4 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 2.5.1-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 + 8.0.0-beta.23417.3 6.0.0-preview.1.102 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 517401b688bf76..f5c1ec7eafeb28 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 d8cfec910c77e6..a2e0048770452f 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 7aabaa18017bf6..7870f93bc17652 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 cf4ac698e3e8cb..414bbaeaf219c2 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.7.23376.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23415.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23417.3", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23417.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"