[netcore] Fix CI build script (mono/mono#15130)

Commit migrated from https://github.com/mono/mono/commit/26f022228439ac05644c6aaa46ab6ca635a55679

diff --git a/src/mono/netcore/CoreFX.issues.rsp b/src/mono/netcore/CoreFX.issues.rsp
index 43a0e4c..e3b111b 100644 (file)
--- a/src/mono/netcore/CoreFX.issues.rsp
+++ b/src/mono/netcore/CoreFX.issues.rsp
@@ -142,6 +142,7 @@
 -nomethod System.Linq.Expressions.Tests.ConvertTests.ConvertNullableFloatToNullableUIntTest
 -nomethod System.Linq.Expressions.Tests.ConvertTests.ConvertFloatToNullableUIntTest
 -noclass System.Linq.Expressions.Tests.LambdaTests
+-noclass System.Linq.Expressions.Tests.LambdaDivideNullableTests
 -nomethod System.Linq.Expressions.Tests.BinaryCoalesceTests.VerifyIL_NullableIntCoalesceToNullableInt
 -nomethod System.Linq.Expressions.Tests.ConvertCheckedTests.ConvertCheckedDoubleToULongTest
 -nomethod System.Linq.Expressions.Tests.ConvertCheckedTests.ConvertCheckedDoubleToNullableULongTest

diff --git a/src/mono/netcore/CoreFX.issues_linux.rsp b/src/mono/netcore/CoreFX.issues_linux.rsp
index f3578cf..e20a78d 100644 (file)
--- a/src/mono/netcore/CoreFX.issues_linux.rsp
+++ b/src/mono/netcore/CoreFX.issues_linux.rsp
@@ -9,6 +9,7 @@
 
 # hangs 
 -nomethod *.HttpClientUsesSslCertEnvironmentVariables
+-nomethod System.Threading.Tasks.Dataflow.Tests.DataflowBlockExtensionsTests.*
 
 # dllmap is not working 
 -nonamespace System.IO.MemoryMappedFiles

diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile
index 6a0800a..fd43bb4 100644 (file)
--- a/src/mono/netcore/Makefile
+++ b/src/mono/netcore/Makefile
@@ -82,7 +82,7 @@ update-roslyn: roslyn-restore.csproj
 
 run-sample: prepare
        $(DOTNET) build sample/HelloWorld
-       MONO_ENV_OPTIONS="--debug" COMPlus_DebugWriteToStdErr=1 ./dotnet --fx-version "$(NETCOREAPP_VERSION)" sample/HelloWorld/bin/Debug/netcoreapp3.0/HelloWorld.dll
+       MONO_ENV_OPTIONS="--debug" COMPlus_DebugWriteToStdErr=1 ./dotnet --fx-version "$(NETCOREAPP_VERSION)" sample/HelloWorld/bin/netcoreapp3.0/HelloWorld.dll
 
 run-aspnet-sample: prepare
        rm -rf sample/AspNetCore/{bin,obj}
@@ -143,11 +143,10 @@ corefx/.stamp-dl-corefx-tests-$(NETCORETESTS_VERSION):
 # Running individual test: MONO_ENV_OPTIONS="--debug" make run-tests-corefx-System.Collections.Tests
 #
 
-# these tests won't be included in `run-tests-corefx-all`
-EXCLUDED_COREFX_TESTS :=
-
-run-tests-corefx: $(foreach workingtest, $(foreach test, $(wildcard corefx/tests/extracted/*), \
-               $(filter-out $(EXCLUDED_COREFX_TESTS), $(notdir $(test)))), $(addprefix run-tests-corefx-, $(workingtest)))
+run-tests-corefx: update-tests-corefx
+       for testdir in corefx/tests/extracted/*; do \
+               $(MAKE) run-tests-corefx-$$(basename $${testdir}); \
+       done
 
 run-tests-corefx-%: prepare update-tests-corefx
        echo -n "***************** $* *********************"

diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index 81a6be3..33f069a 100644 (file)
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -15,6 +15,7 @@
     <DebugSymbols>true</DebugSymbols>
 
     <Configurations>Debug;Release;Checked</Configurations>
+    <Configuration>Release</Configuration>
     <Platforms>x64;x86;arm;arm64</Platforms>
   </PropertyGroup>
 

diff --git a/src/mono/netcore/build.sh b/src/mono/netcore/build.sh
index 712c305..3d847af 100755 (executable)
--- a/src/mono/netcore/build.sh
+++ b/src/mono/netcore/build.sh
@@ -90,6 +90,7 @@ if [[ "$force_rebuild" == "true" || ! -f .configured ]]; then
   cd ..
   ./autogen.sh --with-core=only
   make -j$CPU_COUNT
+  cd netcore
   touch .configured
 fi
 

diff --git a/src/mono/netcore/sample/HelloWorld/HelloWorld.csproj b/src/mono/netcore/sample/HelloWorld/HelloWorld.csproj
index 958d2f1..e90d90a 100644 (file)
--- a/src/mono/netcore/sample/HelloWorld/HelloWorld.csproj
+++ b/src/mono/netcore/sample/HelloWorld/HelloWorld.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <OutputPath>bin</OutputPath>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>