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

Imported Upstream version 6.4.0.137

Browse Source 
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
static partial class Consts
{
public const string MonoCorlibVersion = "d0aa6798-834d-11e9-b38a-3b0d70487d01";
public const string MonoCorlibVersion = "62731146-81CF-4D61-826D-9A8DDED14432";
}
#if !NETCORE
@@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.0.0.316";
public const string MonoVersion = "6.4.0.137";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

5
mcs/build/common/SR.cs
View File

@@ -41,6 +41,11 @@ static partial class SR
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2);
}
internal static string Format(CultureInfo ci, string resourceFormat, object p1, object p2)
{
return string.Format (ci, resourceFormat, p1, p2);
}
internal static string Format(string resourceFormat, object p1, object p2, object p3)
{
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2, p3);

4
mcs/build/common/basic-profile-check.cs
View File

@@ -41,9 +41,9 @@ class X
Version min_mono_version;
#if __MonoCS__
min_mono_version = new Version (5, 19);
min_mono_version = new Version (6, 2);
#else
min_mono_version = new Version (5, 10);
min_mono_version = new Version (6, 2);
#endif
if (version < min_mono_version)

17
mcs/build/deps/linux_net_4_x_System.Data.Linq_test.dll.sources
View File

@@ -1,9 +1,10 @@
../test-helpers/NunitHelpers.cs
Test/BinaryTest.cs
Test/DataContextTest.cs
Test/EntitySetTest.cs
Test/NullProvider.cs
Test/PeopleTable.cs
Test/Providers/DataContextTestBase.cs
Test/SqlServer/MsSqlDataContextTest.cs
Test/TableTest.cs
Test/dummy.cs
src/DbLinq.SqlServer/Test/MsSqlDataContextTest.cs
src/DbLinq/Test/BinaryTest.cs
src/DbLinq/Test/DataContextTest.cs
src/DbLinq/Test/EntitySetTest.cs
src/DbLinq/Test/NullProvider.cs
src/DbLinq/Test/PeopleTable.cs
src/DbLinq/Test/Providers/DataContextTestBase.cs
src/DbLinq/Test/TableTest.cs

2
mcs/build/deps/linux_net_4_x_corlib_test.dll.sources
View File

@@ -1,3 +1,4 @@
../../../external/corert/src/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs
../../../mono/mini/TestHelpers.cs
../test-helpers/NunitHelpers.cs
../test-helpers/TestResourceHelper.cs
@@ -548,3 +549,4 @@ Test/System/UIntPtrTest.cs
Test/System/ValueTypeTest.cs
Test/System/VersionTest.cs
Test/System/WeakReferenceTest.cs
corefx/GlobalizationMode.cs

4
mcs/build/profiles/build.make
View File

@@ -147,8 +147,8 @@ export VBCS_LOCATION
start-compiler-server:
echo Attempting to start compiler server...
./build/start-compiler-server.sh '$(realpath $(topdir))' '$(realpath $(topdir)/build)/compiler-server.log' '$(COMPILER_SERVER_PIPENAME)'
$(topdir)/build/start-compiler-server.sh '$(realpath $(topdir))' '$(realpath $(topdir)/build)/compiler-server.log' '$(COMPILER_SERVER_PIPENAME)'
else
start-compiler-server:
endif
endif

9
mcs/build/profiles/net_4_x.make
View File

@@ -24,13 +24,4 @@ ENFORCE_LIBRARY_WARN_AS_ERROR = yes
ifdef PLATFORM_MACOS
MONO_FEATURE_APPLETLS=1
ENABLE_GSS=1
SOCKETSHTTPHANDLER=1
endif
ifdef PLATFORM_LINUX
SOCKETSHTTPHANDLER=1
endif
ifdef PLATFORM_UNIX
SOCKETSHTTPHANDLER=1
endif

32
mcs/build/tests.make
View File

@@ -41,19 +41,15 @@ $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnos
$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs \
$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs
ifeq ($(PROFILE),monodroid)
ifdef MOBILE_PROFILE
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
else
ifeq ($(PROFILE),monotouch_tv)
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
else
ifeq ($(PROFILE),monotouch_watch)
ifeq ($(PROFILE), xammac_net_4_5)
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
else
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
endif
endif
endif
endif # ($(USE_XTEST_REMOTE_EXECUTOR), YES)
@@ -62,13 +58,25 @@ xunit_class_deps :=
xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core))
xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$(xunit_deps))
xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll)
xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/%.dll)
xunit_libs_ref += $(xunit_libs_dep:%=-r:%)
TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS) $(DEFAULT_REFERENCES))
TEST_LIB_REFS_ALL = $(TEST_LIB_REFS) $(DEFAULT_REFERENCES)
ifdef TARGET_NET_REFERENCE
# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir
TEST_LIB_REFS_MONO = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(TEST_LIB_REFS_ALL)))
TEST_LIB_REFS_SYSTEM = $(filter-out $(TEST_LIB_REFS_MONO),$(TEST_LIB_REFS_ALL))
TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(TEST_LIB_REFS_SYSTEM))
TEST_LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(TEST_LIB_REFS_MONO))
else
TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(TEST_LIB_REFS_ALL))
endif
XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS) $(DEFAULT_REFERENCES))
test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%)
test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%)
test_nunit_ref = $(test_nunit_dep:%=-r:%)
tests_CLEAN_FILES += TestResult*.xml
@@ -92,7 +100,8 @@ endif
tests_CLEAN_FILES += $(test_lib_output) $(test_lib_output:$(ASSEMBLY_EXT)=.pdb)
xtest_sourcefile_base = $(PROFILE_PLATFORM)_$(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
xtest_sourcefile_base_excludes = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.exclude.sources)
xtest_sourcefile_base_excludes_full = $(PROFILE_PLATFORM)_$(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.exclude.sources)
xtest_sourcefile_base_excludes = $(xtest_sourcefile_base_excludes_full:_%=%)
xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
xtest_lib_output = $(test_lib_dir)/$(xunit_test_lib)
@@ -119,9 +128,7 @@ $(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
$(topdir)/build/deps/nunit-$(PROFILE).stamp:
ifndef PARENT_PROFILE
cd ${topdir}/tools/nunit-lite && $(MAKE)
endif
echo "stamp" >$@
tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
@@ -343,7 +350,6 @@ $(test_lib_dir)/Xunit.NetCore.Extensions.dll: $(topdir)/build/tests.make $(topdi
$(test_lib_dir)/xunit.execution.dotnet.dll: $(topdir)/build/tests.make $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll | $(test_lib_dir)
@cp -f $(topdir)/../external/xunit-binaries/xunit.execution.dotnet.dll $@
# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only
run-xunit-test-lib: xunit-test-local
ok=:; \
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR="$(XTEST_REMOTE_EXECUTOR_ABSPATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xtest_lib_output) $(XTEST_HARNESS_FLAGS) -notrait $(subst $(space), -notrait ,$(XTEST_NOTRAITS)) || ok=false; \