Merge branch 'upstream'
Former-commit-id: 22a8dee72e65f62b3f9b86cd580c5e75025f172c
This commit is contained in:
commit
8894b35d8d
@ -1 +1 @@
|
||||
9ffa50bee09618535f852043e12554736b12a21c
|
||||
5113df261771724626d259406c2e4e814422a777
|
@ -1 +1 @@
|
||||
7ac1a61c38d3ab88f8aebba9fbaae9c9a7cc6958
|
||||
9e1aa8c37142558ac64bb9f2641b629d74063e18
|
@ -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 $<)
|
||||
|
||||
|
@ -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 $<)
|
||||
|
||||
|
@ -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";
|
||||
|
@ -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
|
||||
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs
|
@ -0,0 +1 @@
|
||||
Bug27864.cs
|
@ -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
|
@ -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
|
@ -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
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs
|
@ -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
|
||||
|
@ -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
|
@ -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
|
||||
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs
|
@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs
|
@ -0,0 +1 @@
|
||||
System.Security.Permissions/DataProtectionPermissionAttributeTest.cs
|
@ -0,0 +1,8 @@
|
||||
System.Web.Services.Configuration/DiagnosticsElementTest.cs
|
||||
System.Web.Services.Configuration/ProtocolElementTest.cs
|
||||
System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs
|
||||
System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
|
||||
System.Web.Services.Configuration/TypeElementTest.cs
|
||||
System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
|
||||
System.Web.Services.Configuration/WsiProfilesElementTest.cs
|
||||
|
@ -0,0 +1,8 @@
|
||||
System.Web.Services.Configuration/DiagnosticsElementTest.cs
|
||||
System.Web.Services.Configuration/ProtocolElementTest.cs
|
||||
System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs
|
||||
System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
|
||||
System.Web.Services.Configuration/TypeElementTest.cs
|
||||
System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
|
||||
System.Web.Services.Configuration/WsiProfilesElementTest.cs
|
||||
|
@ -18,7 +18,13 @@ endif
|
||||
|
||||
TEST_LIB_REFS = System.Data System.Core
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq System.Drawing Facades/System.Threading.Tasks System.Runtime.Serialization Facades/System.Text.Encoding.CodePages
|
||||
XTEST_LIB_REFS = System System.Core System.Xml System.Xml.Linq Facades/System.Threading.Tasks System.Runtime.Serialization Facades/System.Text.Encoding.CodePages
|
||||
|
||||
ifneq ($(PROFILE),monodroid)
|
||||
ifneq ($(PROFILE),monotouch)
|
||||
XTEST_LIB_REFS += System.Drawing
|
||||
endif
|
||||
endif
|
||||
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
|
15
mcs/class/System/monodroid_System_xtest.dll.exclude.sources
Normal file
15
mcs/class/System/monodroid_System_xtest.dll.exclude.sources
Normal file
@ -0,0 +1,15 @@
|
||||
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/*.cs
|
||||
|
||||
../../../external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/*.cs
|
||||
|
||||
../../../external/corefx/src/System.Text.RegularExpressions/tests/*.cs
|
10
mcs/class/System/monotouch_System_xtest.dll.exclude.sources
Normal file
10
mcs/class/System/monotouch_System_xtest.dll.exclude.sources
Normal file
@ -0,0 +1,10 @@
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/*.cs
|
10
mcs/class/System/wasm_System_xtest.dll.exclude.sources
Normal file
10
mcs/class/System/wasm_System_xtest.dll.exclude.sources
Normal file
@ -0,0 +1,10 @@
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeCollections/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeExpressions/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeObjects/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeStatements/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/CodeTypeMembers/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Compiler/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Other/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Microsoft/CSharp/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/Microsoft/VisualBasic/*.cs
|
||||
../../../external/corefx/src/System.CodeDom/tests/*.cs
|
16
mcs/class/corlib/monotouch_corlib_xtest.dll.exclude.sources
Normal file
16
mcs/class/corlib/monotouch_corlib_xtest.dll.exclude.sources
Normal file
@ -0,0 +1,16 @@
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericArguments.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericMethodDefinition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetHashCode.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderIsGenericMethod.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetReturnType.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetSignature.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDeclaringMethod.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterAttributes.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterPosition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGetGenericTypeDefinition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderIsGenericTypeDefinition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderMakeGenericType.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderName.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderNamespace.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderPackingSize.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderSize.cs
|
16
mcs/class/corlib/wasm_corlib_xtest.dll.exclude.sources
Normal file
16
mcs/class/corlib/wasm_corlib_xtest.dll.exclude.sources
Normal file
@ -0,0 +1,16 @@
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericArguments.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetGenericMethodDefinition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderGetHashCode.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderIsGenericMethod.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetReturnType.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/MethodBuilder/MethodBuilderSetSignature.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderDeclaringMethod.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterAttributes.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGenericParameterPosition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderGetGenericTypeDefinition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderIsGenericTypeDefinition.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderMakeGenericType.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderName.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderNamespace.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderPackingSize.cs
|
||||
../../../external/corefx/src/System.Reflection.Emit/tests/TypeBuilder/TypeBuilderSize.cs
|
@ -1 +1 @@
|
||||
ff963de41b794060c47ab2adbf50cfbd3a80edef
|
||||
2cbb6a09884d85eab1fefb0e1b340f7d83c103de
|
@ -1 +1 @@
|
||||
0dd7cb3b4f02c995e612c7da661371327826abad
|
||||
5cacb510426cd7ec0cfb12c5100ae077d5932e82
|
@ -1 +1 @@
|
||||
cca6b05aa5091b549e08a32f09ab5bd374301520
|
||||
423d6e4ca220562a795b62d9d978e5127f3bb7b6
|
Binary file not shown.
@ -1 +1 @@
|
||||
1270e324e0061f4714ddc9e187394b9dbfbb9edd
|
||||
399d8dc235d98b423e51a8e933aa25156799715b
|
@ -1 +1 @@
|
||||
785b67a448239235fdab9d2a42d07fcc85f2d8e1
|
||||
52072e52e16df5c49904a933247f1c38247eb2e3
|
@ -1 +1 @@
|
||||
a54156a0419544fea7dccb9902e738c01cba81a8
|
||||
0bc9242a68ea40c0b5732e68fff719eb0aacefaf
|
@ -1 +1 @@
|
||||
3e51ba43af607410d6a3b034da7096a102577b1a
|
||||
c2469ea2c8f3ac47184e31b7ac3abac088171018
|
@ -1 +1 @@
|
||||
ff963de41b794060c47ab2adbf50cfbd3a80edef
|
||||
2cbb6a09884d85eab1fefb0e1b340f7d83c103de
|
@ -1 +1 @@
|
||||
0dd7cb3b4f02c995e612c7da661371327826abad
|
||||
5cacb510426cd7ec0cfb12c5100ae077d5932e82
|
@ -1 +1 @@
|
||||
cca6b05aa5091b549e08a32f09ab5bd374301520
|
||||
423d6e4ca220562a795b62d9d978e5127f3bb7b6
|
Binary file not shown.
@ -1 +1 @@
|
||||
1270e324e0061f4714ddc9e187394b9dbfbb9edd
|
||||
399d8dc235d98b423e51a8e933aa25156799715b
|
@ -1 +1 @@
|
||||
785b67a448239235fdab9d2a42d07fcc85f2d8e1
|
||||
52072e52e16df5c49904a933247f1c38247eb2e3
|
@ -1 +1 @@
|
||||
a54156a0419544fea7dccb9902e738c01cba81a8
|
||||
0bc9242a68ea40c0b5732e68fff719eb0aacefaf
|
@ -1 +1 @@
|
||||
3e51ba43af607410d6a3b034da7096a102577b1a
|
||||
c2469ea2c8f3ac47184e31b7ac3abac088171018
|
@ -1 +1 @@
|
||||
ff963de41b794060c47ab2adbf50cfbd3a80edef
|
||||
2cbb6a09884d85eab1fefb0e1b340f7d83c103de
|
@ -1 +1 @@
|
||||
0dd7cb3b4f02c995e612c7da661371327826abad
|
||||
5cacb510426cd7ec0cfb12c5100ae077d5932e82
|
@ -1 +1 @@
|
||||
cca6b05aa5091b549e08a32f09ab5bd374301520
|
||||
423d6e4ca220562a795b62d9d978e5127f3bb7b6
|
Binary file not shown.
@ -1 +1 @@
|
||||
1270e324e0061f4714ddc9e187394b9dbfbb9edd
|
||||
399d8dc235d98b423e51a8e933aa25156799715b
|
@ -1 +1 @@
|
||||
785b67a448239235fdab9d2a42d07fcc85f2d8e1
|
||||
52072e52e16df5c49904a933247f1c38247eb2e3
|
@ -1 +1 @@
|
||||
a54156a0419544fea7dccb9902e738c01cba81a8
|
||||
0bc9242a68ea40c0b5732e68fff719eb0aacefaf
|
@ -1 +1 @@
|
||||
3e51ba43af607410d6a3b034da7096a102577b1a
|
||||
c2469ea2c8f3ac47184e31b7ac3abac088171018
|
@ -1 +1 @@
|
||||
ff963de41b794060c47ab2adbf50cfbd3a80edef
|
||||
2cbb6a09884d85eab1fefb0e1b340f7d83c103de
|
@ -1 +1 @@
|
||||
0dd7cb3b4f02c995e612c7da661371327826abad
|
||||
5cacb510426cd7ec0cfb12c5100ae077d5932e82
|
@ -1 +1 @@
|
||||
cca6b05aa5091b549e08a32f09ab5bd374301520
|
||||
423d6e4ca220562a795b62d9d978e5127f3bb7b6
|
Binary file not shown.
@ -1 +1 @@
|
||||
1270e324e0061f4714ddc9e187394b9dbfbb9edd
|
||||
399d8dc235d98b423e51a8e933aa25156799715b
|
@ -1 +1 @@
|
||||
785b67a448239235fdab9d2a42d07fcc85f2d8e1
|
||||
52072e52e16df5c49904a933247f1c38247eb2e3
|
@ -1 +1 @@
|
||||
a54156a0419544fea7dccb9902e738c01cba81a8
|
||||
0bc9242a68ea40c0b5732e68fff719eb0aacefaf
|
@ -1 +1 @@
|
||||
3e51ba43af607410d6a3b034da7096a102577b1a
|
||||
c2469ea2c8f3ac47184e31b7ac3abac088171018
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/bd1f64a"
|
||||
#define FULL_VERSION "explicit/9f72a46"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
d8b807fb4c856f54f9633e2b49c58f4f638b3d31
|
||||
547a00e4e4f0fbf9f927376bc38d40d1c59a96d7
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6a6249d75980b0621f6041546aff90de20547cc0
|
||||
7e9c99c504dc94c3f8bad52ccd84b7b84ee28411
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
2a1bfe770bed093039a60aa8c69aa8b909806423
|
||||
dbabd722586ac78f4ab05db50d3cf2df0c977a5f
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.18.0.147\n"
|
||||
"Project-Id-Version: mono 5.18.0.151\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-10-13 08:07+0000\n"
|
||||
"POT-Creation-Date: 2018-10-18 08:12+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
dfaa5411015ef4e3316dafb1fa05cc1094a79552
|
||||
00df6cd2b64089573c5d2d7ea29f8f36870106a1
|
@ -1,3 +1,4 @@
|
||||
|
||||
tmpinst = _tmpinst
|
||||
|
||||
noinst_SCRIPTS = mono-wrapper monodis-wrapper
|
||||
@ -81,34 +82,49 @@ endif
|
||||
|
||||
test_profiles = $(filter-out binary_reference_assemblies monodroid_tools,$(build_profiles))
|
||||
|
||||
if BUILD_MCS
|
||||
|
||||
MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
|
||||
|
||||
# The write check is to foil 'make distcheck'
|
||||
all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
all-mcs: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
|
||||
cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
|
||||
|
||||
# override automake
|
||||
install: install-exec install-data
|
||||
install-mcs: install-mcs-exec install-mcs-data
|
||||
|
||||
# override automake
|
||||
install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
install-mcs-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
|
||||
|
||||
# override automake
|
||||
install-data:
|
||||
install-mcs-data:
|
||||
@:
|
||||
|
||||
# override automake
|
||||
uninstall:
|
||||
uninstall-mcs:
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
|
||||
|
||||
clean-local:
|
||||
clean-mcs:
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
|
||||
-rm -fr $(etctmp) $(tmpinst)
|
||||
|
||||
if BUILD_MCS
|
||||
|
||||
all-local: all-mcs
|
||||
|
||||
# override automake
|
||||
install: install-mcs
|
||||
|
||||
# override automake
|
||||
install-exec: install-mcs-exec
|
||||
|
||||
# override automake
|
||||
install-data: install-mcs-data
|
||||
|
||||
# override automake
|
||||
uninstall: uninstall-mcs
|
||||
|
||||
clean-local: clean-mcs
|
||||
|
||||
endif BUILD_MCS
|
||||
|
||||
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc $(tmpinst)/bin/mcs $(tmpinst)/bin/al
|
||||
|
@ -385,7 +385,7 @@ build_profiles = $(am__append_2) $(am__append_3) $(am__append_4) \
|
||||
$(am__append_11) $(am__append_12) $(am__append_13)
|
||||
@INSTALL_4_x_TRUE@net_profile = net_4_x
|
||||
test_profiles = $(filter-out binary_reference_assemblies monodroid_tools,$(build_profiles))
|
||||
@BUILD_MCS_TRUE@MAKE_FLAGS = $(if $(V),,--no-print-directory -s)
|
||||
MAKE_FLAGS = $(if $(V),,--no-print-directory -s)
|
||||
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc $(tmpinst)/bin/mcs $(tmpinst)/bin/al
|
||||
@CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@cur_dir_cmd = cygpath -w -a .
|
||||
@CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@cur_dir_cmd = pwd
|
||||
@ -585,28 +585,43 @@ $(symlinks):
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
# The write check is to foil 'make distcheck'
|
||||
@BUILD_MCS_TRUE@all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
@BUILD_MCS_TRUE@ if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
|
||||
@BUILD_MCS_TRUE@ cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
|
||||
all-mcs: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
|
||||
cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
|
||||
|
||||
install-mcs: install-mcs-exec install-mcs-data
|
||||
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@install: install-exec install-data
|
||||
install-mcs-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
|
||||
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
|
||||
@BUILD_MCS_TRUE@ cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
|
||||
install-mcs-data:
|
||||
@:
|
||||
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@install-data:
|
||||
@BUILD_MCS_TRUE@ @:
|
||||
uninstall-mcs:
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
|
||||
|
||||
clean-mcs:
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
|
||||
-rm -fr $(etctmp) $(tmpinst)
|
||||
|
||||
@BUILD_MCS_TRUE@all-local: all-mcs
|
||||
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@uninstall:
|
||||
@BUILD_MCS_TRUE@ cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
|
||||
@BUILD_MCS_TRUE@install: install-mcs
|
||||
|
||||
@BUILD_MCS_TRUE@clean-local:
|
||||
@BUILD_MCS_TRUE@ cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
|
||||
@BUILD_MCS_TRUE@ -rm -fr $(etctmp) $(tmpinst)
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@install-exec: install-mcs-exec
|
||||
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@install-data: install-mcs-data
|
||||
|
||||
# override automake
|
||||
@BUILD_MCS_TRUE@uninstall: uninstall-mcs
|
||||
|
||||
@BUILD_MCS_TRUE@clean-local: clean-mcs
|
||||
|
||||
mcs-do-test-profiles:
|
||||
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
|
||||
|
Loading…
x
Reference in New Issue
Block a user