Skip to content

Commit 006e917

Browse files
authored
Merge pull request #5798 from dibarbet/enable_ci
Set pools for CI build
2 parents f7b1b18 + a7dc750 commit 006e917

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

azure-pipelines.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ stages:
2424
- template: azure-pipelines/build.yml
2525
parameters:
2626
prereleaseFlag: $(prereleaseFlag)
27+
pool:
28+
name: NetCore-Public
29+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
2730

2831
- stage: Test
2932
displayName: Test
@@ -33,9 +36,10 @@ stages:
3336
strategy:
3437
matrix:
3538
linux:
36-
vmImage: ubuntu-latest
39+
demandsName: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
3740
pool:
38-
vmImage: $(vmImage)
41+
name: NetCore-Public
42+
demands: $(demandsName)
3943
steps:
4044
- template: azure-pipelines/test.yml
4145

azure-pipelines/prereqs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ steps:
99
versionSpec: '16.x'
1010

1111
- task: UseDotNet@2
12+
displayName: 'Install .NET Core SDKs'
13+
inputs:
14+
version: '7.0.100'
1215

1316
# Set the CI build number to the VSIX version we're creating from this build.
1417
- script: |
1518
dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv
1619
$(Agent.BuildDirectory)/nbgv cloud
20+
displayName: Install nbgv
1721

1822
- script: |
1923
npm ci

azure-pipelines/test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ steps:
77

88
- template: prereqs.yml
99

10-
- task: UseDotNet@2
11-
displayName: 'Install .NET Core SDKs'
12-
inputs:
13-
version: '7.0.100'
14-
1510
- pwsh: |
1611
if ($IsLinux) {
1712
Write-Host "Activating screen emulation"

tasks/vsceTasks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export async function createPackageAsync(outputFolder: string, prerelease: boole
4848
vsceArgs.push("--pre-release");
4949
}
5050

51-
vsceArgs.push('--baseContentUrl', 'https://devdiv.visualstudio.com/DevDiv/_git/vscode-csharp-next?path=/');
51+
vsceArgs.push('--baseContentUrl', 'https://github.com/dotnet/vscode-csharp');
5252

5353
const spawnResult = await spawnNode(vsceArgs);
5454
if (spawnResult.code != 0) {

0 commit comments

Comments
 (0)