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
2 changes: 1 addition & 1 deletion 1pr-azure-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ parameters:
os: windows
emoji: 🪟
- name: NetCore-Public
demands: ImageOverride -equals 1es-ubuntu-2004-open
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
os: linux
emoji: 🐧
- name: Azure Pipelines
Expand Down
4 changes: 4 additions & 0 deletions pipeline-templates/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ jobs:
- script: test.cmd
displayName: 🔍 Test Windows
- ${{ if eq(parameters.pool.os, 'linux') }}:
- bash: |
sudo apt-get update
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
displayName: 📦 Install VS Code dependencies
- bash: |
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
echo ">>> Started xvfb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as vscode from 'vscode';
export class MockEnvironmentVariableCollection implements vscode.EnvironmentVariableCollection {

public persistent = true;
public description: string | vscode.MarkdownString | undefined = undefined;
public variables: {[variable: string]: string} = {};

public append(variable: string, value: string): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const standardTimeoutTime = 100000;
const mockVersion = '8.0.103';
const acquisitionContext = getMockAcquisitionContext('sdk', mockVersion);
const mockExecutor = new MockCommandExecutor(acquisitionContext, getMockUtilityContext());
const pair: DistroVersionPair = { distro: UBUNTU_DISTRO_INFO_KEY, version: '24.04' };
const pair: DistroVersionPair = { distro: UBUNTU_DISTRO_INFO_KEY, version: '22.04' };
const provider: GenericDistroSDKProvider = new GenericDistroSDKProvider(pair, acquisitionContext, getMockUtilityContext(), mockExecutor);
const shouldRun = os.platform() === 'linux';
const installType: DotnetInstallMode = 'sdk';
Expand Down
6 changes: 1 addition & 5 deletions vscode-dotnet-runtime-library/src/test/unit/TestUtility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,7 @@ export async function getLinuxSupportedDotnetSDKVersion(context: IAcquisitionWor
{
if (distroInfo.version < '22.04')
{
return '9.0.100';
}
if (distroInfo.version < '22.06')
{
return '9.0.100';
return '7.0.100';
}
if (distroInfo.version < '24.04')
{
Expand Down