From 97ab80a6761fd367d6c58dd46acc52643cc56a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 May 2025 02:03:01 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/dotnet build 20250513.8 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-preview.5.25263.104 -> To Version 10.0.0-preview.5.25263.108 --- eng/Version.Details.xml | 48 +++++++++---------- eng/Versions.props | 20 ++++---- .../core-templates/steps/source-build.yml | 3 +- global.json | 4 +- 4 files changed, 37 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ae898623c..437776607d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 https://github.com/dotnet/diagnostics @@ -12,55 +12,55 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 - + https://github.com/dotnet/dotnet - 5d437e96e412b189af05abb84753996de9aa698f + 362a4227bd38985f75f6a6d7f6733c7d62414569 diff --git a/eng/Versions.props b/eng/Versions.props index b8eea776951..9428ed5a3d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,16 +52,16 @@ 9.0.0-preview.25223.1 1.0.622301 - 10.0.0-preview.5.25263.104 - 10.0.0-preview.25263.104 - 10.0.0-beta.25263.104 - 10.0.0-beta.25263.104 - 10.0.0-beta.25263.104 - 10.0.0-preview.5.25263.104 - 2.0.0-beta5.25263.104 - 10.0.0-preview.5.25263.104 - 10.0.100-preview.5.25263.104 - 10.0.0-preview.5.25263.104 + 10.0.0-preview.5.25263.108 + 10.0.0-preview.25263.108 + 10.0.0-beta.25263.108 + 10.0.0-beta.25263.108 + 10.0.0-beta.25263.108 + 10.0.0-preview.5.25263.108 + 2.0.0-beta5.25263.108 + 10.0.0-preview.5.25263.108 + 10.0.100-preview.5.25263.108 + 10.0.0-preview.5.25263.108 $(MicrosoftNETCoreApp80Version) diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index f2a0f347fdd..0dde553c3eb 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -51,13 +51,12 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack -bl \ + --source-build \ ${{ parameters.platform.buildArguments }} \ $internalRuntimeDownloadArgs \ $targetRidArgs \ $baseRidArgs \ $portableBuildArgs \ - /p:DotNetBuildSourceOnly=true \ - /p:DotNetBuildRepo=true \ displayName: Build - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml diff --git a/global.json b/global.json index 3efe79aab18..16b3fa485e3 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108" } } From 5d67bce6b3ec44724dbacf11bf7e5eb2cfbfe806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 May 2025 14:08:14 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/dotnet build 20250515.1 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-preview.5.25263.104 -> To Version 10.0.0-preview.5.25265.101 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- eng/common/tools.ps1 | 4 +--- eng/common/tools.sh | 2 +- global.json | 4 ++-- 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 437776607d0..80c77b1c40a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee https://github.com/dotnet/diagnostics @@ -12,55 +12,55 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee - + https://github.com/dotnet/dotnet - 362a4227bd38985f75f6a6d7f6733c7d62414569 + ad8565092bbfdd5c8b4a94a718d10b2d394f7aee diff --git a/eng/Versions.props b/eng/Versions.props index 9428ed5a3d5..d7e5c331912 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,16 +52,16 @@ 9.0.0-preview.25223.1 1.0.622301 - 10.0.0-preview.5.25263.108 - 10.0.0-preview.25263.108 - 10.0.0-beta.25263.108 - 10.0.0-beta.25263.108 - 10.0.0-beta.25263.108 - 10.0.0-preview.5.25263.108 - 2.0.0-beta5.25263.108 - 10.0.0-preview.5.25263.108 - 10.0.100-preview.5.25263.108 - 10.0.0-preview.5.25263.108 + 10.0.0-preview.5.25265.101 + 10.0.0-preview.25265.101 + 10.0.0-beta.25265.101 + 10.0.0-beta.25265.101 + 10.0.0-beta.25265.101 + 10.0.0-preview.5.25265.101 + 2.0.0-beta5.25265.101 + 10.0.0-preview.5.25265.101 + 10.0.100-preview.5.25265.101 + 10.0.0-preview.5.25265.101 $(MicrosoftNETCoreApp80Version) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7373e530546..5f40a3f8238 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -68,8 +68,6 @@ $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 } @@ -853,7 +851,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 -not($properties -like "*DotNetBuildRepo=true*")) { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) { 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 cc007b1f15a..25f5932eee9 100644 --- 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 ]]; 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 16b3fa485e3..6158b22c04a 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101" } } From 0ba7a83999fcb092eb2bd3055a9b72caa77a46ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 May 2025 02:03:34 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/dotnet build 20250516.3 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-preview.5.25263.104 -> To Version 10.0.0-preview.5.25266.103 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- eng/common/build.ps1 | 2 +- eng/common/build.sh | 6 +++--- global.json | 6 +++--- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c77b1c40a..770eccd0137 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c https://github.com/dotnet/diagnostics @@ -12,55 +12,55 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c - + https://github.com/dotnet/dotnet - ad8565092bbfdd5c8b4a94a718d10b2d394f7aee + 604dfc7f29729283704bee27b1e844c1fa044b9c diff --git a/eng/Versions.props b/eng/Versions.props index d7e5c331912..649bdbec4dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,16 +52,16 @@ 9.0.0-preview.25223.1 1.0.622301 - 10.0.0-preview.5.25265.101 - 10.0.0-preview.25265.101 - 10.0.0-beta.25265.101 - 10.0.0-beta.25265.101 - 10.0.0-beta.25265.101 - 10.0.0-preview.5.25265.101 - 2.0.0-beta5.25265.101 - 10.0.0-preview.5.25265.101 - 10.0.100-preview.5.25265.101 - 10.0.0-preview.5.25265.101 + 10.0.0-preview.5.25266.103 + 10.0.0-preview.25266.103 + 10.0.0-beta.25266.103 + 10.0.0-beta.25266.103 + 10.0.0-beta.25266.103 + 10.0.0-preview.5.25266.103 + 2.0.0-beta5.25266.103 + 10.0.0-preview.5.25266.103 + 10.0.100-preview.5.25266.103 + 10.0.0-preview.5.25266.103 $(MicrosoftNETCoreApp80Version) diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 6b3be1916fc..ae2309e312d 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -127,7 +127,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` - /p:DotNetBuildRepo=$productBuild ` + /p:DotNetBuild=$productBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 27ae2c85601..da906da2026 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -129,14 +129,14 @@ while [[ $# > 0 ]]; do -pack) pack=true ;; - -sourcebuild|-sb) + -sourcebuild|-source-build|-sb) build=true source_build=true product_build=true restore=true pack=true ;; - -productbuild|-pb) + -productbuild|-product-build|-pb) build=true product_build=true restore=true @@ -241,7 +241,7 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ - /p:DotNetBuildRepo=$product_build \ + /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ diff --git a/global.json b/global.json index 6158b22c04a..2d9081a7d4d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-preview.4.25209.42", + "dotnet": "10.0.100-preview.5.25265.106", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp80Version)", @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25266.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25266.103" } } From 4f424ed8707599f83cceadc8b28d2d3e27009526 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 18 May 2025 02:02:20 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/dotnet build 20250517.2 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-preview.5.25263.104 -> To Version 10.0.0-preview.5.25267.102 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- global.json | 4 ++-- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 770eccd0137..dadb9451e46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 https://github.com/dotnet/diagnostics @@ -12,55 +12,55 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 - + https://github.com/dotnet/dotnet - 604dfc7f29729283704bee27b1e844c1fa044b9c + 170498a9429a5553fe7ac0ec2341d19bbb97cbe8 diff --git a/eng/Versions.props b/eng/Versions.props index 649bdbec4dc..7934488946a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,16 +52,16 @@ 9.0.0-preview.25223.1 1.0.622301 - 10.0.0-preview.5.25266.103 - 10.0.0-preview.25266.103 - 10.0.0-beta.25266.103 - 10.0.0-beta.25266.103 - 10.0.0-beta.25266.103 - 10.0.0-preview.5.25266.103 - 2.0.0-beta5.25266.103 - 10.0.0-preview.5.25266.103 - 10.0.100-preview.5.25266.103 - 10.0.0-preview.5.25266.103 + 10.0.0-preview.5.25267.102 + 10.0.0-preview.25267.102 + 10.0.0-beta.25267.102 + 10.0.0-beta.25267.102 + 10.0.0-beta.25267.102 + 10.0.0-preview.5.25267.102 + 2.0.0-beta5.25267.102 + 10.0.0-preview.5.25267.102 + 10.0.100-preview.5.25267.102 + 10.0.0-preview.5.25267.102 $(MicrosoftNETCoreApp80Version) diff --git a/global.json b/global.json index 2d9081a7d4d..de8b250eb9a 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25266.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25266.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25267.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25267.102" } } From c822ef3005a154803986a9ce998b89f112f442ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 19 May 2025 15:29:45 +0200 Subject: [PATCH 5/5] Delete src/arcade/eng/common It got accidentally added due to a darc bug, see https://github.com/dotnet/arcade-services/issues/4837 --- .../core-templates/job/source-build.yml | 96 -------------- .../eng/common/core-templates/jobs/jobs.yml | 119 ------------------ .../core-templates/jobs/source-build.yml | 58 --------- .../steps/source-index-stage1-publish.yml | 35 ------ src/arcade/eng/common/init-tools-native.cmd | 3 - 5 files changed, 311 deletions(-) delete mode 100644 src/arcade/eng/common/core-templates/job/source-build.yml delete mode 100644 src/arcade/eng/common/core-templates/jobs/jobs.yml delete mode 100644 src/arcade/eng/common/core-templates/jobs/source-build.yml delete mode 100644 src/arcade/eng/common/core-templates/steps/source-index-stage1-publish.yml delete mode 100644 src/arcade/eng/common/init-tools-native.cmd diff --git a/src/arcade/eng/common/core-templates/job/source-build.yml b/src/arcade/eng/common/core-templates/job/source-build.yml deleted file mode 100644 index d805d5faeb9..00000000000 --- a/src/arcade/eng/common/core-templates/job/source-build.yml +++ /dev/null @@ -1,96 +0,0 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # portableBuild: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. The - # default is portable mode. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # buildArguments: '' - # Specifies additional build arguments to pass to the build script. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - - is1ESPipeline: '' - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - -jobs: -- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} - displayName: Source-Build (${{ parameters.platform.name }}) - - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/core-templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - ${{ if eq(parameters.is1ESPipeline, 'true') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 - os: linux - ${{ else }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all - - steps: - - ${{ if eq(parameters.is1ESPipeline, '') }}: - - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - - - ${{ if eq(parameters.enableInternalSources, true) }}: - - template: /eng/common/core-templates/steps/enable-internal-sources.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - template: /eng/common/core-templates/steps/enable-internal-runtimes.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - template: /eng/common/core-templates/steps/source-build.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - platform: ${{ parameters.platform }} diff --git a/src/arcade/eng/common/core-templates/jobs/jobs.yml b/src/arcade/eng/common/core-templates/jobs/jobs.yml deleted file mode 100644 index bf35b78faa6..00000000000 --- a/src/arcade/eng/common/core-templates/jobs/jobs.yml +++ /dev/null @@ -1,119 +0,0 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable running the source-build jobs to build repo from source - enableSourceBuild: false - - # Optional: Parameters for source-build template. - # See /eng/common/core-templates/jobs/source-build.yml for options - sourceBuildParameters: [] - - graphFileGeneration: - # Optional: Enable generating the graph files at the end of the build - enabled: false - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - - # Optional: Override automatically derived dependsOn value for "publish build assets" job - publishBuildAssetsDependsOn: '' - - # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. - publishAssetsImmediately: false - - # Optional: 🌤️ or not the build has assets it wants to publish to BAR - isAssetlessBuild: false - - # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - enableSourceIndex: false - sourceIndexParams: {} - - artifacts: {} - is1ESPipeline: '' - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -jobs: -- ${{ each job in parameters.jobs }}: - - ${{ if eq(parameters.is1ESPipeline, 'true') }}: - - template: /eng/common/templates-official/job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - - - ${{ else }}: - - template: /eng/common/templates/job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - -- ${{ if eq(parameters.enableSourceBuild, true) }}: - - template: /eng/common/core-templates/jobs/source-build.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - allCompletedJobId: Source_Build_Complete - ${{ each parameter in parameters.sourceBuildParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if eq(parameters.enableSourceIndex, 'true') }}: - - template: ../job/source-index-stage1.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - runAsPublic: ${{ parameters.runAsPublic }} - ${{ each parameter in parameters.sourceIndexParams }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}: - - template: ../job/publish-build-assets.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - continueOnError: ${{ parameters.continueOnError }} - dependsOn: - - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.publishBuildAssetsDependsOn }}: - - ${{ job.job }} - - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.jobs }}: - - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete - - runAsPublic: ${{ parameters.runAsPublic }} - publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }} - isAssetlessBuild: ${{ parameters.isAssetlessBuild }} - enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/src/arcade/eng/common/core-templates/jobs/source-build.yml b/src/arcade/eng/common/core-templates/jobs/source-build.yml deleted file mode 100644 index a10ccfbee6d..00000000000 --- a/src/arcade/eng/common/core-templates/jobs/source-build.yml +++ /dev/null @@ -1,58 +0,0 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/core-templates/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - - is1ESPipeline: '' - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - -jobs: - -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/core-templates/job/source-build.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - enableInternalSources: ${{ parameters.enableInternalSources }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/core-templates/job/source-build.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} - enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/src/arcade/eng/common/core-templates/steps/source-index-stage1-publish.yml b/src/arcade/eng/common/core-templates/steps/source-index-stage1-publish.yml deleted file mode 100644 index 99c2326fc19..00000000000 --- a/src/arcade/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ /dev/null @@ -1,35 +0,0 @@ -parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 - sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json - binlogPath: artifacts/log/Debug/Build.binlog - -steps: -- task: UseDotNet@2 - displayName: "Source Index: Use .NET 8 SDK" - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - -- script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: "Source Index: Download netsourceindex Tools" - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - -- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: "Source Index: Process Binlog into indexable sln" - -- ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: "Source Index: Upload Source Index stage1 artifacts to Azure" - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 diff --git a/src/arcade/eng/common/init-tools-native.cmd b/src/arcade/eng/common/init-tools-native.cmd deleted file mode 100644 index 438cd548c45..00000000000 --- a/src/arcade/eng/common/init-tools-native.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*" -exit /b %ErrorLevel% \ No newline at end of file