Merge main into release/13.4#1150
Closed
IEvangelist wants to merge 7 commits into
Closed
Conversation
…ulti-language integration authoring guide (#982) * docs: Fix Aspire.Hosting.Integration.Analyzers package reference The "Install the analyzer" section in the multi-language integration authoring guide instructed readers to add a PackageReference to `Aspire.Hosting.Integration.Analyzers`. That package does not exist on NuGet — the project in microsoft/aspire is `IsPackable=false`. The analyzer DLL ships embedded inside the `Aspire.Hosting` package and is activated via the `EnableAspireIntegrationAnalyzers` MSBuild property. Update the section (and the diagnostics-table heading prose) to reflect how the analyzer actually ships and how consumers enable it. Fixes #981 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs: Preserve analyzer section anchor Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: David Pine <dapine@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
Co-authored-by: David Pine <7679720+IEvangelist@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Remove the repeated Asciinema recordings from CLI command docs, the CLI overview, AI coding agent docs, and the install component while leaving a single reference landing-page showcase in place. Co-authored-by: David Pine <7679720+IEvangelist@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Improve Mermaid loading styles Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Refine Mermaid loading skeleton Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: David Pine <7679720+IEvangelist@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Move repository skills to .agents Consolidate repository-owned skill files under .agents/skills and update repo guidance references to the standard location. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Prefer playwright-cli in doc skills Update doc-writer and doc-tester guidance to direct browser-based validation through playwright-cli instead of MCP-backed browser tooling. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Move twoslash validator skill to .agents Co-authored-by: IEvangelist <7679720+IEvangelist@users.noreply.github.com> --------- Co-authored-by: David Pine <7679720+IEvangelist@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
…it and update (#1068) * docs(cli): document channel persistence in aspire.config.json for init and update Document that aspire init persists the CLI identity channel into aspire.config.json when using a non-stable channel (daily, staging, pr-N), and that aspire update --channel also rewrites the channel key in aspire.config.json so subsequent commands use the updated channel. Documents changes from microsoft/aspire#17452. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address review feedback (4 threads) - Remove undocumented PR-channel example (PRRT_kwDOQK_VN86Eyhhb) - Show generated profile applicationUrl and environmentVariables (PRRT_kwDOQK_VN86FtdNt) - Clarify explicit-channel persistence and stable exception for init (PRRT_kwDOQK_VN86FtdNz) - Clarify update only rewrites existing config and stable is not pinned (PRRT_kwDOQK_VN86FtdN4) Verified against microsoft/aspire@16ecffd on branch main. Edited per the doc-writer skill. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Apply suggestion from @IEvangelist --------- Co-authored-by: aspire-repo-bot[bot] <268009190+aspire-repo-bot[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: David Pine <7679720+IEvangelist@users.noreply.github.com> Co-authored-by: David Pine <david.pine@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Merges the latest main branch content into release/13.4, resolving conflicts and bringing CLI documentation updates into the release branch.
Changes:
- Normalizes/adjusts CLI overview frontmatter and
LearnMoreformatting. - Adds documentation describing
aspire update --channelbehavior around persisting the selected channel inaspire.config.json. - Adds documentation describing
aspire initchannel persistence behavior and includes an exampleaspire.config.json.
Reviewed changes
Copilot reviewed 3 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/frontend/src/content/docs/reference/cli/overview.mdx | Minor frontmatter quoting and LearnMore markup formatting adjustments. |
| src/frontend/src/content/docs/reference/cli/commands/aspire-update.mdx | Documents channel persistence behavior when switching channels via aspire update --channel. |
| src/frontend/src/content/docs/reference/cli/commands/aspire-init.mdx | Adds a new section explaining how aspire init persists an explicit channel in generated aspire.config.json. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
|
||
| Channel to update to (`stable`, `staging`, `daily`). When switching channels, `aspire update` applies all package version edits to your project first and then runs a single `dotnet restore`, ensuring that NuGet source mappings added for the target channel are in place before any restore is attempted. | ||
|
|
||
| When you switch to a persistable channel, such as `daily`, `aspire update` also rewrites the top-level `channel` key in `aspire.config.json` when the file already exists. Only channels registered as _explicit_ channels are persisted, with one exception: the `stable` channel is treated as the portable default and is intentionally not pinned. The persisted channel keeps subsequent `aspire add` and `aspire update` runs resolving packages against the channel you just switched to. |
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.
Merges latest main into release/13.4 and resolves the remaining conflicts blocking #907. Local merge checks show no conflicts for this branch into release/13.4 and no conflicts for the resulting release branch into main.