diff --git a/.agents/skills/whatsnew/SKILL.md b/.agents/skills/whatsnew/SKILL.md index c26c77570..d8bf0c3e8 100644 --- a/.agents/skills/whatsnew/SKILL.md +++ b/.agents/skills/whatsnew/SKILL.md @@ -86,7 +86,7 @@ infer from context — e.g. a fresh release with no page → `draft`). | What | Path | |------|------| | What's-new pages | `src/frontend/src/content/docs/whats-new/aspire-N-N.mdx` (JA under `.../ja/whats-new/`) | -| Version constants | `src/frontend/config/aspire-versions.mjs` (`currentAspireMajorMinorVersion`, `currentAspireVersion`, `currentAspirePreviewVersion`) | +| Version constants | `src/frontend/config/aspire-versions.mjs` (`currentAspireMajorMinorVersion`, `currentAspireVersion`, `currentAspireReleaseDate`, `currentAspirePreviewVersion`) | | Sidebar | `src/frontend/config/sidebar/docs.topics.ts` (What's-new `items`) | | Announcement banner | `banner:` frontmatter on `src/frontend/src/content/docs/index.mdx`, `src/frontend/src/content/docs/docs.mdx`, `src/frontend/src/content/docs/community/index.mdx`, and each `src/frontend/src/content/docs/{locale}/index.mdx` (+ `.../ja/docs.mdx`); rendered by `src/frontend/src/components/starlight/Banner.astro` | | Assets | `src/frontend/src/assets/whats-new/aspire-/` | diff --git a/.agents/skills/whatsnew/references/01-draft-scaffold.md b/.agents/skills/whatsnew/references/01-draft-scaffold.md index 838c4962a..e2e0168b8 100644 --- a/.agents/skills/whatsnew/references/01-draft-scaffold.md +++ b/.agents/skills/whatsnew/references/01-draft-scaffold.md @@ -46,7 +46,8 @@ duplicating. reads its image and `publishDate`; no separate catalog entry is needed. 3. **Version constants.** Update `src/frontend/config/aspire-versions.mjs`: `currentAspireMajorMinorVersion = 'N.N'`, `currentAspireVersion` to the latest - stable `N.N.PATCH`, and `currentAspirePreviewVersion` to the matching full + stable `N.N.PATCH`, `currentAspireReleaseDate` to that patch's NuGet publish + date (`YYYY-MM-DD`, shown in the Install CLI dialog), and `currentAspirePreviewVersion` to the matching full `N.N.PATCH-preview.*` package version. Set both package versions to the initial release patch when N.N becomes current, then keep them aligned with the site AppHost during servicing updates. These drive the Aspire version remark diff --git a/.github/agents/release-verifier.agent.md b/.github/agents/release-verifier.agent.md index e83837e00..0d496f0ab 100644 --- a/.github/agents/release-verifier.agent.md +++ b/.github/agents/release-verifier.agent.md @@ -178,6 +178,7 @@ version constants match the release being verified: |--------|----------------| | `currentAspireMajorMinorVersion` | `{VERSION}` (for example, `13.2`) | | `currentAspireVersion` | Latest stable `{VERSION}.PATCH` package version | +| `currentAspireReleaseDate` | Publish date (`YYYY-MM-DD`) of `currentAspireVersion` on NuGet | | `currentAspirePreviewVersion` | Matching full `{VERSION}.PATCH-preview.*` package version | These constants drive the `%ASPIRE_VERSION_MAJOR_MINOR%`, `%ASPIRE_VERSION%`, diff --git a/src/apphost/Aspire.Dev.AppHost/Aspire.Dev.AppHost.csproj b/src/apphost/Aspire.Dev.AppHost/Aspire.Dev.AppHost.csproj index b73401b69..5f36fa347 100644 --- a/src/apphost/Aspire.Dev.AppHost/Aspire.Dev.AppHost.csproj +++ b/src/apphost/Aspire.Dev.AppHost/Aspire.Dev.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -10,11 +10,11 @@ - - - - - + + + + + diff --git a/src/frontend/config/aspire-versions.mjs b/src/frontend/config/aspire-versions.mjs index 1d1a08920..d04005516 100644 --- a/src/frontend/config/aspire-versions.mjs +++ b/src/frontend/config/aspire-versions.mjs @@ -1,6 +1,8 @@ -export const currentAspireMajorMinorVersion = '13.5'; -export const currentAspireVersion = '13.5.3'; -export const currentAspirePreviewVersion = '13.5.3-preview.1.26425.3'; +export const currentAspireMajorMinorVersion = '13.6'; +export const currentAspireVersion = '13.6.0'; +// Release date (YYYY-MM-DD) of currentAspireVersion; update together with the version. +export const currentAspireReleaseDate = '2026-09-29'; +export const currentAspirePreviewVersion = '13.6.0-preview.1.26479.8'; export const aspireVersionPlaceholders = Object.freeze({ '%ASPIRE_VERSION_MAJOR_MINOR%': currentAspireMajorMinorVersion, diff --git a/src/frontend/src/components/InstallCliModal.astro b/src/frontend/src/components/InstallCliModal.astro index 9e7622674..66e77c736 100644 --- a/src/frontend/src/components/InstallCliModal.astro +++ b/src/frontend/src/components/InstallCliModal.astro @@ -1,12 +1,25 @@ --- import { Code, Icon, Aside } from '@astrojs/starlight/components'; import CustomSelect, { type CustomSelectOption } from '@components/CustomSelect.astro'; +import { + currentAspireMajorMinorVersion, + currentAspireReleaseDate, + currentAspireVersion, +} from '../../config/aspire-versions.mjs'; interface Props { id?: string; } const { id = 'install-cli-modal' } = Astro.props; + +// Major releases omit the minor suffix (for example, /whats-new/aspire-13/). +const [major, minor] = currentAspireMajorMinorVersion.split('.'); +const releaseNotesHref = `/whats-new/aspire-${major}${minor === '0' ? '' : `-${minor}`}/`; +const releaseDateLabel = new Date(`${currentAspireReleaseDate}T00:00:00Z`).toLocaleDateString( + 'en-US', + { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' } +); const channelOptions: CustomSelectOption[] = [ { value: 'release', @@ -37,6 +50,18 @@ const channelOptions: CustomSelectOption[] = [
+
+ + Installs Aspire {currentAspireVersion}{' '} + + ·{' '}Released + + + + Release notes + + +
@@ -154,6 +179,9 @@ const channelOptions: CustomSelectOption[] = [ const version = element.getAttribute('data-version') || element.getAttribute('data-quality'); element.style.display = version === quality ? 'block' : 'none'; }); + modal.querySelectorAll('.release-info').forEach((element) => { + element.hidden = element.getAttribute('data-quality') !== quality; + }); // Save to localStorage try { @@ -399,6 +427,38 @@ const channelOptions: CustomSelectOption[] = [ margin-top: 0.5rem; } + .release-info { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 0.5rem 1rem; + font-size: var(--sl-text-sm); + color: var(--sl-color-gray-2); + } + + .release-info[hidden] { + display: none; + } + + .release-version strong { + color: var(--sl-color-text); + font-weight: 600; + } + + .release-notes-link { + display: inline-flex; + align-items: center; + gap: 0.25rem; + color: var(--sl-color-text-accent); + text-decoration: none; + font-weight: 500; + } + + .release-notes-link:hover { + text-decoration: underline; + } + .modal-footer { padding: 1rem; border-top: 1px solid var(--sl-color-gray-5); diff --git a/src/frontend/tests/e2e/ui-regressions.spec.ts b/src/frontend/tests/e2e/ui-regressions.spec.ts index 03410713e..9c4c3fe6a 100644 --- a/src/frontend/tests/e2e/ui-regressions.spec.ts +++ b/src/frontend/tests/e2e/ui-regressions.spec.ts @@ -64,11 +64,14 @@ test('install CLI entry adapts to viewport and remembers the selected channel', const installModal = page.locator('#install-cli-modal'); const versionSelect = installModal.locator('#version-select'); + const releaseInfo = installModal.locator('.release-info'); const channelTrigger = installModal.getByRole('combobox', { name: 'Select release channel', }); await expect(installModal).toBeVisible(); + await expect(versionSelect).toHaveValue('release'); + await expect(releaseInfo).toBeVisible(); await channelTrigger.click(); await expect(channelTrigger).toHaveAttribute('aria-expanded', 'true'); const channelListbox = page.getByRole('listbox', { name: 'Select release channel' }); @@ -81,6 +84,7 @@ test('install CLI entry adapts to viewport and remembers the selected channel', await expect(channelTrigger).toHaveAttribute('aria-expanded', 'false'); await expect(installModal.locator('.quality-aside[data-quality="dev"]')).toBeVisible(); await expect(installModal.locator('.code-wrapper[data-version="dev"]').first()).toBeVisible(); + await expect(releaseInfo).toBeHidden(); await expect .poll(() => page.evaluate(() => localStorage.getItem('aspire-install-channel'))) .toBe('dev'); @@ -89,8 +93,10 @@ test('install CLI entry adapts to viewport and remembers the selected channel', await expect(installModal).not.toBeVisible(); await openInstallButton.click(); + await expect(installModal).toBeVisible(); await expect(versionSelect).toHaveValue('dev'); await expect(channelTrigger).toContainText('Dev'); + await expect(releaseInfo).toBeHidden(); }); test('homepage header matches the compact mobile action geometry at reflow widths', async ({ diff --git a/src/frontend/tests/unit/custom-components.vitest.test.ts b/src/frontend/tests/unit/custom-components.vitest.test.ts index dde8f4cd7..90e38b6ec 100644 --- a/src/frontend/tests/unit/custom-components.vitest.test.ts +++ b/src/frontend/tests/unit/custom-components.vitest.test.ts @@ -78,6 +78,11 @@ import trTranslations from '../../src/content/i18n/tr.json'; import ukTranslations from '../../src/content/i18n/uk.json'; import zhCnTranslations from '../../src/content/i18n/zh-CN.json'; import { normalizeHtml, renderComponent, type StarlightRoute } from './astro-test-utils'; +import { + currentAspireMajorMinorVersion, + currentAspireReleaseDate, + currentAspireVersion, +} from '../../config/aspire-versions.mjs'; type BasicRenderCase = { name: string; @@ -695,6 +700,10 @@ const basicRenderCases: BasicRenderCase[] = [ 'id="version-select"', 'data-version="staging"', 'More installation options', + 'data-quality="release"', + `>${currentAspireVersion}`, + `datetime="${currentAspireReleaseDate}"`, + `href="/whats-new/aspire-${currentAspireMajorMinorVersion.replace('.', '-').replace(/-0$/, '')}/"`, ], }, { diff --git a/src/statichost/StaticHost/StaticHost.csproj b/src/statichost/StaticHost/StaticHost.csproj index e744fe0a2..f6e5fdfb8 100644 --- a/src/statichost/StaticHost/StaticHost.csproj +++ b/src/statichost/StaticHost/StaticHost.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/tests/StaticHost.Tests/StaticHost.Tests.csproj b/tests/StaticHost.Tests/StaticHost.Tests.csproj index 4f2606452..648d9c0b7 100644 --- a/tests/StaticHost.Tests/StaticHost.Tests.csproj +++ b/tests/StaticHost.Tests/StaticHost.Tests.csproj @@ -1,7 +1,7 @@ - + net10.0 @@ -14,8 +14,8 @@ - - + +