diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index eb2acb8c9..9629e3ada 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -174,7 +174,7 @@ stages:
_RuntimeIdentifier: ''
_BuildArchitecture: 'x64'
_TestArg: $(_NonWindowsTestArg)
- Build_Debian_Stretch_Debug_x64:
+ Build_Debian_11_Debug_x64:
_BuildConfig: Debug
_DockerParameter: '--docker debian'
_LinuxPortable: ''
diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile
index ebafe9adb..e448844a4 100644
--- a/eng/docker/debian/Dockerfile
+++ b/eng/docker/debian/Dockerfile
@@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
# Install the deb packaging toolchain we need to build debs
RUN apt-get update \
@@ -17,7 +17,7 @@ RUN apt-get update \
# liblldb is needed so deb package build does not throw missing library info errors
RUN apt-get update \
- && apt-get -y install liblldb-3.9 \
+ && apt-get -y install liblldb-9 \
&& rm -rf /var/lib/apt/lists/*
# Misc Dependencies for build
@@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
sudo && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update \
+ && apt-get -y install python-is-python2 \
+ && rm -rf /var/lib/apt/lists/*
RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 9fb5965a4..bb7e250aa 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -225,6 +225,11 @@
$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"
+
+
+ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml"
+
+
$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml"
diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml
new file mode 100644
index 000000000..b2bfd698a
--- /dev/null
+++ b/test/SdkTests/TestsToSkipLinux.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+