From 6ae98f28d043e7ef5a4767c947118947de62fe2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Feb 2024 13:08:00 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20240227.2 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.24112.1 -> To Version 9.0.0-beta.24127.2 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/tools.ps1 | 6 ++- eng/common/tools.sh | 6 ++- global.json | 10 ++--- 5 files changed, 73 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5f9f8ab01839..8b6eec4b79962 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -124,87 +124,87 @@ - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f https://github.com/dotnet/runtime-assets @@ -364,9 +364,9 @@ https://github.com/dotnet/xharness 8aa2a4cb80000ebb46ee61cd6ac29b2e63ebe87c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d9930e5e9a0069e5b7726c119f614486b8ef438f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 292bf70f43b52..df6647b9fd96a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.3.24126.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 2.6.7-beta.24112.1 - 9.0.0-beta.24112.1 - 2.6.7-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 2.6.7-beta.24127.2 + 9.0.0-beta.24127.2 + 2.6.7-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 1.4.0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7d8dc89b919bc..269fdb9420da9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,6 +65,9 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } +# True if the build is a product build +[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -850,7 +853,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) { + # 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*") { 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/eng/common/tools.sh b/eng/common/tools.sh index ece4b73079536..803907795c10a 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -68,6 +68,9 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} +# True if the build is a product build +product_build=${product_build:-false} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -503,7 +506,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then + # 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 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 5adb3a5b87fcb..bd372504dfe18 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.100-alpha.1.23615.4", + "version": "9.0.100-preview.1.24101.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-alpha.1.23615.4" + "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24112.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24112.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24127.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24127.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.3.24126.1" From d8425bd203032642998d986d7c168eb3b85d316d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 13:08:14 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20240227.4 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.24112.1 -> To Version 9.0.0-beta.24127.4 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/tools.sh | 2 +- global.json | 6 +-- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b6eec4b79962..c5e1485a9e9b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -124,87 +124,87 @@ - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 https://github.com/dotnet/runtime-assets @@ -364,9 +364,9 @@ https://github.com/dotnet/xharness 8aa2a4cb80000ebb46ee61cd6ac29b2e63ebe87c - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 9aa3f2e68b30ac51823dd444e8cb962e058c5699 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index df6647b9fd96a..256e6e83a22f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.3.24126.1 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 2.6.7-beta.24127.2 - 9.0.0-beta.24127.2 - 2.6.7-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 2.6.7-beta.24127.4 + 9.0.0-beta.24127.4 + 2.6.7-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 + 9.0.0-beta.24127.4 1.4.0 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 803907795c10a..6f0141e7d513f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -144,7 +144,7 @@ function InitializeDotNetCli { if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then dotnet_root="$DOTNET_INSTALL_DIR" else - dotnet_root="$repo_root/.dotnet" + dotnet_root="${repo_root}.dotnet" export DOTNET_INSTALL_DIR="$dotnet_root" diff --git a/global.json b/global.json index bd372504dfe18..6fe08725d44cf 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24127.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24127.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24127.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24127.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.3.24126.1" From 2c4d3e53f0644e81e7a385df765ed2404ba96511 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 13:10:06 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20240227.4 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.24112.1 -> To Version 9.0.0-beta.24127.4