Merge release/13.3 to main after v13.3.5 release (supersedes #17337)#17343
Merged
Conversation
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 <[email protected]> Co-authored-by: Copilot <[email protected]>
) * Stop forcing MSBuild server for CLI dotnet commands Co-authored-by: davidfowl <[email protected]> * Remove outdated override comment in DotNetCliRunner test Co-authored-by: davidfowl <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: davidfowl <[email protected]>
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 <[email protected]> Co-authored-by: Copilot <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: joperezr <[email protected]>
This reverts commit 70b33bc.
….3-to-main # Conflicts: # tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.cs
joperezr
added
the
area-engineering-systems
joperezr
added
the
area-engineering-systems
3 tasks
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 17343Or
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 17343" |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR performs the post-release back-merge of release/13.3 into main after v13.3.5, while ensuring main keeps its 13.4.0 versioning and only the intended functional delta flows in (the #17314 change to stop forcing MSBuild server behavior for Aspire CLI dotnet invocations).
Changes:
- Stop injecting
DOTNET_CLI_USE_MSBUILD_SERVERinto the environment fordotnet build(AppHost build) executions. - Stop injecting
DOTNET_CLI_USE_MSBUILD_SERVERinto the environment fordotnet runexecutions. - Update/rename CLI runner tests to assert the env var is not injected.
Show a summary per file
| File | Description |
|---|---|
| src/Aspire.Cli/DotNet/DotNetCliRunner.cs | Removes forced DOTNET_CLI_USE_MSBUILD_SERVER injection for build/run so the .NET SDK decides MSBuild server behavior. |
| tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.cs | Updates tests to validate the CLI no longer injects DOTNET_CLI_USE_MSBUILD_SERVER and renames affected test cases. |
Copilot's findings
- Files reviewed: 2/2 changed files
- Comments generated: 1
Comment on lines
+137
to
141
| public async Task BuildAsyncDoesNotInjectConfiguredDotnetCliUseMsBuildServer() | ||
| { | ||
| using var workspace = TemporaryWorkspace.Create(outputHelper); | ||
| var projectFile = new FileInfo(Path.Combine(workspace.WorkspaceRoot.FullName, "AppHost.csproj")); | ||
| await File.WriteAllTextAsync(projectFile.FullName, "Not a real project file."); |
davidfowl
approved these changes
May 21, 2026
Contributor
|
❓ CLI E2E Tests unknown — 95 passed, 0 failed, 5 unknown (commit View all recordings
📹 Recordings uploaded automatically from CI run #26204784902 |
Contributor
|
✅ No documentation update needed. Step 5 branch: Triggered signals: none (signal_count = 0) The PR is a back-merge of
This is a pure internal refactor with no user-facing surface change, so no documentation update is required. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR supersedes #17337.
PR #17337 was created automatically by the release workflow to back-merge
release/13.3intomainafter the v13.3.5 release. However:release/13.3(the v13.3.4 commits and equivalents of [release/13.3] Skip log publish for WinGet/Homebrew installer jobs #17134 / [release/13.3] Fix Azure provisioning resource group location prompt #17291) had already been brought intomainvia the v13.3.4 back-merge (Merge v13.3.4 to main (replaces #17139) #17326), so they show as conflicts even though the changes are already there.VersionPrefixand should NOT be carried into main.release/13.3head branch of Merge release/13.3 to main after v13.3.5 release #17337 without polluting the release branch, so opening a fresh PR from a feature branch is the cleanest path.What this PR does
This branch is based on
release/13.3and:VersionPrefix.mainin to pre-resolve conflicts on this branch rather than at PR-merge time.tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.csbetween [release/13.3] Stop forcing MSBuild server for Aspire CLI builds #17314'sRunAsyncDoesNotInjectDotnetCliUseMsBuildServerWhenNoBuildIsFalserename and main's new binlog tests — keeping both.Net effect on main
Only the changes from #17314 (Stop forcing MSBuild server for Aspire CLI builds) flow into main — 2 files, ~22 lines:
src/Aspire.Cli/DotNet/DotNetCliRunner.cstests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.csEverything else from
release/13.3is either already in main or intentionally not carried over.Checklist
eng/Versions.propsstays at 13.4.0 (main's version)Aspire.Cli.Testsbuilds cleanlyReplaces #17337.