Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Aspire",
"description": "%extension.description%",
"publisher": "microsoft-aspire",
"version": "1.0.1",
"version": "1.0.2",
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
"icon": "dotnet-aspire-logo-128.png",
"license": "SEE LICENSE IN LICENSE.TXT",
Expand Down
12 changes: 3 additions & 9 deletions extension/src/debugger/languages/dotnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,15 +288,9 @@ export function createProjectDebuggerExtension(dotNetServiceProducer: (debugSess
debugConfiguration.executablePath = baseProfile?.executablePath;
debugConfiguration.checkForDevCert = baseProfile?.useSSL;

if (launchOptions.isApphost) {
// The Aspire dashboard URL will be set as the apphost's application URL. Check if auto-launch is enabled
const enableDashboardAutoLaunch = vscode.workspace.getConfiguration('aspire').get<boolean>('enableAspireDashboardAutoLaunch', true);

if (enableDashboardAutoLaunch) {
debugConfiguration.serverReadyAction = determineServerReadyAction(baseProfile?.launchBrowser, baseProfile?.applicationUrl);
}
}
else {
// The apphost's application URL is the Aspire dashboard URL. We already get the dashboard login URL later on,
// so we should just avoid setting up serverReadyAction and manually open the browser ourselves.
if (!launchOptions.isApphost) {
debugConfiguration.serverReadyAction = determineServerReadyAction(baseProfile?.launchBrowser, baseProfile?.applicationUrl);
}

Expand Down
3 changes: 3 additions & 0 deletions extension/src/server/interactionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@ export class InteractionService implements IInteractionService {
// to show an information message.
const enableDashboardAutoLaunch = vscode.workspace.getConfiguration('aspire').get<boolean>('enableAspireDashboardAutoLaunch', true);
if (enableDashboardAutoLaunch) {
// Open the dashboard URL in an external browser. Prefer codespaces URL if available.
const urlToOpen = dashboardUrls.CodespacesUrlWithLoginToken ?? dashboardUrls.BaseUrlWithLoginToken;
vscode.env.openExternal(vscode.Uri.parse(urlToOpen));
return;
}

Expand Down