mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 22a8dee72e65f62b3f9b86cd580c5e75025f172c
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-10-18 08:35:03 +00:00
commit 8894b35d8d
73 changed files with 245 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
9ffa50bee09618535f852043e12554736b12a21c
5113df261771724626d259406c2e4e814422a777

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
7ac1a61c38d3ab88f8aebba9fbaae9c9a7cc6958
9e1aa8c37142558ac64bb9f2641b629d74063e18

1
llvm/Makefile.in
View File

@ -744,6 +744,7 @@ $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt |
-DLLVM_TOOLS_TO_BUILD="opt;llc;llvm-config;llvm-dis" \
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \
-DLLVM_ENABLE_ASSERTIONS=$(if $(INTERNAL_LLVM_ASSERTS),On,Off) \
-DHAVE_FUTIMENS=0 \
$(LLVM_CMAKE_ARGS) \
$(dir $<)

1
llvm/build.mk
View File

@ -54,6 +54,7 @@ $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt |
-DLLVM_TOOLS_TO_BUILD="opt;llc;llvm-config;llvm-dis" \
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \
-DLLVM_ENABLE_ASSERTIONS=$(if $(INTERNAL_LLVM_ASSERTS),On,Off) \
-DHAVE_FUTIMENS=0 \
$(LLVM_CMAKE_ARGS) \
$(dir $<)

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.147";
public const string MonoVersion = "5.18.0.151";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

8
mcs/build/tests.make
View File

@ -23,7 +23,7 @@ test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
test_nunit_lib = nunitlite.dll
xunit_core := xunit.core xunit.execution.dotnet xunit.abstractions xunit.assert Xunit.NetCore.Extensions
xunit_deps := netstandard System.Runtime
xunit_deps := System.Runtime
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs) $(topdir)/../mcs/class/test-helpers/PlatformDetection.cs
ifeq ($(USE_XTEST_REMOTE_EXECUTOR), YES)
@ -249,7 +249,7 @@ ifdef HAVE_CS_TESTS
$(test_lib_dir):
mkdir -p $@
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_dir)
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) | $(test_lib_dir)
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
test_response_preprocessed = $(test_response)_preprocessed
@ -325,10 +325,10 @@ run-xunit-test-lib: xunit-test-local
@rm -f $(test_lib_dir)/xunit.execution.dotnet.dll
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir)
$(TEST_COMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll $< -out:$@
$(xtest_lib_output): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(test_lib_dir) $(XTEST_REMOTE_EXECUTOR)
$(xtest_lib_output): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(XTEST_REMOTE_EXECUTOR) | $(test_lib_dir)
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
xtest_response_preprocessed = $(xtest_response)_preprocessed

1
mcs/class/Microsoft.CSharp/monotouch_Microsoft.CSharp_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs

1
mcs/class/Microsoft.CSharp/wasm_Microsoft.CSharp_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs

1
mcs/class/Mono.Data.Sqlite/monotouch_Mono.Data.Sqlite_test.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
Bug27864.cs

11
mcs/class/System.ComponentModel.Composition.4.5/monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1,11 @@
../../../external/corefx/src/System.ComponentModel.Composition/tests/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs

9
mcs/class/System.ComponentModel.Composition.4.5/monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1,9 @@
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs

9
mcs/class/System.ComponentModel.Composition.4.5/wasm_System.ComponentModel.Composition_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1,9 @@
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Diagnostics/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Factories/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Primitives/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/Integration/*.cs
../../../external/corefx/src/System.ComponentModel.Composition/tests/System/UnitTesting/*.cs

1
mcs/class/System.Core/monotouch_System.Core_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs

1
mcs/class/System.Core/wasm_System.Core_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs

6
mcs/class/System.Drawing/Makefile
View File

@ -17,7 +17,11 @@ ifndef MOBILE_PROFILE
LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS
endif
TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml
TEST_LIB_REFS = System.Drawing System.Xml
ifneq ($(PROFILE),wasm)
TEST_LIB_REFS += System.Runtime.Serialization.Formatters.Soap
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \
-nowarn:0618 -nowarn:219 -nowarn:169

7
mcs/class/System.Drawing/wasm_System.Drawing_test.dll.exclude.sources Normal file
View File

@ -0,0 +1,7 @@
System.Drawing/GDIPlusTest.cs
System.Drawing/TestBitmap.cs
System.Drawing/TestGraphics.cs
System.Drawing/TestIcon.cs
System.Drawing/TestIconConverter.cs
System.Drawing/TestImage.cs
System.Drawing/TestImageConverter.cs

8
mcs/class/System.Runtime.Serialization/Makefile
View File

@ -13,7 +13,13 @@ LIB_MCS_FLAGS = \
$(RESOURCE_FILES:%=/resource:%)
TXT_RESOURCE_STRINGS = ../referencesource/System.Runtime.Serialization/System.Runtime.Serialization.txt
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq System.Drawing Facades/System.Threading.Tasks
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Threading.Tasks
ifneq ($(PROFILE),monodroid)
ifneq ($(PROFILE),monotouch)
XTEST_LIB_REFS += System.Drawing
endif
endif
ifneq (2.1, $(FRAMEWORK_VERSION))
LIB_REFS += System.Data System.Configuration SMDiagnostics

1
mcs/class/System.Runtime.Serialization/monodroid_System.Runtime.Serialization_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs

1
mcs/class/System.Runtime.Serialization/monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs

1
mcs/class/System.Runtime.Serialization/wasm_System.Runtime.Serialization_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1 @@
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs

Some files were not shown because too many files have changed in this diff Show More