Skip to content

Commit 47ecd45

Browse files
TyriarTyriar
authored
Merge branch 'master' into tyriar/welcome
2 parents a5682a5 + 2f88d58 commit 47ecd45

152 files changed

Lines changed: 3318 additions & 1969 deletions

File tree

Some content is hidden

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

‎.github/workflows/rich-navigation.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ jobs:
1010
runs-on: windows-latest
1111
steps:
1212
- uses: actions/checkout@v2
13-
- name: Use Node.js
14-
uses: actions/setup-node@v1
1513
- name: Install dependencies
1614
run: yarn --frozen-lockfile
1715
env:
1816
CHILD_CONCURRENCY: 1
19-
- name: Install .NET Core 2.2
20-
uses: actions/setup-dotnet@v1.5.0
21-
with:
22-
dotnet-version: 2.2
2317
- uses: microsoft/RichCodeNavIndexer@v0.1
2418
with:
2519
languages: typescript

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "9.2.0"
2+
target "9.2.1"
33
runtime "electron"

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "0c2cb59b6283fe8d6bb4b14f8a832e2166aeaa0c"
63+
"commitHash": "03c7a54dc534ce1867d4393b9b1a6989d4a7e005"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "9.2.0"
68+
"version": "9.2.1"
6969
},
7070
{
7171
"component": {

‎extensions/github-authentication/package.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111
"categories": [
1212
"Other"
1313
],
14+
"extensionKind": [
15+
"ui",
16+
"workspace",
17+
"web"
18+
],
1419
"activationEvents": [
15-
"*",
1620
"onAuthenticationRequest:github"
1721
],
1822
"contributes": {
@@ -29,7 +33,13 @@
2933
"when": "false"
3034
}
3135
]
32-
}
36+
},
37+
"authentication": [
38+
{
39+
"label": "GitHub",
40+
"id": "github"
41+
}
42+
]
3343
},
3444
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
3545
"main": "./out/extension.js",

‎extensions/microsoft-authentication/package.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,21 @@
1212
],
1313
"enableProposedApi": true,
1414
"activationEvents": [
15-
"*",
1615
"onAuthenticationRequest:microsoft"
1716
],
1817
"extensionKind": [
1918
"ui",
2019
"workspace",
2120
"web"
2221
],
22+
"contributes": {
23+
"authentication": [
24+
{
25+
"label": "Microsoft",
26+
"id": "microsoft"
27+
}
28+
]
29+
},
2330
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
2431
"main": "./out/extension.js",
2532
"browser": "./dist/browser/extension.js",

‎extensions/microsoft-authentication/src/AADHelper.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import * as randomBytes from 'randombytes';
77
import * as querystring from 'querystring';
8+
import { Buffer } from 'buffer';
89
import * as vscode from 'vscode';
910
import { createServer, startServer } from './authServer';
1011

‎extensions/npm/src/npmView.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { JSONVisitor, visit } from 'jsonc-parser';
77
import * as path from 'path';
88
import {
99
commands, Event, EventEmitter, ExtensionContext,
10-
Selection, Task2 as Task,
10+
Selection, Task,
1111
TaskGroup, tasks, TextDocument, ThemeIcon, TreeDataProvider, TreeItem, TreeItemCollapsibleState, Uri,
1212
window, workspace, WorkspaceFolder
1313
} from 'vscode';

‎extensions/npm/src/tasks.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import {
7-
TaskDefinition, Task2 as Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace,
7+
TaskDefinition, Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri, workspace,
88
DebugConfiguration, debug, TaskProvider, TextDocument, tasks, TaskScope, QuickPickItem
99
} from 'vscode';
1010
import * as path from 'path';

‎extensions/typescript-language-features/src/task/taskProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class TscTaskProvider implements vscode.TaskProvider {
203203
}
204204

205205
private getBuildTask(workspaceFolder: vscode.WorkspaceFolder | undefined, label: string, command: string, args: string[], buildTaskidentifier: TypeScriptTaskDefinition): vscode.Task {
206-
const buildTask = new vscode.Task2(
206+
const buildTask = new vscode.Task(
207207
buildTaskidentifier,
208208
workspaceFolder || vscode.TaskScope.Workspace,
209209
localize('buildTscLabel', 'build - {0}', label),

‎extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as assert from 'assert';
7-
import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, Task2, env, UIKind, ShellExecution, TaskExecution, Terminal, Event } from 'vscode';
7+
import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomExecution, Pseudoterminal, TaskScope, commands, env, UIKind, ShellExecution, TaskExecution, Terminal, Event } from 'vscode';
88

99
// Disable tasks tests:
1010
// - Web https://github.com/microsoft/vscode/issues/90528
@@ -94,7 +94,7 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
9494
};
9595
return Promise.resolve(pty);
9696
});
97-
const task = new Task2(kind, TaskScope.Workspace, taskName, taskType, execution);
97+
const task = new Task(kind, TaskScope.Workspace, taskName, taskType, execution);
9898
result.push(task);
9999
return result;
100100
},
@@ -151,7 +151,7 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
151151
};
152152
return Promise.resolve(pty);
153153
});
154-
const task = new Task2(kind, TaskScope.Workspace, taskName, taskType, execution);
154+
const task = new Task(kind, TaskScope.Workspace, taskName, taskType, execution);
155155
result.push(task);
156156
return result;
157157
},

0 commit comments

Comments
 (0)