From 4f225ff36dbf4558a3d5bd88a65c53cef123528a Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Mon, 30 Nov 2020 13:46:27 -0500 Subject: [PATCH 1/2] Change default branch name to main --- README.md | 2 +- package.json | 2 +- src/tasks/python/PythonExtensionHelper.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 71866d4ed8..62fa6b40e4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Docker for Visual Studio Code [![Version](https://vsmarketplacebadge.apphb.com/version/ms-azuretools.vscode-docker.svg)](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) [![Installs](https://vsmarketplacebadge.apphb.com/installs-short/ms-azuretools.vscode-docker.svg)](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) [![Build Status](https://dev.azure.com/ms-azuretools/AzCode/_apis/build/status/Nightly/vscode-docker-nightly-2?branchName=master)](https://dev.azure.com/ms-azuretools/AzCode/_build/latest?definitionId=22&branchName=master) +## Docker for Visual Studio Code [![Version](https://vsmarketplacebadge.apphb.com/version/ms-azuretools.vscode-docker.svg)](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) [![Installs](https://vsmarketplacebadge.apphb.com/installs-short/ms-azuretools.vscode-docker.svg)](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) [![Build Status](https://dev.azure.com/ms-azuretools/AzCode/_apis/build/status/Nightly/vscode-docker-nightly-2?branchName=main)](https://dev.azure.com/ms-azuretools/AzCode/_build/latest?definitionId=22&branchName=main) The Docker extension makes it easy to build, manage, and deploy containerized applications from Visual Studio Code. It also provides one-click debugging of Node.js, Python, and .NET Core inside a container. diff --git a/package.json b/package.json index 4a0ec5560c..fb8c058d60 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "type": "git", "url": "https://github.com/microsoft/vscode-docker" }, - "homepage": "https://github.com/Microsoft/vscode-docker/blob/master/README.md", + "homepage": "https://github.com/Microsoft/vscode-docker/blob/main/README.md", "activationEvents": [ "onCommand:vscode-docker.compose.down", "onCommand:vscode-docker.compose.restart", diff --git a/src/tasks/python/PythonExtensionHelper.ts b/src/tasks/python/PythonExtensionHelper.ts index a3731289b4..e2c330320a 100644 --- a/src/tasks/python/PythonExtensionHelper.ts +++ b/src/tasks/python/PythonExtensionHelper.ts @@ -9,7 +9,7 @@ import * as semver from 'semver'; import * as vscode from "vscode"; import { localize } from '../../localize'; -// Adapted from https://github.com/microsoft/vscode-python/blob/master/src/client/api.ts +// Adapted from https://github.com/microsoft/vscode-python/blob/main/src/client/api.ts interface PythonExtensionAPI { debug: { getDebuggerPackagePath(): Promise; From 75c790a8d1fe3297663989019f360f5fa28e5fa4 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:30:29 -0500 Subject: [PATCH 2/2] Fix totally random issue --- src/tree/registries/ConnectedRegistriesTreeItem.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tree/registries/ConnectedRegistriesTreeItem.ts b/src/tree/registries/ConnectedRegistriesTreeItem.ts index 157e909618..38e3789e8e 100644 --- a/src/tree/registries/ConnectedRegistriesTreeItem.ts +++ b/src/tree/registries/ConnectedRegistriesTreeItem.ts @@ -15,7 +15,7 @@ export class ConnectedRegistriesTreeItem extends AzExtParentTreeItem { public constructor(parent: AzExtParentTreeItem | undefined) { super(parent); - this.iconPath = getThemedIconPath('ConnectPlugged'); + this.iconPath = getThemedIconPath('connectPlugged'); } public async loadMoreChildrenImpl(_clearCache: boolean, _context: IActionContext): Promise {