From c3a359e212816e7554b8cb20db9ea472475da630 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 13:17:15 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240228.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24127.4 -> To Version 9.0.0-beta.24128.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 ++ eng/common/tools.sh | 2 +- global.json | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa0faa8b2..4f4fd40ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 9aa3f2e68b30ac51823dd444e8cb962e058c5699 + 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/arcade - 9aa3f2e68b30ac51823dd444e8cb962e058c5699 + 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/arcade - 9aa3f2e68b30ac51823dd444e8cb962e058c5699 + 7582b5deefe451b6453a7693197df02ef1558d4b https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services c041bcdab75f5447be8bd11ddcfbe8e639f13f32 - + https://github.com/dotnet/arcade - 9aa3f2e68b30ac51823dd444e8cb962e058c5699 + 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/arcade - 9aa3f2e68b30ac51823dd444e8cb962e058c5699 + 7582b5deefe451b6453a7693197df02ef1558d4b diff --git a/eng/Versions.props b/eng/Versions.props index 5af51d6cd..c09664e8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 9.0.0-beta.24127.4 + 9.0.0-beta.24128.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 269fdb942..9bf873e3c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -68,6 +68,8 @@ $ErrorActionPreference = 'Stop' # True if the build is a product build [bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } +[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6f0141e7d..db64e298f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -507,7 +507,7 @@ function MSBuild-Core { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && $properties != *"DotNetBuildRepo=true"* ]]; then + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index 7d3586dd8..4e0e58021 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.4", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24127.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24128.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24128.1" } }