Merge main into branch and resolve conflicts

- Merged latest changes from main branch
- Resolved merge conflict in DistributedApplicationPipelineTests.cs
- Kept both sets of tests: tagging/configuration tests and step filtering tests
- All 64 tests passing (60 original + 4 new from main)

Co-authored-by: captainsafia <1857993+captainsafia@users.noreply.github.com>

Author: Copilot

Aspire.slnx

@@ -106,6 +106,11 @@
     <File Path="playground/README.md" />
     <Project Path="playground/Playground.ServiceDefaults/Playground.ServiceDefaults.csproj" />
   </Folder>
+  <Folder Name="/playground/AspireWithJavaScript/">
+    <Project Path="playground/AspireWithJavaScript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj" />
+    <Project Path="playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj" />
+    <Project Path="playground/AspireWithJavaScript/AspireJavaScript.ServiceDefaults/AspireJavaScript.ServiceDefaults.csproj" />
+  </Folder>
   <Folder Name="/playground/AzureAIFoundryEndToEnd/">
     <Project Path="playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.AppHost/AzureAIFoundryEndToEnd.AppHost.csproj" />
     <Project Path="playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.WebStory/AzureAIFoundryEndToEnd.WebStory.csproj" />
@@ -176,8 +181,8 @@
     <Project Path="playground/deployers/Deployers.AppHost/Deployers.AppHost.csproj" />
   </Folder>
   <Folder Name="/playground/DevTunnels/">
-    <Project Path="playground/DevTunnels/DevTunnels.AppHost/DevTunnels.AppHost.csproj" />
     <Project Path="playground/DevTunnels/DevTunnels.ApiService/DevTunnels.ApiService.csproj" />
+    <Project Path="playground/DevTunnels/DevTunnels.AppHost/DevTunnels.AppHost.csproj" />
     <Project Path="playground/DevTunnels/DevTunnels.WebFrontEnd/DevTunnels.WebFrontEnd.csproj" />
   </Folder>
   <Folder Name="/playground/dockerfile/">
@@ -199,11 +204,6 @@
   <Folder Name="/playground/HealthChecks/">
     <Project Path="playground/HealthChecks/HealthChecksSandbox.AppHost/HealthChecksSandbox.AppHost.csproj" />
   </Folder>
-  <Folder Name="/playground/javascript/">
-    <Project Path="playground/AspireWithJavaScript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj" />
-    <Project Path="playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj" />
-    <Project Path="playground/AspireWithJavaScript/AspireJavaScript.ServiceDefaults/AspireJavaScript.ServiceDefaults.csproj" />
-  </Folder>
   <Folder Name="/playground/kafka/">
     <Project Path="playground/kafka/Consumer/Consumer.csproj" />
     <Project Path="playground/kafka/KafkaBasic.AppHost/KafkaBasic.AppHost.csproj" />
@@ -234,8 +234,8 @@
   </Folder>
   <Folder Name="/playground/node/">
     <Project Path="playground/AspireWithNode/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj" />
-    <Project Path="playground/AspireWithNode/AspireWithNode.ServiceDefaults/AspireWithNode.ServiceDefaults.csproj" />
     <Project Path="playground/AspireWithNode/AspireWithNode.AspNetCoreApi/AspireWithNode.AspNetCoreApi.csproj" />
+    <Project Path="playground/AspireWithNode/AspireWithNode.ServiceDefaults/AspireWithNode.ServiceDefaults.csproj" />
   </Folder>
   <Folder Name="/playground/OpenAIEndToEnd/">
     <Project Path="playground/OpenAIEndToEnd/OpenAIEndToEnd.AppHost/OpenAIEndToEnd.AppHost.csproj" />

extension/.vscode/launch.json

@@ -16,6 +16,21 @@
 				"${workspaceFolder}/dist/**/*.js"
 			],
 			"preLaunchTask": "${defaultBuildTask}"
+		},
+		{
+			"name": "Run Extension (cli stop on entry)",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
+			"preLaunchTask": "${defaultBuildTask}",
+			"env": {
+				"ASPIRE_CLI_STOP_ON_ENTRY": "true"
+			}
 		}
 	]
 }

extension/build.ps1

@@ -0,0 +1,69 @@
+#!/usr/bin/env pwsh
+
+$ErrorActionPreference = "Stop"
+
+Write-Host "Checking prerequisites..."
+
+# Check for Node.js
+if (-not (Get-Command node -ErrorAction SilentlyContinue)) {
+    Write-Error "Error: Node.js is not installed. Please install Node.js first."
+    exit 1
+}
+
+# Check for npm
+if (-not (Get-Command npm -ErrorAction SilentlyContinue)) {
+    Write-Error "Error: npm is not installed. Please install npm first."
+    exit 1
+}
+
+# Check for yarn
+if (-not (Get-Command yarn -ErrorAction SilentlyContinue)) {
+    Write-Error "Error: yarn is not installed. Please install yarn first."
+    Write-Host "You can install yarn by running: npm install -g yarn"
+    exit 1
+}
+
+# Check for VS Code
+if (-not (Get-Command code -ErrorAction SilentlyContinue)) {
+    Write-Error "Error: VS Code is not installed or 'code' command is not in PATH."
+    Write-Host "Please install VS Code and ensure it's added to your PATH."
+    exit 1
+}
+
+# Check for dotnet
+if (-not (Get-Command dotnet -ErrorAction SilentlyContinue)) {
+    Write-Error "Error: .NET SDK is not installed. Please install .NET SDK first."
+    Write-Host "Use the restore script at the repo root."
+    exit 1
+}
+
+Write-Host "All prerequisites satisfied."
+Write-Host ""
+Write-Host "Running yarn install..."
+yarn install
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "yarn install failed with exit code $LASTEXITCODE"
+    exit $LASTEXITCODE
+}
+
+Write-Host ""
+Write-Host "Running yarn compile..."
+yarn compile
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "yarn compile failed with exit code $LASTEXITCODE"
+    exit $LASTEXITCODE
+}
+
+Write-Host ""
+Write-Host "Building Aspire CLI..."
+dotnet build ../src/Aspire.Cli/Aspire.Cli.csproj
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "dotnet build failed with exit code $LASTEXITCODE"
+    exit $LASTEXITCODE
+}
+
+Write-Host ""
+Write-Host "Build completed successfully!"

extension/build.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+set -e
+
+echo "Checking prerequisites..."
+
+# Check for Node.js
+if ! command -v node &> /dev/null; then
+    echo "Error: Node.js is not installed. Please install Node.js first."
+    exit 1
+fi
+
+# Check for npm
+if ! command -v npm &> /dev/null; then
+    echo "Error: npm is not installed. Please install npm first."
+    exit 1
+fi
+
+# Check for yarn
+if ! command -v yarn &> /dev/null; then
+    echo "Error: yarn is not installed. Please install yarn first."
+    echo "You can install yarn by running: npm install -g yarn"
+    exit 1
+fi
+
+# Check for VS Code
+if ! command -v code &> /dev/null; then
+    echo "Error: VS Code is not installed or 'code' command is not in PATH."
+    echo "Please install VS Code and ensure it's added to your PATH."
+    exit 1
+fi
+
+# Check for dotnet
+if ! command -v dotnet &> /dev/null; then
+    echo "Error: .NET SDK is not installed. Please install .NET SDK first."
+    echo "Use the restore script at the repo root."
+    exit 1
+fi
+
+echo "All prerequisites satisfied."
+echo ""
+echo "Running yarn install..."
+yarn install
+
+echo ""
+echo "Running yarn compile..."
+yarn compile
+
+echo ""
+echo "Building Aspire CLI..."
+dotnet build ../src/Aspire.Cli/Aspire.Cli.csproj
+
+echo ""
+echo "Build completed successfully!"

extension/loc/xlf/aspire-vscode.xlf

@@ -3,7 +3,7 @@
   "displayName": "Aspire",
   "description": "%extension.description%",
   "publisher": "microsoft-aspire",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "icon": "dotnet-aspire-logo-128.png",
   "license": "SEE LICENSE IN LICENSE.TXT",
@@ -182,6 +182,18 @@
           "default": true,
           "description": "%configuration.aspire.enableSettingsFileCreationPromptOnStartup%",
           "scope": "window"
+        },
+        "aspire.aspireCliExecutablePath": {
+          "type": "string",
+          "default": "",
+          "description": "%configuration.aspire.aspireCliExecutablePath%",
+          "scope": "machine-overridable"
+        },
+        "aspire.enableAspireCliDebugLogging": {
+          "type": "boolean",
+          "default": false,
+          "description": "%configuration.aspire.enableAspireCliDebugLogging%",
+          "scope": "window"
         }
       }
     }

extension/package.json

@@ -15,6 +15,8 @@
 	"command.deploy": "Deploy app",
 	"command.configureLaunchJson": "Configure launch.json file",
   "configuration.aspire.enableSettingsFileCreationPromptOnStartup": "Enable apphost discovery on extension activation and prompt to setup .aspire/settings.json.appHostPath if it does not exist in the workspace.",
+  "configuration.aspire.aspireCliExecutablePath": "The path to the Aspire CLI executable. If not set, the extension will attempt to use 'aspire' from the system PATH.",
+  "configuration.aspire.enableAspireCliDebugLogging": "Enable console debug logging for Aspire CLI commands executed by the extension.",
   "command.runAppHost": "Run Aspire apphost",
 	"command.debugAppHost": "Debug Aspire apphost",
 	"aspire-vscode.strings.noCsprojFound": "No apphost found in the current workspace.",

extension/package.nls.json

@@ -6,5 +6,5 @@ export async function addCommand(terminalProvider: AspireTerminalProvider) {
         return;
     }
 
-    terminalProvider.sendToAspireTerminal("aspire add");
+    terminalProvider.sendAspireCommandToAspireTerminal('add');
 }

extension/src/commands/add.ts

@@ -6,5 +6,5 @@ export async function configCommand(terminalProvider: AspireTerminalProvider) {
         return;
     }
 
-    terminalProvider.sendToAspireTerminal("aspire config");
+    terminalProvider.sendAspireCommandToAspireTerminal('config');
 }

extension/src/commands/config.ts

@@ -6,5 +6,5 @@ export async function deployCommand(terminalProvider: AspireTerminalProvider) {
         return;
     }
 
-    terminalProvider.sendToAspireTerminal("aspire deploy");
+    terminalProvider.sendAspireCommandToAspireTerminal('deploy');
 }