Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In readme / etc., rename primary branch to main #2534

Merged
merged 3 commits into from
Dec 3, 2020
Merged

In readme / etc., rename primary branch to main #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f225ff
Change default branch name to main
bwateratmsft Nov 30, 2020
62c4a45
Merge branch 'master' into bmw/main
bwateratmsft Dec 1, 2020
75c790a
Fix totally random issue
bwateratmsft Dec 1, 2020
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/python/PythonExtensionHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string | undefined>;
Expand Down
2 changes: 1 addition & 1 deletion src/tree/registries/ConnectedRegistriesTreeItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<AzExtTreeItem[]> {
Expand Down