Skip to content

Commit 7a6fd89

Browse files
captainsafiacaptainsafia
committed
Revert "Merge main into branch and resolve conflicts"
This reverts commit ce6b7d9.
1 parent 58fd06e commit 7a6fd89

File tree

88 files changed

+1500
-2688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1500
-2688
lines changed

‎Aspire.slnx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,6 @@
106106
<File Path="playground/README.md" />
107107
<Project Path="playground/Playground.ServiceDefaults/Playground.ServiceDefaults.csproj" />
108108
</Folder>
109-
<Folder Name="/playground/AspireWithJavaScript/">
110-
<Project Path="playground/AspireWithJavaScript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj" />
111-
<Project Path="playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj" />
112-
<Project Path="playground/AspireWithJavaScript/AspireJavaScript.ServiceDefaults/AspireJavaScript.ServiceDefaults.csproj" />
113-
</Folder>
114109
<Folder Name="/playground/AzureAIFoundryEndToEnd/">
115110
<Project Path="playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.AppHost/AzureAIFoundryEndToEnd.AppHost.csproj" />
116111
<Project Path="playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.WebStory/AzureAIFoundryEndToEnd.WebStory.csproj" />
@@ -181,8 +176,8 @@
181176
<Project Path="playground/deployers/Deployers.AppHost/Deployers.AppHost.csproj" />
182177
</Folder>
183178
<Folder Name="/playground/DevTunnels/">
184-
<Project Path="playground/DevTunnels/DevTunnels.ApiService/DevTunnels.ApiService.csproj" />
185179
<Project Path="playground/DevTunnels/DevTunnels.AppHost/DevTunnels.AppHost.csproj" />
180+
<Project Path="playground/DevTunnels/DevTunnels.ApiService/DevTunnels.ApiService.csproj" />
186181
<Project Path="playground/DevTunnels/DevTunnels.WebFrontEnd/DevTunnels.WebFrontEnd.csproj" />
187182
</Folder>
188183
<Folder Name="/playground/dockerfile/">
@@ -204,6 +199,11 @@
204199
<Folder Name="/playground/HealthChecks/">
205200
<Project Path="playground/HealthChecks/HealthChecksSandbox.AppHost/HealthChecksSandbox.AppHost.csproj" />
206201
</Folder>
202+
<Folder Name="/playground/javascript/">
203+
<Project Path="playground/AspireWithJavaScript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj" />
204+
<Project Path="playground/AspireWithJavaScript/AspireJavaScript.MinimalApi/AspireJavaScript.MinimalApi.csproj" />
205+
<Project Path="playground/AspireWithJavaScript/AspireJavaScript.ServiceDefaults/AspireJavaScript.ServiceDefaults.csproj" />
206+
</Folder>
207207
<Folder Name="/playground/kafka/">
208208
<Project Path="playground/kafka/Consumer/Consumer.csproj" />
209209
<Project Path="playground/kafka/KafkaBasic.AppHost/KafkaBasic.AppHost.csproj" />
@@ -234,8 +234,8 @@
234234
</Folder>
235235
<Folder Name="/playground/node/">
236236
<Project Path="playground/AspireWithNode/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj" />
237-
<Project Path="playground/AspireWithNode/AspireWithNode.AspNetCoreApi/AspireWithNode.AspNetCoreApi.csproj" />
238237
<Project Path="playground/AspireWithNode/AspireWithNode.ServiceDefaults/AspireWithNode.ServiceDefaults.csproj" />
238+
<Project Path="playground/AspireWithNode/AspireWithNode.AspNetCoreApi/AspireWithNode.AspNetCoreApi.csproj" />
239239
</Folder>
240240
<Folder Name="/playground/OpenAIEndToEnd/">
241241
<Project Path="playground/OpenAIEndToEnd/OpenAIEndToEnd.AppHost/OpenAIEndToEnd.AppHost.csproj" />

‎extension/.vscode/launch.json‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@
1616
"${workspaceFolder}/dist/**/*.js"
1717
],
1818
"preLaunchTask": "${defaultBuildTask}"
19-
},
20-
{
21-
"name": "Run Extension (cli stop on entry)",
22-
"type": "extensionHost",
23-
"request": "launch",
24-
"args": [
25-
"--extensionDevelopmentPath=${workspaceFolder}"
26-
],
27-
"outFiles": [
28-
"${workspaceFolder}/dist/**/*.js"
29-
],
30-
"preLaunchTask": "${defaultBuildTask}",
31-
"env": {
32-
"ASPIRE_CLI_STOP_ON_ENTRY": "true"
33-
}
3419
}
3520
]
3621
}

‎extension/build.ps1‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎extension/build.sh‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎extension/loc/xlf/aspire-vscode.xlf‎

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/package.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Aspire",
44
"description": "%extension.description%",
55
"publisher": "microsoft-aspire",
6-
"version": "0.4.1",
6+
"version": "0.4.0",
77
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
88
"icon": "dotnet-aspire-logo-128.png",
99
"license": "SEE LICENSE IN LICENSE.TXT",
@@ -182,18 +182,6 @@
182182
"default": true,
183183
"description": "%configuration.aspire.enableSettingsFileCreationPromptOnStartup%",
184184
"scope": "window"
185-
},
186-
"aspire.aspireCliExecutablePath": {
187-
"type": "string",
188-
"default": "",
189-
"description": "%configuration.aspire.aspireCliExecutablePath%",
190-
"scope": "machine-overridable"
191-
},
192-
"aspire.enableAspireCliDebugLogging": {
193-
"type": "boolean",
194-
"default": false,
195-
"description": "%configuration.aspire.enableAspireCliDebugLogging%",
196-
"scope": "window"
197185
}
198186
}
199187
}

‎extension/package.nls.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
"command.deploy": "Deploy app",
1616
"command.configureLaunchJson": "Configure launch.json file",
1717
"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.",
18-
"configuration.aspire.aspireCliExecutablePath": "The path to the Aspire CLI executable. If not set, the extension will attempt to use 'aspire' from the system PATH.",
19-
"configuration.aspire.enableAspireCliDebugLogging": "Enable console debug logging for Aspire CLI commands executed by the extension.",
2018
"command.runAppHost": "Run Aspire apphost",
2119
"command.debugAppHost": "Debug Aspire apphost",
2220
"aspire-vscode.strings.noCsprojFound": "No apphost found in the current workspace.",

‎extension/src/commands/add.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export async function addCommand(terminalProvider: AspireTerminalProvider) {
66
return;
77
}
88

9-
terminalProvider.sendAspireCommandToAspireTerminal('add');
9+
terminalProvider.sendToAspireTerminal("aspire add");
1010
}

‎extension/src/commands/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export async function configCommand(terminalProvider: AspireTerminalProvider) {
66
return;
77
}
88

9-
terminalProvider.sendAspireCommandToAspireTerminal('config');
9+
terminalProvider.sendToAspireTerminal("aspire config");
1010
}

‎extension/src/commands/deploy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export async function deployCommand(terminalProvider: AspireTerminalProvider) {
66
return;
77
}
88

9-
terminalProvider.sendAspireCommandToAspireTerminal('deploy');
9+
terminalProvider.sendToAspireTerminal("aspire deploy");
1010
}

0 commit comments

Comments
 (0)