Skip to content

Commit

Permalink
Bump version (microsoft#1950)
Browse files Browse the repository at this point in the history
* Bump version to 1.2.2-alpha since we expect a 1.2.1

* Prevent error reporting in a spot
  • Loading branch information
bwateratmsft authored May 12, 2020
1 parent f935601 commit bce1eba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vscode-docker",
"version": "1.2.0",
"version": "1.2.2-alpha",
"publisher": "ms-azuretools",
"displayName": "Docker",
"description": "Makes it easy to create, manage, and debug containerized applications.",
Expand Down
5 changes: 2 additions & 3 deletions src/debugging/netcore/NetCoreDebugHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class NetCoreDebugHelper implements DebugHelper {
public async resolveAttachDebugConfiguration(context: DockerDebugContext, debugConfiguration: DockerAttachConfiguration): Promise<ResolvedDebugConfiguration | undefined> {
// TODO: Validate the target container OS and fail debugging
// Get Container Name if missing
const containerName: string = debugConfiguration.containerName ?? await this.getContainerNameToAttach();
const containerName: string = debugConfiguration.containerName ?? await this.getContainerNameToAttach(context.actionContext);

let debuggerPath: string = debugConfiguration.netCore?.debuggerPath;

Expand Down Expand Up @@ -323,8 +323,7 @@ export class NetCoreDebugHelper implements DebugHelper {
return result === 'true';
}

private async getContainerNameToAttach(): Promise<string> {
const context: IActionContext = { telemetry: { properties: {}, measurements: {} }, errorHandling: { issueProperties: {} } };
private async getContainerNameToAttach(context: IActionContext): Promise<string> {
const containerItem: ContainerTreeItem = await ext.containersTree.showTreeItemPicker(ContainerTreeItem.runningContainerRegExp, {
...context,
noItemFoundErrorMessage: localize('vscode-docker.debug.netcore.noContainers', 'No running containers are available to attach.')
Expand Down

0 comments on commit bce1eba

Please sign in to comment.