From f22866f4a2e4730f1ed36cb0d7315d108fb61c14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Apr 2024 12:17:12 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240419.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.24217.5 -> To Version 9.0.0-beta.24219.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- eng/common/build.ps1 | 4 +--- eng/common/build.sh | 8 -------- global.json | 4 ++-- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbcabdbbd..f2848064f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ - + https://github.com/dotnet/arcade - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + https://github.com/dotnet/arcade - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + https://github.com/dotnet/arcade - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f https://github.com/dotnet/arcade-services @@ -258,14 +258,14 @@ https://github.com/dotnet/arcade-services 9ec07c3673acf5602234c244d9465bca48f49969 - + https://github.com/dotnet/arcade - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + https://github.com/dotnet/arcade - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f diff --git a/eng/Versions.props b/eng/Versions.props index b6bd37bd3..fbad840a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24217.5 + 9.0.0-beta.24219.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 83e6d82e0..438f9920c 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -19,7 +19,6 @@ Param( [switch] $pack, [switch] $publish, [switch] $clean, - [switch] $verticalBuild, [switch][Alias('pb')]$productBuild, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, @@ -60,7 +59,6 @@ function Print-Usage() { Write-Host " -sign Sign build outputs" Write-Host " -publish Publish artifacts (e.g. symbols)" Write-Host " -clean Clean the solution" - Write-Host " -verticalBuild Run in 'vertical build' infra mode." Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)" Write-Host "" @@ -124,7 +122,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` - /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) ` + /p:DotNetBuildRepo=$productBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index d82ebf742..ac1ee8620 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false source_build=false -vertical_build=false product_build=false rebuild=false test=false @@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; - -verticalbuild|-vb) - build=true - vertical_build=true - product_build=true - restore=true - pack=true - ;; -test|-t) test=true ;; diff --git a/global.json b/global.json index 0cccc264e..69f0c3467 100644 --- a/global.json +++ b/global.json @@ -11,8 +11,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.5", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24219.1", "Microsoft.Build.NoTargets": "3.7.0" } }