[main] Update dependencies from dotnet/dotnet#3698
[main] Update dependencies from dotnet/dotnet#3698dotnet-maestro[bot] wants to merge 8 commits intomainfrom
Conversation
…321.6 On relative base path root Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore , Microsoft.AspNetCore.Identity.EntityFrameworkCore , Microsoft.AspNetCore.Identity.UI , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.Identity.Stores , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Options.ConfigurationExtensions , System.Text.Json From Version 11.0.0-preview.2.26108.103 -> To Version 11.0.0-preview.3.26171.106 Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26108.103 -> To Version 11.0.0-beta.26171.106
…329.2 On relative base path root Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore , Microsoft.AspNetCore.Identity.EntityFrameworkCore , Microsoft.AspNetCore.Identity.UI , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.Identity.Stores , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Options.ConfigurationExtensions , System.Text.Json From Version 11.0.0-preview.2.26108.103 -> To Version 11.0.0-preview.3.26179.102 Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26108.103 -> To Version 11.0.0-beta.26179.102
…403.8 On relative base path root Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore , Microsoft.AspNetCore.Identity.EntityFrameworkCore , Microsoft.AspNetCore.Identity.UI , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.Identity.Stores , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Options.ConfigurationExtensions , System.Text.Json From Version 11.0.0-preview.2.26108.103 -> To Version 11.0.0-preview.4.26203.108 Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26108.103 -> To Version 11.0.0-beta.26203.108
…410.11 On relative base path root Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore , Microsoft.AspNetCore.Identity.EntityFrameworkCore , Microsoft.AspNetCore.Identity.UI , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.Identity.Stores , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Options.ConfigurationExtensions , System.Text.Json From Version 11.0.0-preview.2.26108.103 -> To Version 11.0.0-preview.4.26210.111 Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26108.103 -> To Version 11.0.0-beta.26210.111
|
@copilot fix this build and ensure that CI is passing with the correct updates. |
|
@copilot fix this build and ensure that CI passes here |
|
@copilot fix this PR and ensure that CI passes |
There was a problem hiding this comment.
Pull request overview
This PR updates the repo’s .NET/Arcade dependency versions from dotnet/dotnet and brings in a set of eng/common infrastructure changes (VMR sync behavior, toolset acquisition, pipeline templates, and additional platform support).
Changes:
- Update .NET SDK/tooling versions (global.json + Arcade SDK + EF/Extensions dependency versions).
- Revise eng/common tooling and pipeline templates (toolset extraction pathing, publish artifact changes, new Renovate pipeline/job templates, VMR sync fallback behavior).
- Remove legacy SDL/Guardian helper scripts and add OpenBSD-related cross/rootfs support.
Reviewed changes
Copilot reviewed 45 out of 45 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| global.json | Bumps .NET SDK and Arcade SDK versions. |
| eng/common/vmr-sync.sh | Adds repo mapping resolution + reset fallback for failed forwardflow. |
| eng/common/vmr-sync.ps1 | Same as vmr-sync.sh for PowerShell. |
| eng/common/tools.sh | Adds warn-not-as-error support; reworks Arcade toolset acquisition/extraction; adds DotNet wrapper; MSBuild switches updates. |
| eng/common/tools.ps1 | Mirrors tools.sh changes; adds DotNet wrapper; adjusts VS discovery; updates toolset extraction and task project lookup. |
| eng/common/templates/vmr-build-pr.yml | Pins dotnet/dotnet resource ref to main. |
| eng/common/templates/variables/pool-providers.yml | Updates commented pool image example. |
| eng/common/templates/steps/vmr-sync.yml | Removes steps that extracted/check out VMR SHA from Version.Details.xml. |
| eng/common/templates/jobs/codeql-build.yml | Removes shim template (deleted). |
| eng/common/templates/job/job.yml | Switches log publishing step to pipeline artifacts. |
| eng/common/templates-official/variables/sdl-variables.yml | Removes SDL variables template (deleted). |
| eng/common/templates-official/variables/pool-providers.yml | Updates commented pool image example. |
| eng/common/templates-official/jobs/codeql-build.yml | Removes shim template (deleted). |
| eng/common/templates-official/job/job.yml | Updates official job log publishing to pipeline artifacts naming/inputs. |
| eng/common/template-guidance.md | Updates guidance to reflect removed shims/SDL variables. |
| eng/common/sdl/trim-assets-version.ps1 | Removes legacy SDL helper (deleted). |
| eng/common/sdl/sdl.ps1 | Removes legacy Guardian installer helper (deleted). |
| eng/common/sdl/run-sdl.ps1 | Removes legacy Guardian run helper (deleted). |
| eng/common/sdl/packages.config | Removes Guardian CLI package pin (deleted). |
| eng/common/sdl/init-sdl.ps1 | Removes legacy Guardian init helper (deleted). |
| eng/common/sdl/extract-artifact-packages.ps1 | Removes legacy artifact extraction helper (deleted). |
| eng/common/sdl/extract-artifact-archives.ps1 | Removes legacy archive extraction helper (deleted). |
| eng/common/sdl/execute-all-sdl-tools.ps1 | Removes legacy SDL orchestration script (deleted). |
| eng/common/sdl/configure-sdl-tool.ps1 | Removes legacy SDL tool configuration script (deleted). |
| eng/common/sdl/NuGet.config | Removes SDL-specific NuGet.config (deleted). |
| eng/common/sdk-task.sh | Updates help text to reference “toolset” layout. |
| eng/common/sdk-task.ps1 | Updates help text to reference “toolset” layout. |
| eng/common/renovate.env | Adds shared environment configuration for Renovate self-hosted runs. |
| eng/common/native/install-dependencies.sh | Updates Alpine package list (adds llvm, lldb-dev, etc.). |
| eng/common/native/init-distro-rid.sh | Adds OpenBSD RID computation. |
| eng/common/cross/toolchain.cmake | Adds OpenBSD detection + target triple wiring. |
| eng/common/cross/build-rootfs.sh | Adds OpenBSD sysroot building support (sets/packages + download/install logic). |
| eng/common/core-templates/steps/publish-logs.yml | Adjusts redaction token list (removes MaestroAccessToken). |
| eng/common/core-templates/steps/install-microbuild.yml | Removes explicit @self on nested template references. |
| eng/common/core-templates/stages/renovate.yml | Adds Renovate stage template for 1ES official pipelines. |
| eng/common/core-templates/post-build/post-build.yml | Removes SDLValidationParameters handling; updates pools/images; changes signing validation invocation. |
| eng/common/core-templates/jobs/codeql-build.yml | Removes CodeQL jobs template (deleted). |
| eng/common/core-templates/job/source-index-stage1.yml | Sets skipComponentGovernanceDetection=true; updates pool images. |
| eng/common/core-templates/job/renovate.yml | Adds Renovate job template (container-based). |
| eng/common/core-templates/job/publish-build-assets.yml | Updates pool images. |
| eng/common/core-templates/job/onelocbuild.yml | Updates pool images. |
| eng/common/build.sh | Adds --warnNotAsError option wiring. |
| eng/common/build.ps1 | Adds -warnNotAsError parameter + usage text. |
| eng/Versions.props | Updates EF/Extensions/System.Text.Json version properties. |
| eng/Version.Details.xml | Updates dependency versions and SHA to the new dotnet/dotnet commit. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| if ($null -eq $vsInfo -or $vsInfo.Count -eq 0) { | ||
| throw "No instance of Visual Studio meeting the requirements specified was found. Requirements: $($args -join ' ')" | ||
| return $null | ||
| } |
There was a problem hiding this comment.
LocateVisualStudio now throws when no VS instance is found, but the surrounding build logic expects it to return $null so it can fall back to downloading/using XCopy MSBuild (see InitializeVisualStudioMSBuild calling LocateVisualStudio and then choosing between VS vs xcopy). Throwing here will prevent that fallback and can break builds on machines without VS. Either restore the previous behavior (return $null) or update callers/docs to match the new contract.
| stages: | ||
| - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: | ||
| - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true')) }}: | ||
| - stage: Validate |
There was a problem hiding this comment.
The Validate stage condition no longer includes parameters.SDLValidationParameters.enable, and the SDLValidationParameters parameter block was removed from this template. This is a breaking change for existing pipelines that pass SDLValidationParameters into templates-official/post-build/post-build.yml (e.g., this repo’s azure-pipelines.yml). Either keep/continue forwarding the parameter (even if ignored) or update downstream pipelines accordingly in the same PR to avoid template expansion failures/behavior changes.
|
|
||
| # Renovate version used in the container image tag. | ||
| - name: renovateVersion | ||
| default: 43 |
There was a problem hiding this comment.
Renovate version is defined in two places with different defaults: parameters.renovateVersion defaults to 43 (container tag), while the job template hard-codes a renovateVersion variable as '42'. This can drift and make it unclear which Renovate version is actually running. Consider using a single source of truth (e.g., pass the stage parameter into the job and set the variable from it, or remove one of them).
| default: 43 | |
| default: 42 |
| version_details_path=$(cd "$scriptroot/.."; pwd -P)/Version.Details.xml | ||
| repo_name=$(grep -m 1 '<Source ' "$version_details_path" | sed -n 's/.*Mapping="\([^"]*\)".*/\1/p') | ||
| if [[ -z "$repo_name" ]]; then | ||
| fail "Failed to resolve repo mapping from $version_details_path" | ||
| exit 1 | ||
| fi |
There was a problem hiding this comment.
Version.Details.xml in this repo (eng/Version.Details.xml) uses the Arcade dependency schema (<Dependencies><Dependency ...>), so grepping for <Source ... Mapping="..."> will always return empty and cause vmr-sync to fail before running darc. Resolve the repo mapping from the VMR’s Version.Details.xml (likely under $vmr_dir) or derive it from another reliable source (e.g., a script parameter / repo remote), and update version_details_path accordingly (it currently points to eng/Version.Details.xml).
| $versionDetailsPath = Resolve-Path (Join-Path $PSScriptRoot '..\Version.Details.xml') | Select-Object -ExpandProperty Path | ||
| [xml]$versionDetails = Get-Content -Path $versionDetailsPath | ||
| $repoName = $versionDetails.SelectSingleNode('//Source').Mapping | ||
| if (-not $repoName) { | ||
| Fail "Failed to resolve repo mapping from $versionDetailsPath" | ||
| exit 1 | ||
| } |
There was a problem hiding this comment.
This script reads ..\Version.Details.xml (eng/Version.Details.xml) and expects a //Source node with a Mapping attribute, but that file in this repo uses the <Dependencies><Dependency ...> format and contains no <Source> element. As a result $repoName will be empty and the sync will exit early. Consider reading the VMR’s Version.Details.xml under $vmrDir (or accept the mapping as a parameter) instead of the repo’s eng/Version.Details.xml.
|
@copilot update this PR and ensure that CI is passing and baby sit this PR until it is ready to go |
…ild versions Agent-Logs-Url: https://github.com/dotnet/Scaffolding/sessions/a1a56373-84f0-411b-aab7-c5bf59802f81 Co-authored-by: haileymck <111816896+haileymck@users.noreply.github.com>
Fixed the CI build failures in commit 669d919. The root cause was that
Updated Warning Firewall rules blocked me from connecting to one or more addresses (expand for details)I tried to connect to the following addresses, but was blocked by firewall rules:
If you need me to access, download, or install something from one of these locations, you can either:
|
…415.21 On relative base path root Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore , Microsoft.AspNetCore.Identity.EntityFrameworkCore , Microsoft.AspNetCore.Identity.UI , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.Identity.Stores , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Options.ConfigurationExtensions , System.Text.Json From Version 11.0.0-preview.2.26108.103 -> To Version 11.0.0-preview.4.26215.121 Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26108.103 -> To Version 11.0.0-beta.26215.121
This pull request updates the following dependencies
From https://github.com/dotnet/dotnet