Skip to content

Merge release/13.3 to main after v13.3.5 release#17337

Closed
aspire-repo-bot[bot] wants to merge 4 commits into
mainfrom
release/13.3
Closed

Merge release/13.3 to main after v13.3.5 release#17337
aspire-repo-bot[bot] wants to merge 4 commits into
mainfrom
release/13.3

Conversation

@aspire-repo-bot
Copy link
Copy Markdown
Contributor

This PR merges the release/13.3 branch back to main after the v13.3.5 release.

Checklist

  • Verify all release-specific changes are appropriate for main
  • Resolve any merge conflicts
  • Ensure CI passes

Created automatically by the release workflow.

aspire-repo-bot Bot and others added 4 commits May 19, 2026 19:59
Accept server-provided values for disabled interaction inputs so dynamic Azure provisioning fields such as Location can be populated after selecting an existing resource group. Preserve local edits for enabled inputs.

Co-authored-by: Damian Edwards <damian@damianedwards.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
)

* Stop forcing MSBuild server for CLI dotnet commands

Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

* Remove outdated override comment in DotNetCliRunner test

Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>
These jobs only download already-built CLI archives and prepare
WinGet manifests / Homebrew casks; they never run the repo build,
so artifacts/log/$(_BuildConfig) is never produced. With
enablePublishBuildArtifacts: true, the Arcade 1ES job template
injects a Publish Logs pipelineArtifact output whose targetPath
points at that empty/missing directory. 1ES path validation on
that output fails the job (continueOnError on the CopyFiles step
doesn't help because the failure is on the 1ES publish output
itself).

Set enablePublishBuildArtifacts: false on the WinGet/Homebrew
installer stage in both the internal (azure-pipelines.yml) and
unofficial (azure-pipelines-unofficial.yml) pipelines. There are
no build logs to publish from these jobs.

This fixes the Prepare Installers stage failures in the internal
pipeline (e.g. dnceng/internal build 2969660).

Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com>
Copilot AI review requested due to automatic review settings May 21, 2026 01:52
@aspire-repo-bot aspire-repo-bot Bot requested a review from adamint as a code owner May 21, 2026 01:52
@aspire-repo-bot aspire-repo-bot Bot added the area-engineering-systems infrastructure helix infra engineering repo stuff label May 21, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 21, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 17337

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 17337"

@joperezr
Copy link
Copy Markdown
Member

Superseded by #17343. That PR rebuilds the back-merge from a feature branch off release/13.3 so we can drop the 13.3.5 version bump and pre-resolve the DotNetCliRunnerTests.cs conflict without polluting the release branch.

@joperezr joperezr closed this May 21, 2026
joperezr added a commit that referenced this pull request May 21, 2026
…17343)

* Fix Azure provisioning disabled input values (#17291)

Accept server-provided values for disabled interaction inputs so dynamic Azure provisioning fields such as Location can be populated after selecting an existing resource group. Preserve local edits for enabled inputs.

Co-authored-by: Damian Edwards <damian@damianedwards.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* [release/13.3] Stop forcing MSBuild server for Aspire CLI builds (#17314)

* Stop forcing MSBuild server for CLI dotnet commands

Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

* Remove outdated override comment in DotNetCliRunner test

Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>

* Skip log publish for WinGet/Homebrew installer jobs (#17134)

These jobs only download already-built CLI archives and prepare
WinGet manifests / Homebrew casks; they never run the repo build,
so artifacts/log/$(_BuildConfig) is never produced. With
enablePublishBuildArtifacts: true, the Arcade 1ES job template
injects a Publish Logs pipelineArtifact output whose targetPath
points at that empty/missing directory. 1ES path validation on
that output fails the job (continueOnError on the CopyFiles step
doesn't help because the failure is on the 1ES publish output
itself).

Set enablePublishBuildArtifacts: false on the WinGet/Homebrew
installer stage in both the internal (azure-pipelines.yml) and
unofficial (azure-pipelines-unofficial.yml) pipelines. There are
no build logs to publish from these jobs.

This fixes the Prepare Installers stage failures in the internal
pipeline (e.g. dnceng/internal build 2969660).

Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Bump patch version from 13.3.4 to 13.3.5 (#17315)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com>

* Revert "Bump patch version from 13.3.4 to 13.3.5 (#17315)"

This reverts commit 70b33bc.

---------

Co-authored-by: aspire-repo-bot[bot] <268009190+aspire-repo-bot[bot]@users.noreply.github.com>
Co-authored-by: Damian Edwards <damian@damianedwards.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: David Fowler <davidfowl@gmail.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-engineering-systems infrastructure helix infra engineering repo stuff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants