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: c961326ec42c28872b5ee4db21f4efca5fd83730
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-04-22 22:45:38 +00:00
commit 0d1f7374e2
52 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
abefaf5dbffc4e80018b084cd325822f1344cf89 73e8c9d278acfcd5e39a2e522cbcfc96598a7d01

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

@ -1 +1 @@
b98bb12c4d49d9270bb87247aae383eb7df49a04 acd5c22d85e3db995bbb3bcfa3b6b4d9d7c4af96

6
external/bockbuild/bockbuild/util/util.py vendored
View File

@ -548,6 +548,12 @@ def iterate_dir(dir, with_links=False, with_dirs=False, summary=False):
dirs = dirs + 1 dirs = dirs + 1
if with_dirs: if with_dirs:
yield root yield root
if with_dirs and with_links:
for subdir in subdirs:
path = os.path.join(root, subdir)
if os.path.islink(path):
links = links + 1
yield path
for file in filelist: for file in filelist:
path = os.path.join(root, file) path = os.path.join(root, file)
if os.path.islink(path): if os.path.islink(path):

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

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

9
mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
View File

@ -658,6 +658,15 @@ namespace MonoTests.System.Reflection
Assert.AreEqual (10, pi2.GetGetMethod ().Invoke (10, null)); Assert.AreEqual (10, pi2.GetGetMethod ().Invoke (10, null));
} }
[Test]
public void NullableTestsStatic ()
{
Nullable<Double> val = new Nullable<Double>(new Double());
MethodInfo mi = typeof (Nullable<Double>).GetMethod ("op_Implicit");
object obj = val;
mi.Invoke(null, new[] { obj });
}
public static void foo_generic<T> () public static void foo_generic<T> ()
{ {
} }

2
mcs/class/corlib/monodroid_corlib_xtest.dll.exclude.sources Normal file
View File

@ -0,0 +1,2 @@
../../../external/corefx/src/System.IO.FileSystem/tests/File/Copy.cs
../../../external/corefx/src/System.IO.FileSystem/tests/FileInfo/CopyTo.cs

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
63b74fddf7c80391af92f886885a8acc83e7192c 100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d803005b601b49f58cbc88c63dd40a0a01747f09 f0b284f1eef9c4ad53e46eb667569acbc301c8eb

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
25eb9c458720e5471a610d30cb872cb9707e3428 c97fa81a52e33e709aba8f6d48ce0e15ba59648e

BIN
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 2b37718af0ab691d006d4153f926d0ad3e61c24a

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
7a9505f597fb6a1834a18d39d25346069ea8d8a1 3d8a09adb5c438493dd8010212b9a1114f3890f1

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
013ae33b3c5b61fd8a7129e4806417c2f4505293 885e28e998117d99418431439fdcefda35b945dd

2
mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
4406618a20b8b096b0c3bea66c9b71c7b6fd10e7 ab35bec467401fde399b5f27fac9b8d6df19eaca

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
63b74fddf7c80391af92f886885a8acc83e7192c 100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d803005b601b49f58cbc88c63dd40a0a01747f09 f0b284f1eef9c4ad53e46eb667569acbc301c8eb

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
25eb9c458720e5471a610d30cb872cb9707e3428 c97fa81a52e33e709aba8f6d48ce0e15ba59648e

BIN
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 2b37718af0ab691d006d4153f926d0ad3e61c24a

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
7a9505f597fb6a1834a18d39d25346069ea8d8a1 3d8a09adb5c438493dd8010212b9a1114f3890f1

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
013ae33b3c5b61fd8a7129e4806417c2f4505293 885e28e998117d99418431439fdcefda35b945dd

2
mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
4406618a20b8b096b0c3bea66c9b71c7b6fd10e7 ab35bec467401fde399b5f27fac9b8d6df19eaca

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
63b74fddf7c80391af92f886885a8acc83e7192c 100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d803005b601b49f58cbc88c63dd40a0a01747f09 f0b284f1eef9c4ad53e46eb667569acbc301c8eb

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
25eb9c458720e5471a610d30cb872cb9707e3428 c97fa81a52e33e709aba8f6d48ce0e15ba59648e

BIN
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 2b37718af0ab691d006d4153f926d0ad3e61c24a

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
7a9505f597fb6a1834a18d39d25346069ea8d8a1 3d8a09adb5c438493dd8010212b9a1114f3890f1

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
013ae33b3c5b61fd8a7129e4806417c2f4505293 885e28e998117d99418431439fdcefda35b945dd

2
mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
4406618a20b8b096b0c3bea66c9b71c7b6fd10e7 ab35bec467401fde399b5f27fac9b8d6df19eaca

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
63b74fddf7c80391af92f886885a8acc83e7192c 100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d803005b601b49f58cbc88c63dd40a0a01747f09 f0b284f1eef9c4ad53e46eb667569acbc301c8eb

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
c70e268c083360f13d1031ae6e199545468d0bcf aa583f56071869bac3062f01221b9ef640d162f3

BIN
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
5bd622ea101e94fc66e04c59f8eaff4fd4a313d3 2b37718af0ab691d006d4153f926d0ad3e61c24a

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
7a9505f597fb6a1834a18d39d25346069ea8d8a1 3d8a09adb5c438493dd8010212b9a1114f3890f1

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
013ae33b3c5b61fd8a7129e4806417c2f4505293 885e28e998117d99418431439fdcefda35b945dd

2
mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
1fee9fbe69b84bb58769d5bd304a961bbd8eda9e 6d4a7658061b515788cbb55e8a8ba9ef7396f14e

2
mcs/packages/Makefile
View File

@ -36,7 +36,7 @@ DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-tes
ifeq ($(PROFILE), $(DEFAULT_PROFILE)) ifeq ($(PROFILE), $(DEFAULT_PROFILE))
TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION) TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION)
MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/15.0/bin/Roslyn MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/Current/bin/Roslyn
install-local: install-prototypes install-local: install-prototypes
$(MKINSTALLDIRS) $(TARGET_DIR) $(MKINSTALLDIRS) $(TARGET_DIR)

12
mcs/tools/xbuild/Makefile
View File

@ -25,7 +25,7 @@ PCL5_FX_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETPortable/v5.0
VS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/VisualStudio VS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/VisualStudio
PORTABLE_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Portable PORTABLE_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/Portable
NUGET_BUILDTASKS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/NuGet NUGET_BUILDTASKS_TARGETS_DIR = $(mono_libdir)/mono/xbuild/Microsoft/NuGet
MSBUILD_EXTENSIONS_15_DIR=$(mono_libdir)/mono/xbuild/15.0 MSBUILD_EXTENSIONS_CURRENT_DIR=$(mono_libdir)/mono/xbuild/Current
ifeq (14.0, $(XBUILD_VERSION)) ifeq (14.0, $(XBUILD_VERSION))
install-extras: install-versioned-files install-global-files install-extras: install-versioned-files install-global-files
@ -97,7 +97,7 @@ install-pcl-targets:
done done
install-web-targets: install-web-targets:
for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0; do \ for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0 v16.0; do \
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \ $(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \ $(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \
done done
@ -106,12 +106,12 @@ NUGET_BUILDTASKS_REPO_DIR=$(topdir)/../external/nuget-buildtasks
install-nuget-targets: install-nuget-targets:
$(MKINSTALLDIRS) $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR) $(MKINSTALLDIRS) $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR)
$(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Imports/Microsoft.Common.props/ImportBefore $(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Imports/Microsoft.Common.props/ImportBefore
$(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Microsoft.Common.targets/ImportAfter $(MKINSTALLDIRS) $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Microsoft.Common.targets/ImportAfter
$(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR) $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR)
$(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.props $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR) $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.props $(DESTDIR)$(NUGET_BUILDTASKS_TARGETS_DIR)
$(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Imports/Microsoft.Common.props/ImportBefore $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Imports/Microsoft.Common.props/ImportBefore
$(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets $(DESTDIR)$(MSBUILD_EXTENSIONS_15_DIR)/Microsoft.Common.targets/ImportAfter $(INSTALL_DATA) $(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets $(DESTDIR)$(MSBUILD_EXTENSIONS_CURRENT_DIR)/Microsoft.Common.targets/ImportAfter
install-nuget-imports: install-nuget-imports:
ifeq (14.0, $(XBUILD_VERSION)) ifeq (14.0, $(XBUILD_VERSION))

2
mono/metadata/object.c.REMOVED.git-id
View File

@ -1 +1 @@
c0a83e4270b665f14af645c476695552476a8c8e efc581af00f42fb46d61f4d094635bef1f7908de

2
mono/mini/aot-compiler.c.REMOVED.git-id
View File

@ -1 +1 @@
7dd5faf818a0108425a9aa20fa86dc9b77faaaec 1b1a45b7976986c7910e593aea762e789e3bcf28

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/3a8f93b" #define FULL_VERSION "explicit/a418e94"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
5eb808aed810de17a1b21e69998bde4370e6b0f9 d27845252900e7a29f889367c914886e5057ea85

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
724bed774d4300f34b4304e64458dab470044466 bba3dea7a4d70b097345d73c850b78d19e6cf5fc

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
60776213f8f0c23148f5bb473f6bb24c551e6fe9 866fcf80050b130aa1b16bdaba078529f581b45e

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.0.0.184\n" "Project-Id-Version: mono 6.0.0.190\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-04-22 14:45+0000\n" "POT-Creation-Date: 2019-04-22 21:43+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
210a0ebeb85872d0c1931e5b781a938be23faf0e 682f1c0e11f965de2ef79f60fd6dbde3f0cced8f