Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,10 @@ stages:
# Prefer the dotnet from the container.
installDotNet: false
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
containerName: mcr.microsoft.com/dotnet/sdk:8.0-noble
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-net8.0-vscode-csharp-amd64
Comment thread
dibarbet marked this conversation as resolved.
Comment thread
dibarbet marked this conversation as resolved.

- stage:
displayName: Test Linux (.NET 9)
Expand All @@ -104,11 +103,10 @@ stages:
# Prefer the dotnet from the container.
installDotNet: false
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
containerName: mcr.microsoft.com/dotnet/sdk:9.0-noble
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-net9.0-vscode-csharp-amd64

- stage:
displayName: Test Linux (.NET 10)
Expand All @@ -120,11 +118,10 @@ stages:
# Prefer the dotnet from the container.
installDotNet: false
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
containerName: mcr.microsoft.com/dotnet/sdk:10.0-noble
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-net10.0-vscode-csharp-amd64

- stage:
displayName: Test Linux (.NET 11)
Expand All @@ -136,11 +133,10 @@ stages:
# Prefer the dotnet from the container.
installDotNet: false
testVSCodeVersion: $(testVSCodeVersion)
installAdditionalLinuxDependencies: true
pool:
name: NetCore-Public
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
containerName: mcr.microsoft.com/dotnet/sdk:11.0-preview
containerName: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-net11.0-vscode-csharp-amd64

- stage: Test_Windows_Stage
displayName: Test Windows
Expand Down
19 changes: 0 additions & 19 deletions azure-pipelines/test-linux-docker-prereqs.yml

This file was deleted.

4 changes: 0 additions & 4 deletions azure-pipelines/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ parameters:
default: ''
- name: installDotNet
type: boolean
- name: installAdditionalLinuxDependencies
type: boolean
default: false
- name: testVSCodeVersion
type: string

Expand Down Expand Up @@ -40,7 +37,6 @@ jobs:
- template: /azure-pipelines/test.yml@self
parameters:
installDotNet: ${{ parameters.installDotNet }}
installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
npmCommand: $(npmCommand)
testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
isIntegration: $(isIntegration)
8 changes: 0 additions & 8 deletions azure-pipelines/test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
parameters:
- name: installDotNet
type: boolean
- name: installAdditionalLinuxDependencies
type: boolean
default: false
- name: npmCommand
type: string
- name: testVSCodeVersion
Expand All @@ -22,12 +19,7 @@ steps:
parameters:
installDotNet: ${{ parameters.installDotNet }}

- ${{ if eq(parameters.installAdditionalLinuxDependencies, true) }}:
- template: test-linux-docker-prereqs.yml

- template: test-prereqs.yml
parameters:
installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}

- script: npm run ${{ parameters.npmCommand }}
displayName: 🧪 Run $(Agent.JobName)
Expand Down
Loading