[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#16306)

.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: ''

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
 

test/SdkTests/SdkTests.csproj

@@ -225,6 +225,11 @@
       <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"</TestArgs>
     </PropertyGroup>
 
+    <PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('Linux')) ">
+      <!-- Add list of tests to skip on Linux -->
+      <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml"</TestArgs>
+    </PropertyGroup>
+
     <PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('OSX')) ">
       <!-- Add list of tests to skip on Linux Portable -->
       <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml"</TestArgs>

test/SdkTests/TestsToSkipLinux.xml

@@ -0,0 +1,10 @@
+<Tests>
+  <SkippedTests>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run"
+            Skip="true"
+            Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output"
+            Skip="true"
+            Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
+  </SkippedTests>
+</Tests>