From e35ef5a8c784b75d044ce2f9498a7e7f2876340d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 12:06:46 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20240417.5 Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24217.1 -> To Version 9.0.0-beta.24217.5 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81d16576e3900..29ee6e30ed0ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 50b43ece7daf9f8a88ac16a95a4f8647a4c71c4b - + https://github.com/dotnet/arcade - 8ec8057ac5073b6b2e3fcb0a33d588d2a3357ad3 + 6eb545ab682b04dc72cf574252b7843ec657dd99 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 46b53f8ae070c..795054b82068c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.4.24215.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 2.6.7-beta.24217.1 - 9.0.0-beta.24217.1 - 2.6.7-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 - 9.0.0-beta.24217.1 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 2.6.7-beta.24217.5 + 9.0.0-beta.24217.5 + 2.6.7-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 + 9.0.0-beta.24217.5 1.4.0 diff --git a/global.json b/global.json index 4348e778e29b4..f87cd51a48e38 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24217.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.5", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24217.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24215.1" From 0986409f85dfb6b1e3dc8034551d0f584e4a8602 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Apr 2024 12:07:16 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20240419.1 Microsoft.SourceBuild.Intermediate.arcade , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24217.1 -> To Version 9.0.0-beta.24219.1 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/build.ps1 | 4 +- eng/common/build.sh | 8 ---- global.json | 6 +-- 5 files changed, 62 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29ee6e30ed0ac..d8226036d48f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + 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 - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + 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 - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + 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 - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + 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 - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + 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 - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 50b43ece7daf9f8a88ac16a95a4f8647a4c71c4b - + https://github.com/dotnet/arcade - 6eb545ab682b04dc72cf574252b7843ec657dd99 + b4f4d40741f161e2c0d96c19c51a4013850ef65f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 795054b82068c..ee1233c7327d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.4.24215.1 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 2.6.7-beta.24217.5 - 9.0.0-beta.24217.5 - 2.6.7-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 - 9.0.0-beta.24217.5 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 2.6.7-beta.24219.1 + 9.0.0-beta.24219.1 + 2.6.7-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 1.4.0 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 83e6d82e027a8..438f9920c43e4 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 d82ebf7428080..ac1ee8620cd2a 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 f87cd51a48e38..eb06a25344279 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.3.24204.13" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24217.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24217.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24217.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24219.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24215.1"