Skip to content

Commit ed3e239

Browse files
committed
Fix Linux Image
We need to migrate to the new Linux image in CI so we can run tests on Linux again. #2557 This PR initially had the changes but it should really be an isolated fix - was intending to put it there to improve PR merge velocity
1 parent 8214850 commit ed3e239

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

1pr-azure-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ parameters:
3131
os: windows
3232
emoji: 🪟
3333
- name: NetCore-Public
34-
demands: ImageOverride -equals 1es-ubuntu-2004-open
34+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
3535
os: linux
3636
emoji: 🐧
3737
- name: Azure Pipelines

pipeline-templates/build-test.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ jobs:
3232
- script: test.cmd
3333
displayName: 🔍 Test Windows
3434
- ${{ if eq(parameters.pool.os, 'linux') }}:
35+
- bash: |
36+
sudo apt-get update
37+
sudo apt-get install -y libgbm1 xvfb libnss3 libatk-bridge2.0-0 libatk1.0-0 libgtk-3-0 libgbm-dev libxkbcommon-x11-0 libdrm2 libx11-xcb1 libasound2
38+
displayName: 📦 Install VS Code dependencies
3539
- bash: |
3640
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
3741
echo ">>> Started xvfb"

vscode-dotnet-runtime-library/src/test/mocks/MockEnvironmentVariableCollection.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
77
export class MockEnvironmentVariableCollection implements vscode.EnvironmentVariableCollection {
88

99
public persistent = true;
10+
public description: string | vscode.MarkdownString | undefined = undefined;
1011
public variables: {[variable: string]: string} = {};
1112

1213
public append(variable: string, value: string): void {

vscode-dotnet-runtime-library/src/test/unit/LinuxDistroTests.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const standardTimeoutTime = 100000;
2121
const mockVersion = '8.0.103';
2222
const acquisitionContext = getMockAcquisitionContext('sdk', mockVersion);
2323
const mockExecutor = new MockCommandExecutor(acquisitionContext, getMockUtilityContext());
24-
const pair: DistroVersionPair = { distro: UBUNTU_DISTRO_INFO_KEY, version: '24.04' };
24+
const pair: DistroVersionPair = { distro: UBUNTU_DISTRO_INFO_KEY, version: '22.04' };
2525
const provider: GenericDistroSDKProvider = new GenericDistroSDKProvider(pair, acquisitionContext, getMockUtilityContext(), mockExecutor);
2626
const shouldRun = os.platform() === 'linux';
2727
const installType: DotnetInstallMode = 'sdk';

vscode-dotnet-runtime-library/src/test/unit/TestUtility.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,7 @@ export async function getLinuxSupportedDotnetSDKVersion(context: IAcquisitionWor
147147
{
148148
if (distroInfo.version < '22.04')
149149
{
150-
return '9.0.100';
151-
}
152-
if (distroInfo.version < '22.06')
153-
{
154-
return '9.0.100';
150+
return '7.0.100';
155151
}
156152
if (distroInfo.version < '24.04')
157153
{

0 commit comments

Comments
 (0)