Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to debian 11, install libLLDB 9 #16317

Merged
merged 1 commit into from
May 4, 2023
Merged

Switch to debian 11, install libLLDB 9 #16317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ stages:
_RuntimeIdentifier: ''
_BuildArchitecture: 'x64'
_TestArg: $(_NonWindowsTestArg)
Build_Debian_Stretch_Debug_x64:
Build_Debian_11_Debug_x64:
_BuildConfig: Debug
_DockerParameter: '--docker debian'
_LinuxPortable: ''
Expand Down
8 changes: 6 additions & 2 deletions eng/docker/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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

Expand Down
7 changes: 6 additions & 1 deletion test/SdkTests/SdkTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,12 @@
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"</TestArgs>
</PropertyGroup>

<Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('Linux')) ">
<!-- Add list of tests to skip on Linux -->
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml"</TestArgs>
</PropertyGroup>

<Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
</Target>
Expand Down
10 changes: 10 additions & 0 deletions test/SdkTests/TestsToSkipLinux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>