Merge branch 'release/7.0.3xx' into release/7.0.4xx
This commit is contained in:
commit
187d7c1de4
5 changed files with 27 additions and 6 deletions
|
@ -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: ''
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -11,10 +11,12 @@ resources:
|
|||
- release/*
|
||||
- internal/release/*
|
||||
exclude:
|
||||
- release/6.0.3xx
|
||||
- internal/release/6.0.3xx
|
||||
- release/6.0.4xx
|
||||
- internal/release/6.0.4xx
|
||||
- release/7.0.2xx
|
||||
- internal/release/7.0.2xx
|
||||
- release/7.0.3xx
|
||||
- internal/release/7.0.3xx
|
||||
- release/7.0.4xx
|
||||
- internal/release/7.0.4xx
|
||||
stages:
|
||||
- build
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
10
test/SdkTests/TestsToSkipLinux.xml
Normal file
10
test/SdkTests/TestsToSkipLinux.xml
Normal file
|
@ -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>
|
Loading…
Reference in a new issue