From f029abaffa7c2bb2d003e5c5bfe3397bc7474ae8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:04:13 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#18874) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f25cfebd1..8db80b6c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services c041bcdab75f5447be8bd11ddcfbe8e639f13f32 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + db45698020f58f88eef75b23b2598a59872918f6 diff --git a/eng/Versions.props b/eng/Versions.props index d9480cd82..527a00cac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24154.2 + 9.0.0-beta.24155.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9bf873e3c..a58aef284 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -856,7 +856,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 -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and $properties -notlike "*DotNetBuildRepo=true*") { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { 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 9f58ff4c9..b77d6eb91 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24154.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24154.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24155.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24155.1" } }