Imported Upstream version 5.18.0.167

Former-commit-id: 289509151e0fee68a1b591a20c9f109c3c789d3a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-20 08:25:10 +00:00
parent e19d552987
commit b084638f15
28489 changed files with 184 additions and 3866856 deletions

View File

@ -2,7 +2,7 @@ thisdir = build
SUBDIRS =
include ../build/rules.make
BUILT_FILES = common/Consts.cs
BUILT_FILES = common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs
all-local install-local test-local run-test-local csproj-local run-test-ondotnet-local uninstall-local doc-update-local: $(BUILT_FILES)
@:
@ -10,7 +10,10 @@ all-local install-local test-local run-test-local csproj-local run-test-ondotnet
clean-local:
-rm -f $(BUILT_FILES) deps/*
common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
$(topdir)/class/lib/$(PROFILE_DIRECTORY):
mkdir -p $@
common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs: common/Consts.cs.in $(wildcard config.make) | $(topdir)/class/lib/$(PROFILE_DIRECTORY)
test -n '$(MONO_VERSION)'
test -n '$(MONO_CORLIB_VERSION)'
sed -e 's,@''MONO_VERSION@,$(MONO_VERSION),' -e 's,@''MONO_CORLIB_VERSION@,$(MONO_CORLIB_VERSION),' $< > $@

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.161";
public const string MonoVersion = "5.18.0.167";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -30,4 +30,4 @@ CLEAN_FILES += $(TEST_RESX_RESOURCES)
$(TEST_RESX_RESOURCES): %.resources: %.resx
$(RESGEN) $< || cp $@.prebuilt $@
$(test_lib_output): $(TEST_RESX_RESOURCES) $(test_lib_dir)
$(test_lib_output): $(TEST_RESX_RESOURCES) | $(test_lib_dir)

View File

@ -318,10 +318,15 @@ namespace System.Windows.Forms
internal static void DrawTextInternal (IDeviceContext dc, string text, Font font, Point pt, Color foreColor, Color backColor, TextFormatFlags flags, bool useDrawString)
{
Size sz = MeasureTextInternal (dc, text, font, useDrawString);
Size sz = MeasureTextInternal (dc, text, font, flags, useDrawString);
DrawTextInternal (dc, text, font, new Rectangle (pt, sz), foreColor, backColor, flags, useDrawString);
}
internal static Size MeasureTextInternal (IDeviceContext dc, string text, Font font, TextFormatFlags flags, bool useMeasureString)
{
return MeasureTextInternal (dc, text, font, Size.Empty, flags, useMeasureString);
}
internal static Size MeasureTextInternal (IDeviceContext dc, string text, Font font, bool useMeasureString)
{
return MeasureTextInternal (dc, text, font, Size.Empty, TextFormatFlags.Default, useMeasureString);

View File

@ -132,7 +132,7 @@ EXTRA_DISTFILES = \
include ../../build/library.make
$(test_lib_output): $(TEST_RESOURCES) $(test_lib_dir)
$(test_lib_output): $(TEST_RESOURCES) | $(test_lib_dir)
# Helper target to run the perl regex test suite
regex-check:

View File

@ -190,7 +190,7 @@ TEST_RESX_RESOURCES = \
TEST_RESX_RESOURCES_SATELITE = \
Test/resources/Resources.es-ES.resources \
Test/resources/Resources.nn-NO.resources \
Test/resources/Resources.nn-NO.resources
CLEAN_FILES += $(TEST_RESX_RESOURCES) $(IL_REPLACE)
@ -201,17 +201,17 @@ $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx
TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
satellite_assembly1 = es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
satellite_assembly2 = nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))
satellite_assembly1 = $(test_lib_dir)/es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
satellite_assembly2 = $(test_lib_dir)/nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))
$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) $(test_lib_dir)
$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) | $(test_lib_dir)
$(satellite_assembly1): Test/resources/culture-es-ES.cs Test/resources/Resources.es-ES.resources
@mkdir -p es-ES
@mkdir -p $(dir $@)
$(CSCOMPILE) -target:library -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll Test/resources/culture-es-ES.cs -resource:Test/resources/Resources.es-ES.resources -out:$@
$(satellite_assembly2): Test/resources/culture-nn-NO.cs Test/resources/Resources.nn-NO.resources
@mkdir -p nn-NO
@mkdir -p $(dir $@)
$(CSCOMPILE) -target:library -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll Test/resources/culture-nn-NO.cs -resource:Test/resources/Resources.nn-NO.resources -out:$@
vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization

View File

@ -1 +1 @@
bdd17dbe32799aecb0b91f5ac28ae4bdfafa8be5
d5ab56797108ee5fd7c93acbbe05eb09ad163728

View File

@ -1 +1 @@
c91d822970e5c150c18432ccdfb1ab76470ba4c8
e1f1ba24412ca1f24fdfe401edf5228e75bebbe2

View File

@ -1 +1 @@
ab35e136836f0d9e6b6be54f154fe999f06fa719
c338253c34aa6e057427ee3f6085fdd4ff5b35c9

View File

@ -1 +1 @@
4f67538fbae6fdd01e55597de05017ef86f598ee
6409ea01b4ed66a85bc41f83c569b4f41509b143

View File

@ -1 +1 @@
34ef397456f5de07e05fdeb9ef1db56af7a96ed1
195c68d1031ca0246416077f4019351943293362

View File

@ -1 +1 @@
92c41e65e965ba4ad318b5d471e4e9bedac6626d
b1374518cd1b58bb3aaa9d7d45e050f3cb5e2460

View File

@ -1 +1 @@
2c6dd90e947b4a791c961440660e2e254e57c84d
0b554efd62e0f4ce4a9685df4d2cf7be64e6bafc

View File

@ -1 +1 @@
bdd17dbe32799aecb0b91f5ac28ae4bdfafa8be5
d5ab56797108ee5fd7c93acbbe05eb09ad163728

View File

@ -1 +1 @@
c91d822970e5c150c18432ccdfb1ab76470ba4c8
e1f1ba24412ca1f24fdfe401edf5228e75bebbe2

View File

@ -1 +1 @@
ab35e136836f0d9e6b6be54f154fe999f06fa719
c338253c34aa6e057427ee3f6085fdd4ff5b35c9

View File

@ -1 +1 @@
4f67538fbae6fdd01e55597de05017ef86f598ee
6409ea01b4ed66a85bc41f83c569b4f41509b143

View File

@ -1 +1 @@
34ef397456f5de07e05fdeb9ef1db56af7a96ed1
195c68d1031ca0246416077f4019351943293362

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