mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-15 17:10:51 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
feca91f7eb | ||
|
|
06cf039948 | ||
|
|
5ec4718267 | ||
|
|
68c6ae5805 | ||
|
|
904bd79d9d | ||
|
|
04dc2f342c | ||
|
|
1be30ef4c7 | ||
|
|
e76e09d6f6 | ||
|
|
1717687e16 | ||
|
|
48c61e1f48 | ||
|
|
6892c97d6d | ||
|
|
8bcc316cbc | ||
|
|
e4df5ef680 | ||
|
|
c884c0ebf2 | ||
|
|
d63faca00b | ||
|
|
886c490174 | ||
|
|
bd6801d402 | ||
|
|
323e32d96b | ||
|
|
85d1920b01 | ||
|
|
2458d2d477 | ||
|
|
da5c20953f | ||
|
|
0e9b8f7c93 | ||
|
|
9144241961 | ||
|
|
fc775d0b9f | ||
|
|
15d050a792 | ||
|
|
4013ccbc3a | ||
|
|
2264e1b30c | ||
|
|
9bda4038a2 | ||
|
|
9e7fc6ccb0 | ||
|
|
95911b799a | ||
|
|
3a91530444 | ||
|
|
24a71af6f3 | ||
|
|
7e62f08570 | ||
|
|
903c4aab5c | ||
|
|
9326f9faf3 | ||
|
|
f09e177295 | ||
|
|
bfb9881410 | ||
|
|
92751e786f | ||
|
|
2142d47758 | ||
|
|
a8ec3b0f2e | ||
|
|
4987b261ad | ||
|
|
204d95cec1 | ||
|
|
5292793039 | ||
|
|
229d6a0222 | ||
|
|
c1cf332539 | ||
|
|
a76ca3c063 | ||
|
|
cdad7378ae | ||
|
|
bf1b7f1951 | ||
|
|
78e155f252 | ||
|
|
af19147d0b | ||
|
|
e752907c5b | ||
|
|
68fb0e0c9c | ||
|
|
1f81468bd5 | ||
|
|
74cfbd2bb4 | ||
|
|
f08a9ab1d2 | ||
|
|
3151b5cea8 | ||
|
|
91e8acb924 | ||
|
|
5849bb2f22 | ||
|
|
f16d2d5d44 | ||
|
|
da38bdc0e4 | ||
|
|
ea3e93b191 | ||
|
|
b4b86276a4 | ||
|
|
5bd3f0b5b4 | ||
|
|
244c31c6be | ||
|
|
5e9f06e9c1 | ||
|
|
d390bb6901 | ||
|
|
0065638f26 | ||
|
|
c35bd54639 | ||
|
|
2b6f395180 | ||
|
|
4c3f26a9de | ||
|
|
4cad1b8af0 | ||
|
|
68fbd3eca2 | ||
|
|
0955247f91 | ||
|
|
aa0b580e85 | ||
|
|
a4b5c763a1 | ||
|
|
2f94cf00bb | ||
|
|
78f05bcfa3 | ||
|
|
a5f5870b2a | ||
|
|
4a7563ff85 | ||
|
|
0d241933d6 | ||
|
|
6a9a2e961a | ||
|
|
78bffebbd8 | ||
|
|
2e7daaa78d | ||
|
|
c43534cda4 | ||
|
|
b48a13fd15 | ||
|
|
73a1f12571 | ||
|
|
be6e0ebc77 | ||
|
|
a13ca00bc8 | ||
|
|
fb48de64ce | ||
|
|
cc39803728 | ||
|
|
326fde705b | ||
|
|
b2919b6ff1 | ||
|
|
9b3670f36a | ||
|
|
c255eefb41 | ||
|
|
d3ebbdcde2 | ||
|
|
bfe4e37521 | ||
|
|
d6c979938c | ||
|
|
fc8afab45c | ||
|
|
1ca5ef6c30 | ||
|
|
73f642d56b | ||
|
|
829480a1c3 | ||
|
|
9434d41512 | ||
|
|
f85db53c8b | ||
|
|
42187d129f | ||
|
|
548744cea9 | ||
|
|
8788708699 | ||
|
|
8d5fc8032a | ||
|
|
ad4efef139 | ||
|
|
fe613d1599 | ||
|
|
d3c9c60a8c | ||
|
|
64aab490e4 | ||
|
|
39fd6b08b5 | ||
|
|
003bf5dd60 | ||
|
|
15fb740a03 | ||
|
|
e0b41dbf9b | ||
|
|
f2f5d27950 | ||
|
|
e632442e29 | ||
|
|
f198c5dfa5 | ||
|
|
0255d3c60c | ||
|
|
2f2208282b | ||
|
|
871038a64e | ||
|
|
716c8ea173 | ||
|
|
b8290b6f27 | ||
|
|
b6de3867db | ||
|
|
4dda38f2b3 | ||
|
|
1be343e3a9 | ||
|
|
c6a7260860 | ||
|
|
0582cf8ba6 | ||
|
|
3d6efcb123 | ||
|
|
513707c15e | ||
|
|
aca7189869 | ||
|
|
d2b92a4a77 | ||
|
|
217af22eda | ||
|
|
4f86bf7f44 | ||
|
|
3b12df3beb | ||
|
|
27a450b8b1 | ||
|
|
084c70bbca | ||
|
|
0343870bd1 | ||
|
|
8b1a5354ba | ||
|
|
5998117b9e | ||
|
|
e6f3003499 | ||
|
|
71691716b7 | ||
|
|
946e21a333 | ||
|
|
dc59a6ff5b | ||
|
|
eb0779c34a | ||
|
|
9fc606c983 | ||
|
|
4f185e4ce9 | ||
|
|
3dd90390a8 | ||
|
|
1bb3aaa82f | ||
|
|
362b1a50e7 | ||
|
|
60ca6d0fdb | ||
|
|
48791f832d | ||
|
|
59572d0ad3 | ||
|
|
75ada763c4 | ||
|
|
eea8213479 | ||
|
|
a0db72bd48 | ||
|
|
2a9100254d | ||
|
|
4ad781f981 | ||
|
|
c6f6cff71e | ||
|
|
6aa067b85c | ||
|
|
f5d0808847 | ||
|
|
c61d4b7a8c | ||
|
|
56f1afd289 | ||
|
|
a0ac40a1a5 | ||
|
|
962f0c5248 | ||
|
|
827ef28c8e | ||
|
|
53faf850c6 | ||
|
|
009efbfc67 | ||
|
|
1e914f4b42 | ||
|
|
47fd1d6236 | ||
|
|
4453ed9862 | ||
|
|
a2d589d2e7 | ||
|
|
8a80b39fe4 | ||
|
|
6db0148787 | ||
|
|
0539f15f77 | ||
|
|
65187a7917 | ||
|
|
64c566d8da | ||
|
|
d51ed697a0 | ||
|
|
4d29428741 | ||
|
|
f285f82c8d | ||
|
|
5e1b11535d | ||
|
|
f28a0c04db | ||
|
|
ae5ff1b4bc | ||
|
|
0e6a3e0c85 | ||
|
|
2d04a8f274 | ||
|
|
2f9dcaf1fc | ||
|
|
39ee7a08f9 | ||
|
|
36cac59485 | ||
|
|
f5e27e160c | ||
|
|
6d2ea1b004 | ||
|
|
4023a6233e | ||
|
|
78662419df | ||
|
|
35d1ff89a0 | ||
|
|
267470152a | ||
|
|
aab7377d4f | ||
|
|
bdf42f000e | ||
|
|
e45b97c68e | ||
|
|
24e7d7d5e8 | ||
|
|
a65b7d8b44 | ||
|
|
6bbc707eb3 | ||
|
|
114f88aaf1 | ||
|
|
dc57395fd6 | ||
|
|
86ba8ff964 | ||
|
|
d02b6c0583 | ||
|
|
3d170b9afe | ||
|
|
b52c3a73cf | ||
|
|
23ec776507 | ||
|
|
ed8ea70ed4 | ||
|
|
ecb182b6aa | ||
|
|
3e0ab3888f | ||
|
|
3b70989861 | ||
|
|
32762757fc | ||
|
|
f7712118c1 | ||
|
|
d219d3ddc1 | ||
|
|
d36384af41 | ||
|
|
14c0694078 | ||
|
|
a8aa312734 | ||
|
|
98bdd89013 | ||
|
|
231b48f33b | ||
|
|
d00d06ba97 | ||
|
|
e1c4ddc480 | ||
|
|
73ce88dcaf | ||
|
|
b645d5b68b | ||
|
|
ba8520225c | ||
|
|
7d14593291 | ||
|
|
f7a6b32910 | ||
|
|
b4593fd0e5 | ||
|
|
fd1c0a4784 | ||
|
|
7367fae549 | ||
|
|
bbcc3ebc21 | ||
|
|
90fe086c23 | ||
|
|
a75ce17e4b | ||
|
|
e2f7b95826 | ||
|
|
bb4a96f164 | ||
|
|
d578344b06 | ||
|
|
f6efa3e82b | ||
|
|
d0f6cc42bd | ||
|
|
68bac5c1d8 | ||
|
|
f743d4250c | ||
|
|
dc9771601a | ||
|
|
3986341b65 | ||
|
|
0a919874d1 | ||
|
|
4577597ce1 | ||
|
|
59b1d81525 | ||
|
|
980aef41b9 | ||
|
|
429bb0bae0 | ||
|
|
c0212dac5f | ||
|
|
4f700983df | ||
|
|
790f412275 | ||
|
|
3b5cacc15c | ||
|
|
b261706d88 | ||
|
|
8890b0c6c4 | ||
|
|
dcaef0b2ca | ||
|
|
9ff6d8f918 | ||
|
|
e708752f14 | ||
|
|
2a052ba0c9 | ||
|
|
76be3b3bc8 | ||
|
|
7e7efe488f | ||
|
|
72a81cc6d2 | ||
|
|
f00fa49bb9 | ||
|
|
fc9fc38926 | ||
|
|
d33c213354 | ||
|
|
8c7aca3316 | ||
|
|
923afca889 | ||
|
|
3dd1602a1a | ||
|
|
edc6fc4e82 | ||
|
|
98b85ceaec | ||
|
|
7d4ca00db4 | ||
|
|
810ced6d0b | ||
|
|
98c33e716d | ||
|
|
a5016f7898 | ||
|
|
6deb114ce5 | ||
|
|
ec0ae343f0 | ||
|
|
921642ea72 | ||
|
|
5e6ea6c806 | ||
|
|
aa3762656b | ||
|
|
7f3b574ca7 | ||
|
|
31b7ce52ad | ||
|
|
be44769e17 | ||
|
|
1bcf14ab41 | ||
|
|
a1c34dea01 | ||
|
|
dac2f1724e | ||
|
|
66da2b621d | ||
|
|
f362bfe257 | ||
|
|
50051dacdb | ||
|
|
503a4c402d |
No files matched your search
@@ -42,6 +42,13 @@ dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.libs'`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.deps'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.o'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.so'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.lo'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.Plo'`
|
||||
rm -f `find $(top_distdir)/external -name '\.dirstamp'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
|
||||
@@ -3366,8 +3366,10 @@ Global
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|wasm.ActiveCfg = Release|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|winaot.ActiveCfg = Debug|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|winaot.ActiveCfg = Release|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.ActiveCfg = Debug|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.ActiveCfg = Release|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.ActiveCfg = Debug|xammac
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.Build.0 = Release|xammac
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
|
||||
+408
-83
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.19.0],
|
||||
AC_INIT(mono, [5.20.1],
|
||||
[https://github.com/mono/mono/issues/new])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -46,7 +46,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
|
||||
# There is no ordering of corlib versions, no old or new,
|
||||
# the runtime expects an exact match.
|
||||
#
|
||||
MONO_CORLIB_VERSION=BEAF66F4-BA36-44C5-974E-83C6F627DF8C
|
||||
MONO_CORLIB_VERSION=B886E13F-6276-4BE5-85F8-C6BF5EDBD200
|
||||
|
||||
#
|
||||
# Put a quoted #define in config.h.
|
||||
@@ -522,6 +522,8 @@ AC_PROG_LD_GNU
|
||||
|
||||
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h sys/sysctl.h libproc.h sys/prctl.h copyfile.h)
|
||||
AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h unwind.h)
|
||||
AC_CHECK_HEADER(unistd.h, [HAVE_UNISTD_H=1], [HAVE_UNISTD_H=0])
|
||||
AC_SUBST(HAVE_UNISTD_H)
|
||||
AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
|
||||
[], [], [#include <stddef.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -578,6 +580,7 @@ AC_CHECK_HEADERS(linux/magic.h)
|
||||
if test x$platform_android = xyes; then
|
||||
AC_CHECK_HEADERS(machine/endian.h sys/endian.h)
|
||||
AC_CHECK_HEADERS(android/legacy_signal_inlines.h, [have_android_signal_inlines=yes], [have_android_signal_inlines=no])
|
||||
AC_CHECK_HEADERS(android/ndk-version.h)
|
||||
|
||||
# Make sure SIGRT{MIN,MAX} work - they will fail to work with unified headers if building for
|
||||
# API level < 21 *and* android/legacy_signal_inlines.h doesn't declare (and define) the required
|
||||
@@ -587,7 +590,8 @@ if test x$platform_android = xyes; then
|
||||
if test x$have_android_signal_inlines = xyes; then
|
||||
AC_MSG_CHECKING([Whether Android SIGRTMIN/SGRTMAX macros are valid])
|
||||
AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([#include <android/legacy_signal_inlines.h>],[
|
||||
AC_LANG_PROGRAM([#include <signal.h>
|
||||
#include <android/legacy_signal_inlines.h>],[
|
||||
int i;
|
||||
for (i = SIGRTMIN + 1; i < SIGRTMAX; ++i) {
|
||||
}
|
||||
@@ -1801,6 +1805,9 @@ AC_TRY_COMPILE([
|
||||
|
||||
AM_CONDITIONAL(ENABLE_GSS, test x$enable_gss = xyes)
|
||||
|
||||
# `target_ios=yes` does not detect watch devices and fails when cross-compiling
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_IPHONE, [mono_native_platform_ios=yes])
|
||||
|
||||
if test x$host_win32 = xno; then
|
||||
dnl *************************************
|
||||
dnl *** Checks for time capabilities ***
|
||||
@@ -2423,7 +2430,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS(pthread.h)
|
||||
AC_CHECK_HEADERS(pthread_np.h)
|
||||
AC_CHECK_FUNCS(pthread_mutex_timedlock)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np pthread_cond_timedwait_relative_np)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_getname_np pthread_setname_np pthread_cond_timedwait_relative_np)
|
||||
AC_CHECK_FUNCS(pthread_kill)
|
||||
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
|
||||
AC_TRY_COMPILE([ #include <pthread.h>], [
|
||||
@@ -2454,6 +2461,7 @@ if test x$host_win32 = xno; then
|
||||
#error "__thread does not currently work with clang on Mac OS X"
|
||||
#endif
|
||||
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
__thread int i;
|
||||
static int res1, res2;
|
||||
@@ -2742,6 +2750,9 @@ if test x$host_win32 = xno; then
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#include <net/if.h>
|
||||
#endif
|
||||
#include <ifaddrs.h>
|
||||
], [
|
||||
getifaddrs(NULL);
|
||||
@@ -2847,6 +2858,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_FUNCS(setpgid)
|
||||
AC_CHECK_FUNCS(system)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
AC_CHECK_FUNCS(waitpid)
|
||||
AC_CHECK_FUNCS(accept4)
|
||||
AC_CHECK_FUNCS(localtime_r)
|
||||
AC_CHECK_FUNCS(mkdtemp)
|
||||
@@ -2962,7 +2974,7 @@ if test x$host_win32 = xno; then
|
||||
fi
|
||||
|
||||
dnl *********************************
|
||||
dnl *** Checks for System.Native ***
|
||||
dnl *** Checks for Mono.Native ***
|
||||
dnl *********************************
|
||||
|
||||
AC_MSG_CHECKING(for linux/in.h)
|
||||
@@ -3015,11 +3027,16 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_TYPES([struct flock64], [AC_DEFINE(HAVE_FLOCK64, 1, struct flock64)], , [#include <fcntl.h>])
|
||||
fi
|
||||
|
||||
if test x$mono_native_platform_ios = xno; then
|
||||
# On iOS, `stat64()` is deprecated and there is no `struct stat64` and `stat()`
|
||||
# is either 32-bit or 64-bit based on the device / simulator that you're running on.
|
||||
AC_CHECK_FUNC(stat64, [AC_DEFINE(HAVE_STAT64, 1, [stat64])])
|
||||
fi
|
||||
|
||||
AC_CHECK_FUNC(lseek64, [AC_DEFINE(HAVE_LSEEK64, 1, [lseek64])])
|
||||
AC_CHECK_FUNC(mmap64, [AC_DEFINE(HAVE_MMAP64, 1, [mmap64])])
|
||||
AC_CHECK_FUNC(ftruncate64, [AC_DEFINE(HAVE_FTRUNCATE64, 1, [ftruncate64])])
|
||||
AC_CHECK_FUNC(posix_fadvise64, [AC_DEFINE(HAVE_POSIX_FADVISE64, 1, [posix_fadvise64])])
|
||||
AC_CHECK_FUNC(stat64, [AC_DEFINE(HAVE_STAT64, 1, [stat64])])
|
||||
AC_CHECK_DECL(pipe2, [AC_DEFINE(HAVE_PIPE2, 1, [pipe2])])
|
||||
AC_CHECK_FUNC(getmntinfo, [AC_DEFINE(HAVE_GETMNTINFO, 1, [getmntinfo])], [], [[#include <unistd.h>]])
|
||||
AC_CHECK_FUNC(strcpy_s, [AC_DEFINE(HAVE_STRCPY_S, 1, [strcpy_s])])
|
||||
@@ -3028,10 +3045,14 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_FUNC(ioctl, [AC_DEFINE(HAVE_IOCTL, 1, [ioctl])])
|
||||
AC_CHECK_FUNC(sched_getaffinity, [AC_DEFINE(HAVE_SCHED_GETAFFINITY, 1, [sched_getaffinity])])
|
||||
AC_CHECK_FUNC(sched_setaffinity, [AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [sched_setaffinity])])
|
||||
|
||||
if test "x$platform_android" != "xyes"; then
|
||||
AC_CHECK_FUNC(arc4random_buf, [AC_DEFINE(HAVE_ARC4RANDOM_BUF, 1, [arc4random_buf])])
|
||||
fi
|
||||
|
||||
AC_CHECK_DECL(TIOCGWINSZ, [AC_DEFINE(HAVE_TIOCGWINSZ, 1, [TIOCGWINSZ])], [], [[#include <sys/ioctl.h>]])
|
||||
AC_CHECK_FUNC(tcgetattr, [AC_DEFINE(HAVE_TCGETATTR, 1, [tcgetattr])])
|
||||
AC_CHECK_FUNC(tcsetattr, [AC_DEFINE(HAVE_TCSETATTR, 1, [tcsetattr])])
|
||||
AC_CHECK_FUNC(arc4random, [AC_DEFINE(HAVE_ARC4RANDOM, 1, [arc4random])])
|
||||
AC_CHECK_DECL(ECHO, [AC_DEFINE(HAVE_ECHO, 1, [ECHO])], [], [[#include <termios.h>]])
|
||||
AC_CHECK_DECL(ICANON, [AC_DEFINE(HAVE_ICANON, 1, [ICANON])], [], [[#include <termios.h>]])
|
||||
AC_CHECK_DECL(TCSANOW, [AC_DEFINE(HAVE_TCSANOW, 1, [TCSANOW])], [], [[#include <termios.h>]])
|
||||
@@ -3068,7 +3089,7 @@ if test x$host_win32 = xno; then
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for readdir_r)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <dirent.h>
|
||||
], [
|
||||
DIR* dir;
|
||||
@@ -3083,7 +3104,7 @@ if test x$host_win32 = xno; then
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for kevent with void *data)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/types.h>
|
||||
#include <sys/event.h>
|
||||
], [
|
||||
@@ -3101,9 +3122,17 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_MEMBER(struct fd_set.__fds_bits, [AC_DEFINE(HAVE_PRIVATE_FDS_BITS, 1, [struct fd_set.__fds_bits])], [], [[#include <sys/select.h>]])
|
||||
|
||||
AC_MSG_CHECKING(for sendfile with 4 arguments)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/sendfile.h>
|
||||
], [
|
||||
#if defined(TARGET_ANDROID)
|
||||
#if !defined(__ANDROID_API__)
|
||||
#error No definition for __ANDROID_API__ even though we're targeting TARGET_ANDROID
|
||||
#elif __ANDROID_API__ < 21
|
||||
#error sendfile is not supported on this Android API level
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int result = sendfile(0, 0, 0, 0);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
@@ -3112,6 +3141,9 @@ if test x$host_win32 = xno; then
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
ORIG_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
|
||||
|
||||
AC_MSG_CHECKING(for sendfile with 6 arguments)
|
||||
AC_TRY_LINK([
|
||||
#include <stdlib.h>
|
||||
@@ -3127,16 +3159,18 @@ if test x$host_win32 = xno; then
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
CFLAGS="$ORIG_CFLAGS"
|
||||
|
||||
AC_CHECK_FUNC(fcopyfile, [AC_DEFINE(HAVE_FCOPYFILE, 1, [fcopyfile])])
|
||||
AC_CHECK_FUNC(epoll_create1, [AC_DEFINE(HAVE_EPOLL, 1, [epoll_create1])])
|
||||
AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [accept4])])
|
||||
AC_CHECK_FUNC(kqueue, [AC_DEFINE(HAVE_KQUEUE, 1, [kqueue])])
|
||||
|
||||
ORIG_CFLAGS="$CFLAGS"
|
||||
CFLAGS="-Werror -Wsign-conversion"
|
||||
CFLAGS="$CFLAGS -Werror=sign-conversion"
|
||||
|
||||
AC_MSG_CHECKING(for getnameinfo with signed flags)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/types.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
@@ -3164,10 +3198,10 @@ if test x$host_win32 = xno; then
|
||||
fi
|
||||
|
||||
ORIG_CFLAGS="$CFLAGS"
|
||||
CFLAGS="-Werror -Wsign-conversion"
|
||||
CFLAGS="$CFLAGS -Werror=sign-conversion"
|
||||
|
||||
AC_MSG_CHECKING(for bind with unsigned addrlen)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/socket.h>
|
||||
], [
|
||||
int fd;
|
||||
@@ -3182,7 +3216,7 @@ if test x$host_win32 = xno; then
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for struct ipv6_mreq with unsigned ipv6mr_interface)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
], [
|
||||
@@ -3197,7 +3231,7 @@ if test x$host_win32 = xno; then
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for inotify_rm_watch with unsigned wd)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/inotify.h>
|
||||
], [
|
||||
intptr_t fd;
|
||||
@@ -3215,6 +3249,9 @@ if test x$host_win32 = xno; then
|
||||
AC_MSG_CHECKING(for shm_open that works well enough with mmap)
|
||||
if test "x$ac_cv_func_shm_open" = "xno" -o "x$ac_cv_func_shm_open_working_with_mmap" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
elif test "x$cross_compiling" = "xyes"; then
|
||||
AC_MSG_RESULT(cross compiling, assuming yes)
|
||||
AC_DEFINE(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP, 1, [shm_open that works well enough with mmap])
|
||||
else
|
||||
AC_TRY_RUN([
|
||||
#include <sys/mman.h>
|
||||
@@ -3246,7 +3283,7 @@ if test x$host_win32 = xno; then
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for getpriority with int who)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/resource.h>
|
||||
], [
|
||||
int which;
|
||||
@@ -3260,7 +3297,7 @@ if test x$host_win32 = xno; then
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for kevent with int parameters)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/types.h>
|
||||
#include <sys/event.h>
|
||||
], [
|
||||
@@ -3278,34 +3315,15 @@ if test x$host_win32 = xno; then
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
ORIG_CFLAGS="$CFLAGS"
|
||||
CFLAGS="-Werror -Wimplicit-function-declaration"
|
||||
AC_CHECK_FUNCS(mkstemps)
|
||||
# AC_CHECK_FUNCS(mkstemp) # already done above
|
||||
|
||||
AC_MSG_CHECKING(for mkstemps)
|
||||
AC_TRY_COMPILE([
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
], [
|
||||
char *template;
|
||||
int suffixlen;
|
||||
int result = mkstemps(template, suffixlen);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_MKSTEMPS, 1, [mkstemps])
|
||||
have_mkstemps=yes
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
CFLAGS="$ORIG_CFLAGS"
|
||||
|
||||
if test "x$have_mkstemps" != "xyes" -a "x$ac_cv_func_mkstemp" != "xyes"; then
|
||||
if test "x$ac_cv_func_mkstemps" != "xyes" -a "x$ac_cv_func_mkstemp" != "xyes"; then
|
||||
AC_MSG_ERROR([Cannot find mkstemps or mkstemp on this platform])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for tcp/var.h)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socketvar.h>
|
||||
#include <netinet/ip.h>
|
||||
@@ -3322,7 +3340,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS([sys/cdefs.h])
|
||||
|
||||
AC_MSG_CHECKING(for TCPSTATE enum in netinet/tcp.h)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#ifdef HAVE_SYS_CDEFS_H
|
||||
#include <sys/cdefs.h>
|
||||
#endif
|
||||
@@ -3355,14 +3373,14 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS([linux/rtnetlink.h])
|
||||
|
||||
AC_CHECK_FUNC(getpeereid, [AC_DEFINE(HAVE_GETPEEREID, 1, [getpeereid])])
|
||||
AC_CHECK_FUNC(getdomainname, [AC_DEFINE(HAVE_GETDOMAINNAME, 1, [getdomainname])])
|
||||
#AC_CHECK_FUNC(getdomainname, [AC_DEFINE(HAVE_GETDOMAINNAME, 1, [getdomainname])]) # already done above
|
||||
AC_CHECK_FUNC(uname, [AC_DEFINE(HAVE_UNAME, 1, [uname])])
|
||||
|
||||
ORIG_CFLAGS="$CFLAGS"
|
||||
CFLAGS="-Werror -Weverything"
|
||||
CFLAGS="$CFLAGS -Werror=shorten-64-to-32"
|
||||
|
||||
AC_MSG_CHECKING(for getdomainname with size_t namelen)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <unistd.h>
|
||||
], [
|
||||
size_t namelen = 20;
|
||||
@@ -3390,7 +3408,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS([crt_externs.h])
|
||||
|
||||
AC_MSG_CHECKING(for _NSGetEnviron)
|
||||
AC_TRY_COMPILE([
|
||||
AC_TRY_LINK([
|
||||
#include <crt_externs.h>
|
||||
], [
|
||||
char **result = *(_NSGetEnviron());
|
||||
@@ -3402,6 +3420,7 @@ if test x$host_win32 = xno; then
|
||||
])
|
||||
|
||||
AC_CHECK_DECL(IN_EXCL_UNLINK, [AC_DEFINE(HAVE_IN_EXCL_UNLINK, 1, [IN_EXCL_UNLINK])], [], [[#include <sys/inotify.h>]])
|
||||
AC_CHECK_DECL(TCP_KEEPALIVE, [AC_DEFINE(HAVE_TCP_H_TCP_KEEPALIVE, 1, [TCP_KEEPALIVE])], [], [[#include <netinet/tcp.h>]])
|
||||
|
||||
else
|
||||
dnl *********************************
|
||||
@@ -3928,7 +3947,7 @@ case "$host" in
|
||||
TARGET=AMD64;
|
||||
arch_target=amd64;
|
||||
if test "x$ac_cv_sizeof_void_p" = "x4"; then
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
fi
|
||||
case $host_os in
|
||||
@@ -4046,6 +4065,14 @@ case "$host" in
|
||||
ACCESS_UNALIGNED="no"
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
;;
|
||||
aarch64-*darwin*ilp32)
|
||||
TARGET=ARM64;
|
||||
arch_target=arm64
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
# assuming no other target other than watchOS is using aarch64*darwin triple
|
||||
TARGET_SYS=WATCHOS
|
||||
;;
|
||||
aarch64-*)
|
||||
# https://lkml.org/lkml/2012/7/15/133
|
||||
TARGET=ARM64
|
||||
@@ -4100,7 +4127,7 @@ if test "x$host" != "x$target"; then
|
||||
# It would be better to just use TARGET_POWERPC64, but lots of code already
|
||||
# uses this define
|
||||
AC_DEFINE(__mono_ppc64__, 1, [...])
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
target_byte_order=G_BIG_ENDIAN
|
||||
;;
|
||||
@@ -4311,6 +4338,7 @@ if test "x$target_mach" = "xyes"; then
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
BTLS_SUPPORTED=no
|
||||
target_ios=yes
|
||||
else
|
||||
AC_TRY_COMPILE([#include "TargetConditionals.h"],[
|
||||
#if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
|
||||
@@ -4511,7 +4539,6 @@ i*86-*-darwin*)
|
||||
esac
|
||||
|
||||
AC_SUBST(ORDER)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(PATHSEP)
|
||||
AC_SUBST(SEARCHSEP)
|
||||
AC_SUBST(OS)
|
||||
@@ -4524,6 +4551,7 @@ AC_DEFINE(HAVE_UWP_WINAPI_SUPPORT, 0, [Don't use UWP Windows API support])
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
AC_CHECK_FUNCS(waitpid)
|
||||
|
||||
AC_ARG_WITH([overridable-allocators], [ --with-overridable-allocators allow g_*alloc/g_free to call custom allocators set via g_mem_set_vtable])
|
||||
|
||||
@@ -4547,8 +4575,6 @@ elif test x$target_ios = xno; then
|
||||
AC_CHECK_FUNCS(strndup getpwuid_r)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators = xyes)
|
||||
|
||||
AC_SEARCH_LIBS(sqrtf, m)
|
||||
|
||||
# nanosleep may not be part of libc, also search it in other libraries
|
||||
@@ -5047,7 +5073,7 @@ dnl **********************
|
||||
dnl *** checked builds ***
|
||||
dnl **********************
|
||||
|
||||
AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable checked build (expensive asserts), configure with a comma-separated LIST of checked build modules and then include that same list in the environment variable MONO_CHECK_MODE at runtime. Recognized checked build modules: all, gc, metadata, thread, private_types],[
|
||||
AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable checked build (expensive asserts), configure with a comma-separated LIST of checked build modules and then include that same list in the environment variable MONO_CHECK_MODE at runtime. Recognized checked build modules: all, gc, metadata, thread, private_types, crash_reporting],[
|
||||
|
||||
if test x$enable_checked_build != x ; then
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD,1,[Enable checked build])
|
||||
@@ -5061,6 +5087,7 @@ AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable check
|
||||
eval "mono_checked_build_test_enable_metadata='yes'"
|
||||
eval "mono_checked_build_test_enable_thread='yes'"
|
||||
eval "mono_checked_build_test_enable_private_types='yes'"
|
||||
eval "mono_checked_build_test_enable_crash_reporting='yes'"
|
||||
fi
|
||||
|
||||
if test "x$mono_checked_build_test_enable_gc" = "xyes"; then
|
||||
@@ -5078,22 +5105,24 @@ AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable check
|
||||
if test "x$mono_checked_build_test_enable_private_types" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD_PRIVATE_TYPES, 1, [Enable private types checked build])
|
||||
fi
|
||||
|
||||
if test "x$mono_checked_build_test_enable_crash_reporting" = "xyes"; then
|
||||
# Required
|
||||
with_overridable_allocators=yes
|
||||
AC_DEFINE(ENABLE_OVERRIDABLE_ALLOCATORS,1,[Overridable allocator support enabled])
|
||||
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD_CRASH_REPORTING, 1, [Enable private types checked build])
|
||||
fi
|
||||
], [])
|
||||
|
||||
dnl End of checked builds
|
||||
|
||||
AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators = xyes)
|
||||
|
||||
AC_CHECK_HEADER([malloc.h],
|
||||
[AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1],
|
||||
[Define to 1 if you have /usr/include/malloc.h.])],,)
|
||||
|
||||
if test x"$GCC" = xyes; then
|
||||
# Implicit function declarations are not 64 bit safe
|
||||
# Do this late, since this causes lots of configure tests to fail
|
||||
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
|
||||
# jay has a lot of implicit declarations
|
||||
JAY_CFLAGS="-Wno-implicit-function-declaration"
|
||||
fi
|
||||
|
||||
# When --disable-shared is used, libtool transforms libmono-2.0.la into libmono-2.0.so
|
||||
# instead of libmono-static.a
|
||||
if test "x$enable_shared" = "xno" -a "x$enable_executables" = "xyes"; then
|
||||
@@ -5114,6 +5143,26 @@ dnl **************
|
||||
AC_ARG_ENABLE(btls, [ --disable-btls Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED)
|
||||
AC_ARG_ENABLE(btls-lib, [ --disable-btls-lib Disable building the BTLS native library], enable_btls_lib=$enableval, enable_btls_lib=$BTLS_SUPPORTED)
|
||||
AC_ARG_WITH(btls_android_ndk, [ --with-btls-android-ndk Android NDK for BoringTls])
|
||||
AC_ARG_WITH(btls_android_api, [ --with-btls-android-api Android NDK API level for BTLS build])
|
||||
AC_ARG_WITH(btls_android_cmake_toolchain, [ --with-btls-android-cmake-toolchain Path to the cmake toolchain file for Android])
|
||||
AC_ARG_WITH(btls_android_ndk_asm_workaround, [ --with-btls-android-ndk-asm-workaround Work around a problem with NDK r18+ clang compiler when compiling some AES assembly for ARM])
|
||||
|
||||
if test "x$with_btls_android_api" = "x" ; then
|
||||
case "$BTLS_PLATFORM" in
|
||||
android-armv5)
|
||||
with_btls_android_api=16" ;;
|
||||
android-armv6)
|
||||
with_btls_android_api=16" ;;
|
||||
android-armv7)
|
||||
with_btls_android_api=16 ;;
|
||||
android-v8a)
|
||||
with_btls_android_api=21 ;;
|
||||
android-x86)
|
||||
with_btls_android_api=16 ;;
|
||||
android-x64)
|
||||
with_btls_android_api=21 ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "x$enable_btls" = "xno"; then
|
||||
enable_btls_lib=no
|
||||
@@ -5171,30 +5220,38 @@ if test "x$enable_btls" = "xyes"; then
|
||||
esac
|
||||
;;
|
||||
android-armv5)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
;;
|
||||
android-armv6)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
;;
|
||||
android-armv7)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
;;
|
||||
android-v8a)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=21"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
;;
|
||||
android-x86)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
;;
|
||||
android-x64)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=21"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(Invalid BTLS platform)
|
||||
esac
|
||||
|
||||
if test "x$platform_android" = "xyes"; then
|
||||
if test "x$with_btls_android_cmake_toolchain" = "x"; then
|
||||
with_btls_android_cmake_toolchain="$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
|
||||
fi
|
||||
|
||||
if test "x$with_btls_android_ndk_asm_workaround" != "x"; then
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DENABLE_NDK_ARM_WORKAROUND=ON"
|
||||
fi
|
||||
|
||||
btls_android=yes
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$with_btls_android_cmake_toolchain"
|
||||
if test "x$with_btls_android_ndk" != "x"; then
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DANDROID_NDK=\"$with_btls_android_ndk\""
|
||||
else
|
||||
@@ -5263,9 +5320,6 @@ AC_SUBST(GTKX11)
|
||||
AC_SUBST(XINERAMA)
|
||||
AC_DEFINE_UNQUOTED(MONO_ARCHITECTURE,"$arch_target",[The architecture this is running on])
|
||||
AC_SUBST(arch_target)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
#This must always be defined when building the runtime
|
||||
AC_DEFINE(MONO_INSIDE_RUNTIME,1, [Disable banned functions from being used by the runtime])
|
||||
@@ -5465,24 +5519,275 @@ AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying
|
||||
AC_CONFIG_COMMANDS([nolock-libtool], [sed -e 's/lock_old_archive_extraction=yes/lock_old_archive_extraction=no/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
|
||||
AC_CONFIG_COMMANDS([clean-llvm], [rm -f llvm/llvm_config.mk])
|
||||
|
||||
#
|
||||
# Mono.Native Support
|
||||
# -------------------
|
||||
# Mono.Native is the new name for both System.Native and System.Security.Cryptography.Apple.
|
||||
# It is built as a stand-alone shared library and not bundled with the runtime because we
|
||||
# may need to build two different versions of it.
|
||||
#
|
||||
# Starting with macOS 10.12+ and iOS 10+, Apple introduced a new Unified API for some of the
|
||||
# crypto primitives that we're using as part of System.Security.Cryptography.Apple.
|
||||
#
|
||||
# On Desktop, we can check at runtime whether the OS version is recent enough and switch
|
||||
# implementation accordingly. We build a single `libmono-native` shared library.
|
||||
#
|
||||
# However, on Mobile we cannot have any undefined symbols as this would break Bitcode.
|
||||
#
|
||||
# During the mobile build, we are called with `CFLAGS` containing an explicit minium version flag,
|
||||
# which is eiter `-mmacosx-version-min=`, `-mios-simulator-version-min=` or `-miphoneos-version-min=`
|
||||
# depending on platform.
|
||||
#
|
||||
# We build two versions of the shared library:
|
||||
# - `libmono-native-compat` is built with whichever minimum version is passed to us via `CFLAGS`.
|
||||
# - `libmono-native-unifed` is built with the minimum version set to macOS 10.12+ / iOS 10+.
|
||||
#
|
||||
# For testing purpuses, there is a function called `mono_native_get_platform_type ()`
|
||||
# (see mono/native/mono-native-platform.c), which returns a `MonoNativePlatformType` enum value.
|
||||
# There is also `Mono.MonoNativePlatform.GetPlatformType ()` (see mcs/class/corlib/Test/Mono/MonoNativePlatform.cs).
|
||||
#
|
||||
# This can be called by automated tests both to ensure that the library has been correctly installed and also
|
||||
# to verify that it's the correct version of it.
|
||||
#
|
||||
|
||||
AC_MSG_CHECKING([Mono.Native support])
|
||||
sed_version_pattern='[[0-9]]\{1,2\}\(\.[[0-9]]\{1,2\}\)'
|
||||
if test x$target_osx = xyes; then
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS=$LDFLAGS
|
||||
|
||||
mono_native=yes
|
||||
MONO_NATIVE_PLATFORM=macos
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_MACOS"
|
||||
|
||||
AC_MONO_APPLE_AVAILABLE(mono_native_compat, [whether we need the compatibility layer],
|
||||
[!(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12)])
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
mono_native_compat=yes
|
||||
mono_native_text="Mac OSX (compat + unified v10.12)"
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS=$MONO_NATIVE_CCASFLAGS
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS=$MONO_NATIVE_CPPFLAGS
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS=$MONO_NATIVE_CXXFLAGS
|
||||
MONO_NATIVE_COMPAT_CFLAGS=$MONO_NATIVE_CFLAGS
|
||||
MONO_NATIVE_COMPAT_LDFLAGS=$MONO_NATIVE_LDFLAGS
|
||||
|
||||
sed_remove_mac_version_pattern="s/-mmacosx-version-min=$sed_version_pattern//g"
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS="`echo $CCASFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS="`echo $CPPFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS="`echo $CXXFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_CFLAGS="`echo $CFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS="`echo $LDFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
else
|
||||
mono_native_compat=no
|
||||
mono_native_text="Mac OSX"
|
||||
fi
|
||||
elif test x$mono_native_platform_ios = xyes; then
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_SIMULATOR, [mono_native_ios_sim=yes], [mono_native_ios_sim=no])
|
||||
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_IOS, [
|
||||
if test x$mono_native_ios_sim = xyes; then
|
||||
mono_native_ios_target=ios-simulator
|
||||
mono_native_text="iOS Simulator"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_IPHONE | MONO_NATIVE_PLATFORM_TYPE_SIMULATOR"
|
||||
else
|
||||
mono_native_ios_target=iphoneos
|
||||
mono_native_text="iOS Device"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_IPHONE | MONO_NATIVE_PLATFORM_TYPE_DEVICE"
|
||||
fi
|
||||
mono_native_unified_version="10.0"
|
||||
mono_native_compat_check="__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_10_0"
|
||||
], [
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_TV, [
|
||||
if test x$mono_native_ios_sim = xyes; then
|
||||
mono_native_ios_target=tvos-simulator
|
||||
mono_native_text="AppleTV Simulator"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_TV | MONO_NATIVE_PLATFORM_TYPE_SIMULATOR"
|
||||
else
|
||||
mono_native_ios_target=tvos
|
||||
mono_native_text="AppleTV Device"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_TV | MONO_NATIVE_PLATFORM_TYPE_DEVICE"
|
||||
fi
|
||||
mono_native_unified_version="10.0"
|
||||
mono_native_compat_check="__TV_OS_VERSION_MIN_REQUIRED >= __TVOS_10_0"
|
||||
], [
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_WATCH, [
|
||||
if test x$mono_native_ios_sim = xyes; then
|
||||
mono_native_ios_target=watchos-simulator
|
||||
mono_native_text="Apple Watch Simulator"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_WATCH | MONO_NATIVE_PLATFORM_TYPE_SIMULATOR"
|
||||
else
|
||||
mono_native_ios_target=watchos
|
||||
mono_native_text="Apple Watch Device"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_WATCH | MONO_NATIVE_PLATFORM_TYPE_DEVICE"
|
||||
fi
|
||||
mono_native_unified_version="5.0"
|
||||
mono_native_compat_check="__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_5_0"
|
||||
], [
|
||||
AC_MSG_ERROR([Unknown iOS Target])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
AC_MONO_APPLE_AVAILABLE(mono_native_compat, [whether we need the compatibility layer], [!($mono_native_compat_check)])
|
||||
|
||||
if test x$with_bitcode = xyes; then
|
||||
mono_native_ldflags="-framework CoreFoundation -framework Foundation -no-undefined -fatal_warnings"
|
||||
MONO_NATIVE_LIBADD="../mini/$LIBMONO_LA"
|
||||
else
|
||||
mono_native_ldflags="-framework CoreFoundation -framework Foundation -fatal_warnings"
|
||||
fi
|
||||
|
||||
if test x$enable_gss = xyes; then
|
||||
mono_native_ldflags="$mono_native_ldflags -framework GSS"
|
||||
fi
|
||||
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS="$LDFLAGS $mono_native_ldflags"
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
mono_native_text="$mono_native_text (compat + unified v$mono_native_unified_version)"
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS=$MONO_NATIVE_CCASFLAGS
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS=$MONO_NATIVE_CPPFLAGS
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS=$MONO_NATIVE_CXXFLAGS
|
||||
MONO_NATIVE_COMPAT_CFLAGS=$MONO_NATIVE_CFLAGS
|
||||
MONO_NATIVE_COMPAT_LDFLAGS=$MONO_NATIVE_LDFLAGS
|
||||
|
||||
sed_remove_ios_version_pattern="s/-m\(.*\)-version-min=$sed_version_pattern//g"
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS="`echo $CCASFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS="`echo $CPPFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS="`echo $CXXFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_CFLAGS="`echo $CFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS="`echo $LDFLAGS $mono_native_ldflags | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
fi
|
||||
|
||||
mono_native=yes
|
||||
MONO_NATIVE_PLATFORM=ios
|
||||
elif test x$host_linux = xyes; then
|
||||
mono_native_text="Linux"
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS=$LDFLAGS
|
||||
|
||||
mono_native=yes
|
||||
mono_native_compat=no
|
||||
MONO_NATIVE_PLATFORM=linux
|
||||
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_LINUX"
|
||||
elif test x$platform_android = xyes; then
|
||||
mono_native_text="Android"
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS=$LDFLAGS
|
||||
MONO_NATIVE_LIBADD="../mini/$LIBMONO_LA"
|
||||
|
||||
mono_native=yes
|
||||
mono_native_compat=no
|
||||
MONO_NATIVE_PLATFORM=android
|
||||
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_ANDROID"
|
||||
else
|
||||
mono_native=no
|
||||
mono_native_text="no"
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT($mono_native_text)
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
MONO_NATIVE_LIBRARY_NAME=libmono-native-compat
|
||||
else
|
||||
MONO_NATIVE_LIBRARY_NAME=libmono-native
|
||||
fi
|
||||
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM)
|
||||
AC_SUBST(MONO_NATIVE_CC)
|
||||
AC_SUBST(MONO_NATIVE_CXX)
|
||||
AC_SUBST(MONO_NATIVE_CCASFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CCASFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CCASFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_CPPFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CPPFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CPPFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_CXXFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CXXFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CXXFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_CFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_LDFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_LDFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_LDFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_LIBRARY_NAME)
|
||||
AC_SUBST(MONO_NATIVE_LIBADD)
|
||||
|
||||
AM_CONDITIONAL(MONO_NATIVE, test x$mono_native = xyes)
|
||||
AM_CONDITIONAL(MONO_NATIVE_COMPAT, test x$mono_native_compat = xyes)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_MACOS, test x$MONO_NATIVE_PLATFORM = xmacos)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_IOS, test x$MONO_NATIVE_PLATFORM = xios)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_LINUX, test x$MONO_NATIVE_PLATFORM = xlinux)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_AIX, test x$MONO_NATIVE_PLATFORM = xaix)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_ANDROID, test x$MONO_NATIVE_PLATFORM = xandroid)
|
||||
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT="$MONO_NATIVE_PLATFORM_TYPE | MONO_NATIVE_PLATFORM_TYPE_COMPAT"
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED="$MONO_NATIVE_PLATFORM_TYPE | MONO_NATIVE_PLATFORM_TYPE_UNIFIED"
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM_TYPE)
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM_TYPE_COMPAT)
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM_TYPE_UNIFIED)
|
||||
|
||||
### Set -Werror options
|
||||
#
|
||||
# Anything involving -Werror must be done late because autoconf depends on compiling with warnings to be success.
|
||||
#
|
||||
if test x"$GCC" = xyes; then
|
||||
|
||||
# incompatible-pointer-types requires gcc circa 5.x
|
||||
if test "x$with_jemalloc" != "xyes"; then
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Wincompatible-pointer-types -Werror"
|
||||
AC_MSG_CHECKING(for -Wincompatible-pointer-types option to gcc)
|
||||
AC_TRY_COMPILE([],[
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
CFLAGS="$ORIG_CFLAGS -Werror=incompatible-pointer-types"
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS=$ORIG_CFLAGS
|
||||
])
|
||||
# incompatible-pointer-types requires gcc circa 5.x
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Wincompatible-pointer-types -Werror"
|
||||
AC_MSG_CHECKING(for -Wincompatible-pointer-types option to gcc)
|
||||
AC_TRY_COMPILE([],[
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
CFLAGS="$ORIG_CFLAGS -Werror=incompatible-pointer-types"
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS=$ORIG_CFLAGS
|
||||
])
|
||||
|
||||
CFLAGS="$CFLAGS -Werror=return-type"
|
||||
fi
|
||||
|
||||
# Implicit function declarations are not 64 bit safe
|
||||
# Do this late, since this causes lots of configure tests to fail
|
||||
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
|
||||
# jay has a lot of implicit declarations
|
||||
JAY_CFLAGS="-Wno-implicit-function-declaration"
|
||||
fi
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
# Update all submodules recursively to ensure everything is checked out
|
||||
(cd $srcdir && scripts/update_submodules.sh)
|
||||
|
||||
@@ -5496,6 +5801,7 @@ scripts/mono-find-requires
|
||||
mk/Makefile
|
||||
mono/Makefile
|
||||
mono/btls/Makefile
|
||||
mono/native/Makefile
|
||||
mono/utils/Makefile
|
||||
mono/utils/jemalloc/Makefile
|
||||
mono/metadata/Makefile
|
||||
@@ -5511,6 +5817,9 @@ mono/arch/arm/Makefile
|
||||
mono/arch/arm64/Makefile
|
||||
mono/arch/mips/Makefile
|
||||
mono/sgen/Makefile
|
||||
mono/native/platform-type.c
|
||||
mono/native/platform-type-compat.c
|
||||
mono/native/platform-type-unified.c
|
||||
mono/tests/Makefile
|
||||
mono/tests/assembly-load-reference/Makefile
|
||||
mono/tests/tests-config
|
||||
@@ -5692,6 +6001,21 @@ fi
|
||||
echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make
|
||||
fi
|
||||
|
||||
if test "x$mono_native" = "xyes"; then
|
||||
echo "MONO_NATIVE_SUPPORTED=true" >> $srcdir/$mcsdir/build/config.make
|
||||
else
|
||||
echo "MONO_NATIVE_SUPPORTED=false" >> $srcdir/$mcsdir/build/config.make
|
||||
fi
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
echo "MONO_NATIVE_USING_COMPAT=true" >> $srcdir/$mcsdir/build/config.make
|
||||
else
|
||||
echo "MONO_NATIVE_USING_COMPAT=false" >> $srcdir/$mcsdir/build/config.make
|
||||
fi
|
||||
|
||||
echo "MONO_NATIVE_PLATFORM_TYPE=$MONO_NATIVE_PLATFORM_TYPE" >> $srcdir/$mcsdir/build/config.make
|
||||
echo "MONO_NATIVE_PLATFORM=$MONO_NATIVE_PLATFORM" >> $srcdir/$mcsdir/build/config.make
|
||||
|
||||
fi
|
||||
|
||||
)
|
||||
@@ -5734,6 +6058,7 @@ echo "
|
||||
DTrace: $enable_dtrace
|
||||
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm, built in-tree: $internal_llvm, assertions: $enable_llvm_asserts)
|
||||
Spectre: $spectre_mitigation_status
|
||||
Mono.Native: $mono_native_text
|
||||
|
||||
Libraries:
|
||||
.NET 4.x: $with_profile4_x
|
||||
@@ -5752,7 +6077,7 @@ echo "
|
||||
zlib: $zlib_msg
|
||||
BTLS: $enable_btls$btls_platform_string
|
||||
jemalloc: $with_jemalloc (always use: $with_jemalloc_always)
|
||||
crash reporting: $crash_reporting
|
||||
crash reporting: $crash_reporting (private crashes: $with_crash_privacy)
|
||||
$disabled
|
||||
"
|
||||
if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
|
||||
|
||||
+3
-2
@@ -11,8 +11,9 @@
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/libmono-system-native@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/libmono-system-net-security-native@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Security.Cryptography.Native.Apple" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="osx" />
|
||||
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: ddf8f364be...0d0099c3d6.
Vendored
+1
-1
Submodule external/binary-reference-assemblies updated: bdc6cdaabf...9334822c58.
Vendored
+1
-1
Submodule external/bockbuild updated: 4a3e9edd27...276398e269.
Vendored
+1
-1
Submodule external/boringssl updated: 41221b45aa...3d87996698.
Vendored
+1
-1
Submodule external/cecil updated: b6c50e3d34...e5d5fa4a73.
Vendored
+1
-1
Submodule external/corefx updated: 492f805884...7524de0039.
Vendored
+1
-1
Submodule external/corert updated: efd29b5cf8...1b7d4a1e4b.
Vendored
+1
-1
Submodule external/linker updated: 08db69b6eb...e6760e6f54.
Vendored
+1
-1
Submodule external/nunit-lite updated: e64e0197a8...cff3321322.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 09a97af42a...249709faa5.
Vendored
+1
-1
Submodule external/xunit-binaries updated: 3c3659bc0f...bb583470c7.
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"name": "llvm",
|
||||
"url": "git://github.com/mono/llvm.git",
|
||||
"rev": "81376d161cb6c2230834b2dc096ccbdae8d93020",
|
||||
"rev": "349752c464c5fc93b32e7d45825f2890c85c8b7d",
|
||||
"remote-branch": "origin/release_60",
|
||||
"branch": "release_60",
|
||||
"directory": "llvm"
|
||||
|
||||
@@ -47,6 +47,7 @@ $(LLVM_PATH)/CMakeLists.txt: | $(LLVM_PATH)
|
||||
|
||||
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",)
|
||||
|
||||
# -DLLVM_ENABLE_LIBXML2=Off is needed because xml2 is not used and it breaks 32-bit builds on 64-bit Linux hosts
|
||||
$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt | $(LLVM_BUILD)
|
||||
cd $(LLVM_BUILD) && $(CMAKE) \
|
||||
$(if $(NINJA),-G Ninja) \
|
||||
@@ -60,6 +61,8 @@ $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt |
|
||||
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \
|
||||
$(EXTRA_LLVM_ARGS) \
|
||||
-DLLVM_ENABLE_ASSERTIONS=$(if $(INTERNAL_LLVM_ASSERTS),On,Off) \
|
||||
-DLLVM_ENABLE_LIBXML2=Off \
|
||||
-DHAVE_FUTIMENS=0 \
|
||||
$(LLVM_CMAKE_ARGS) \
|
||||
$(dir $<)
|
||||
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# Usage:
|
||||
# AC_MONO_APPLE_TARGET(target-name, action-if-found, action-if-not-found)
|
||||
#
|
||||
# Checks whether `target-name` is defined in "TargetConditionals.h"
|
||||
#
|
||||
AC_DEFUN([AC_MONO_APPLE_TARGET], [
|
||||
AC_MONO_APPLE_AVAILABLE([$1], [for $1], [$1 == 1], $2, $3)
|
||||
])
|
||||
|
||||
|
||||
# Usage:
|
||||
# AC_MONO_APPLE_AVAILABLE(name, message, conditional, action-if-found, action-if-not-found)
|
||||
#
|
||||
# Checks for `conditional` using "TargetConditionals.h" and "AvailabilityMacros.h"
|
||||
#
|
||||
AC_DEFUN([AC_MONO_APPLE_AVAILABLE], [
|
||||
# cache the compilation check
|
||||
AC_CACHE_CHECK([$2], [ac_cv_apple_available_[]$1], [
|
||||
AC_TRY_COMPILE([
|
||||
#include "TargetConditionals.h"
|
||||
#include "AvailabilityMacros.h"
|
||||
],[
|
||||
#if !($3)
|
||||
#error failed
|
||||
#endif
|
||||
], [
|
||||
ac_cv_apple_available_[]$1=yes
|
||||
], [
|
||||
ac_cv_apple_available_[]$1=no
|
||||
])
|
||||
])
|
||||
# keep the actions out of the cache check because they need to be always executed.
|
||||
if test x$ac_cv_apple_available_[]$1 = xyes; then
|
||||
$1=yes
|
||||
[$4]
|
||||
else
|
||||
$1=no
|
||||
[$5]
|
||||
fi
|
||||
])
|
||||
@@ -335,6 +335,9 @@ format.
|
||||
.SS Options
|
||||
The AOT profiler supports the following options:
|
||||
.TP
|
||||
\fBduration\fR=\fInum\fR
|
||||
Profile only NUM seconds of runtime and then write the data.
|
||||
.TP
|
||||
\fBhelp\fR
|
||||
Print usage instructions.
|
||||
.TP
|
||||
|
||||
@@ -15,7 +15,6 @@ apidiff/*
|
||||
csprojdiff/*
|
||||
errors/*.log
|
||||
errors/dummy.xml
|
||||
class/Mono.Data.Sqlite/test.db
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs
|
||||
|
||||
+5
-2
@@ -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),' $< > $@
|
||||
|
||||
@@ -32,10 +32,10 @@ mono_libdir = $(exec_prefix)/lib
|
||||
sysconfdir = $(prefix)/etc
|
||||
#RUNTIME = mono
|
||||
RUNTIME = false
|
||||
MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/
|
||||
MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)
|
||||
MONO_PATH_TESTS = $(MONO_PATH_TOP)/tests
|
||||
TEST_MONO_PATH = $(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR).$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
TEST_MONO_PATH = $(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)$(PLATFORM_PATH_SEPARATOR).
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
|
||||
# In case you want to add MCS_FLAGS, this lets you not have to
|
||||
# keep track of the default value
|
||||
|
||||
@@ -7,3 +7,5 @@ NO_THREAD_ABORT=1
|
||||
NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_MULTIPLE_APPDOMAINS=1
|
||||
NO_PROCESS_START=1
|
||||
NO_GSS=1
|
||||
NO_VTS_TEST=1
|
||||
@@ -8,3 +8,5 @@ NO_THREAD_SUSPEND_RESUME=1
|
||||
# The binding generator (btv) still needs to execute processes,
|
||||
# so we need a System.dll that can do that.
|
||||
#NO_PROCESS_START=1
|
||||
|
||||
NO_GSS=1
|
||||
@@ -9,6 +9,8 @@ NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_MULTIPLE_APPDOMAINS=1
|
||||
NO_PROCESS_START=1
|
||||
NO_MONO_SECURITY=1
|
||||
NO_GSS=1
|
||||
MONO_FEATURE_APPLETLS=
|
||||
ONLY_APPLETLS=
|
||||
MONO_FEATURE_APPLE_X509=1
|
||||
NO_VTS_TEST=1
|
||||
@@ -6,6 +6,7 @@ PROFILE_MCS_FLAGS += \
|
||||
|
||||
NO_THREAD_ABORT=1
|
||||
NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_GSS=1
|
||||
# The binding generator (bwatch) still needs to execute processes,
|
||||
# so we need a System.dll that can do that.
|
||||
#NO_PROCESS_START=1
|
||||
|
||||
@@ -54,7 +54,7 @@ INTERNAL_CSC_LOCATION = $(CSC_LOCATION)
|
||||
INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION)
|
||||
|
||||
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe
|
||||
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe
|
||||
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/cil-stringreplacer.exe
|
||||
ILASM = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/ilasm.exe
|
||||
GENSOURCES_LIBDIR = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)
|
||||
GENSOURCES_CS = $(topdir)/build/gensources.cs
|
||||
|
||||
+34
-20
@@ -19,13 +19,22 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
## Unit test support
|
||||
ifndef NO_TEST
|
||||
|
||||
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)
|
||||
XTEST_REMOTE_EXECUTOR = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp.exe
|
||||
XTEST_REMOTE_EXECUTOR = $(test_lib_dir)/RemoteExecutorConsoleApp.exe
|
||||
|
||||
ifeq ($(BUILD_PLATFORM), win32)
|
||||
XTEST_REMOTE_EXECUTOR_ABSPATH = $(shell cygpath -w $(abspath $(XTEST_REMOTE_EXECUTOR)))
|
||||
else
|
||||
XTEST_REMOTE_EXECUTOR_ABSPATH = $(abspath $(XTEST_REMOTE_EXECUTOR))
|
||||
endif
|
||||
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \
|
||||
@@ -35,8 +44,15 @@ $(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
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
|
||||
ifeq ($(PROFILE),monotouch_tv)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
ifeq ($(PROFILE),monotouch_watch)
|
||||
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
|
||||
|
||||
@@ -62,6 +78,7 @@ test_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll.sources)
|
||||
endif
|
||||
|
||||
test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll)
|
||||
test_lib_output = $(test_lib_dir)/$(test_lib)
|
||||
|
||||
test_sourcefile_excludes = $(test_lib).exclude.sources
|
||||
|
||||
@@ -73,12 +90,13 @@ ifndef NO_BUILD
|
||||
test_flags += -r:$(the_assembly)
|
||||
test_assembly_dep = $(the_assembly)
|
||||
endif
|
||||
tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag)
|
||||
tests_CLEAN_FILES += $(test_lib_output) $(test_lib_output:$(ASSEMBLY_EXT)=.pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
xtest_sourcefile = $(PROFILE_PLATFORM)_$(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
xtest_sourcefile_excludes = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.exclude.sources)
|
||||
|
||||
xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
|
||||
xtest_lib_output = $(test_lib_dir)/$(xunit_test_lib)
|
||||
|
||||
xtest_response = $(depsdir)/$(xunit_test_lib).response
|
||||
xtest_makefrag = $(depsdir)/$(xunit_test_lib).makefrag
|
||||
@@ -86,7 +104,7 @@ xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LI
|
||||
|
||||
ifeq ($(wildcard $(xtest_sourcefile)),)
|
||||
xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
tests_CLEAN_FILES += $(xunit_test_lib) $(xtest_response) $(xtest_makefrag)
|
||||
tests_CLEAN_FILES += $(xtest_lib_output) $(xtest_response) $(xtest_makefrag)
|
||||
endif
|
||||
|
||||
ifndef HAVE_CS_TESTS
|
||||
@@ -113,10 +131,6 @@ endif
|
||||
|
||||
test_assemblies :=
|
||||
|
||||
test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
|
||||
|
||||
test_lib_output = $(topdir)/class/lib/$(PROFILE)/tests/$(test_lib)
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
test_assemblies += $(test_lib_output)
|
||||
|
||||
@@ -162,7 +176,7 @@ endif
|
||||
|
||||
NUNITLITE_CONFIG_FILE=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)nunit-lite-console.exe.config
|
||||
|
||||
$(test_lib_output).nunitlite.config: $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(TEST_NUNITLITE_APP_CONFIG_GLOBAL) $(TEST_NUNITLITE_APP_CONFIG_RUNTIME) $(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL)
|
||||
$(test_lib_output).nunitlite.config: $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(TEST_NUNITLITE_APP_CONFIG_GLOBAL) $(TEST_NUNITLITE_APP_CONFIG_RUNTIME) $(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL) | $(test_lib_dir)
|
||||
cp -f $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(test_lib_output).nunitlite.config
|
||||
ifdef TEST_NUNITLITE_APP_CONFIG_GLOBAL
|
||||
sed -i -e "/__INSERT_CUSTOM_APP_CONFIG_GLOBAL__/r $(TEST_NUNITLITE_APP_CONFIG_GLOBAL)" $(test_lib_output).nunitlite.config
|
||||
@@ -248,7 +262,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).nunitlite.config
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_output).nunitlite.config | $(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
|
||||
@@ -311,23 +325,23 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
|
||||
endif
|
||||
|
||||
check: run-xunit-test-local
|
||||
xunit-test-local: $(xunit_test_lib)
|
||||
xunit-test-local: $(xtest_lib_output)
|
||||
run-xunit-test-local: run-xunit-test-lib
|
||||
|
||||
# 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 $(XTEST_REMOTE_EXECUTOR)
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll xunit.execution.dotnet.dll
|
||||
run-xunit-test-lib: xunit-test-local
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
ok=:; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
|
||||
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) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
|
||||
if [ -n "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE" ]; then echo "$(abspath $(XTEST_RESULT_FILE))" >> "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE"; fi; \
|
||||
$$ok
|
||||
@rm -f xunit.execution.dotnet.dll
|
||||
@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:$@
|
||||
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src)
|
||||
$(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
|
||||
@@ -339,7 +353,7 @@ $(xtest_response): $(xtest_sourcefile) $(wildcard *xtest.dll.sources) $(wildcard
|
||||
|
||||
$(xtest_makefrag): $(xtest_response)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(xunit_test_lib): ,' $< >$@
|
||||
@sed 's,^,$(xtest_lib_output): ,' $< >$@
|
||||
|
||||
-include $(xtest_makefrag)
|
||||
|
||||
|
||||
@@ -31,51 +31,106 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch_watch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch_watch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
|
||||
<OutputPath>./../../../class/lib/monotouch_tv/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
|
||||
<OutputPath>./../../../class/lib/monotouch_tv/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<OutputPath>./../../../class/lib/xammac/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<OutputPath>./../../../class/lib/xammac/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
|
||||
<OutputPath>./../../../class/lib/orbis/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;ORBIS;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
|
||||
<OutputPath>./../../../class/lib/orbis/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;ORBIS;DISABLE_REMOTING;DISABLE_COM;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;ORBIS;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'unreal' ">
|
||||
<OutputPath>./../../../class/lib/unreal/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'unreal' ">
|
||||
<OutputPath>./../../../class/lib/unreal/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'wasm' ">
|
||||
<OutputPath>./../../../class/lib/wasm/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'wasm' ">
|
||||
<OutputPath>./../../../class/lib/wasm/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -96,8 +151,60 @@
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!--Per-profile files-->
|
||||
<Choose>
|
||||
<When Condition="'$(Platform)' == 'xammac'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'winaot'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'wasm'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'unreal'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'orbis'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'net_4_x'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monotouch_watch'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monotouch_tv'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monotouch'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monodroid'">
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Common\src\System\Drawing\KnownColor.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Common\src\System\Drawing\KnownColorTable.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Common\src\System\Numerics\Hashing\HashHelpers.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\ColorConverter.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SystemColors.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\Color.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\Point.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\PointF.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\Rectangle.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\RectangleF.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\Size.cs" />
|
||||
<Compile Include="..\..\..\..\external\corefx\src\System.Drawing.Primitives\src\System\Drawing\SizeF.cs" />
|
||||
<Compile Include="..\..\..\build\common\SR.cs" />
|
||||
<Compile Include="SR.cs" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
<!--End of per-profile files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
@@ -106,6 +213,12 @@
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -12,7 +12,7 @@ LIBRARY = System.Drawing.Common.dll
|
||||
KEYFILE = ../../Open.snk
|
||||
LIBRARY_SNK = $(KEYFILE)
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS =
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
|
||||
|
||||
ifdef false # we'll enable this at a later point
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
|
||||
partial class SR
|
||||
{
|
||||
public const string InvalidColor = "Color '{0}' is not valid.";
|
||||
public const string InvalidEx2BoundArgument = "Value of '{1}' is not valid for '{0}'. '{0}' should be greater than or equal to {2} and less than or equal to {3}.";
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,17 @@
|
||||
#include System.Drawing.Common.dll.sources
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/KnownColor.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Point.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/PointF.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Rectangle.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/RectangleF.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Size.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs
|
||||
../../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/KnownColorTable.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/ColorTable.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs
|
||||
../../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/SystemColors.cs
|
||||
../../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/ColorConverter.cs
|
||||
../../../build/common/SR.cs
|
||||
SR.cs
|
||||
+16
-2
@@ -36,6 +36,11 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -149,11 +154,20 @@
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../System.Drawing.Common/Facades_System.Drawing.Common.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../System.Drawing.Common/Facades_System.Drawing.Common.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
|
||||
@@ -20,6 +20,12 @@ LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
|
||||
# TODO: find a better solution.
|
||||
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
|
||||
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
# XA implements System.Drawing API inside Mono.Android
|
||||
API_BIN_REFS := Mono.Android
|
||||
LIB_REFS += Facades/System.Drawing.Common
|
||||
else
|
||||
|
||||
ifndef EMBEDDED_DRAWING_DEP
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
@@ -29,12 +35,12 @@ ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
else
|
||||
# When System.Drawing.dll is not built in the Mono repo but in
|
||||
# the product repo like in the XI/XA case we need to pass in a reference
|
||||
# the product repo like in the XI case we need to pass in a reference
|
||||
# to the assembly containing drawing types like Rectangle etc. from there.
|
||||
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
|
||||
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
|
||||
endif
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
@@ -36,6 +36,11 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -128,12 +133,22 @@
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
<ProjectReference Include="../System.Drawing.Common/Facades_System.Drawing.Common.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
<ProjectReference Include="../System.Drawing.Common/Facades_System.Drawing.Common.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
|
||||
@@ -25,6 +25,12 @@ else
|
||||
LIB_REFS += System.Web
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
# XA implements System.Drawing API inside Mono.Android
|
||||
API_BIN_REFS := Mono.Android
|
||||
LIB_REFS += Facades/System.Drawing.Common
|
||||
else
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
|
||||
|
||||
@@ -48,7 +54,7 @@ else
|
||||
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
|
||||
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
|
||||
endif
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
@@ -36,10 +36,13 @@ System.Security.Cryptography.X509Certificates System.Runtime.Serialization.Primi
|
||||
# common_SUBDIRS dependencies
|
||||
common_DEPS_SUBDIRS :=
|
||||
|
||||
netstandard_drawing_SUBDIRS = System.Drawing.Primitives netstandard
|
||||
netstandard_drawing_SUBDIRS = System.Drawing.Common System.Drawing.Primitives netstandard
|
||||
|
||||
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
monodroid_SUBDIRS = $(monotouch_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
monodroid_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
# We don't build netstandard/System.Drawing.Primitives on monotouch etc. profiles by default,
|
||||
# except when EXTERNAL_FACADE_DRAWING_REFERENCE is defined which allows us to build it in Mono CI
|
||||
@@ -51,7 +54,7 @@ endif
|
||||
testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Primitives netstandard
|
||||
net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS) System.Net.Http.Rtc
|
||||
|
||||
basic_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
|
||||
@@ -64,9 +67,6 @@ System.Text.Encoding.CodePages
|
||||
|
||||
build_PARALLEL_SUBDIRS = $(basic_PARALLEL_SUBDIRS) System.Text.RegularExpressions System.Diagnostics.Contracts
|
||||
|
||||
monodroid_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
monodroid_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
xammac_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
xammac_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
@@ -80,19 +80,19 @@ monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Security.Cryptography.OpenSsl System.Threading.Tasks.Extensions \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory \
|
||||
System.Drawing.Common System.Buffers
|
||||
System.Buffers
|
||||
|
||||
PROFILE_PARALLEL_SUBDIRS = $(net_4_x_PARALLEL_SUBDIRS)
|
||||
+7
-2
@@ -31,6 +31,9 @@ basic_SUBDIRS := \
|
||||
../ilasm \
|
||||
corlib/il
|
||||
|
||||
# Tooling dependencies of mscorlib, we build them to /tmp folder for MONO_PATH to work
|
||||
# reliably for clean and update builds. All deps are built against stable API to run with
|
||||
# range of boostrap versions and .NET at the same time
|
||||
build_SUBDIRS = \
|
||||
Mono.Cecil \
|
||||
$(MCS_MODE_dirs) \
|
||||
@@ -114,7 +117,8 @@ testing_aot_hybrid_dirs_parallel := $(testing_aot_full_dirs_parallel)
|
||||
|
||||
xammac_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
Mono.CompilerServices.SymbolWriter
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
Mono.CSharp
|
||||
|
||||
monodroid_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
@@ -131,7 +135,8 @@ monodroid_tools_dirs_parallel := \
|
||||
monotouch_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
Mono.Simd \
|
||||
Mono.CSharp
|
||||
Mono.CSharp \
|
||||
Mono.Runtime.Tests
|
||||
|
||||
monotouch_watch_dirs_parallel := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs_parallel))
|
||||
|
||||
|
||||
@@ -12,12 +12,7 @@ KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS =
|
||||
|
||||
TEST_RESOURCE_FILES = \
|
||||
$(wildcard Test/resources/*.csproj) \
|
||||
Test/resources/TestTasks.dll
|
||||
|
||||
ifndef MCS_MODE
|
||||
TEST_RESOURCE_FILES += Test/resources/TestTasks.pdb
|
||||
endif
|
||||
$(wildcard Test/resources/*.csproj)
|
||||
|
||||
TEST_MCS_FLAGS = $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
|
||||
TEST_LIB_REFS = $(XBUILD_FRAMEWORK) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Xml
|
||||
@@ -32,13 +27,13 @@ CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$
|
||||
Test/resources/TestTasks-$(PROFILE).dll: Test/resources/TestTasks.cs
|
||||
$(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)/mscorlib.dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library
|
||||
|
||||
test-local: compile-resources
|
||||
TEST_MCS_FLAGS += -resource:Test/resources/TestTasks-$(PROFILE).dll,Test/resources/TestTasks.dll
|
||||
|
||||
compile-resources: Test/resources/TestTasks-$(PROFILE).dll
|
||||
cp Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks.dll
|
||||
ifndef MCS_MODE
|
||||
cp Test/resources/TestTasks-$(PROFILE).pdb Test/resources/TestTasks.pdb
|
||||
TEST_MCS_FLAGS += -resource:Test/resources/TestTasks-$(PROFILE).pdb,Test/resources/TestTasks.pdb
|
||||
endif
|
||||
|
||||
test-local: Test/resources/TestTasks-$(PROFILE).dll
|
||||
|
||||
include $(XBUILD_DIR)/xbuild_test.make
|
||||
include ../../build/library.make
|
||||
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources
|
||||
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs
|
||||
@@ -75,6 +75,11 @@
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<OutputPath>./../../class/lib/xammac</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../class/lib/xammac_net_4_5</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac_net_4_5</IntermediateOutputPath>
|
||||
@@ -123,6 +128,9 @@
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Compile Include="testing_aot_full-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<Compile Include="xammac-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<Compile Include="xammac_net_4_5-parser.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -10,6 +10,7 @@ API_BUILD := $(filter basic build, $(PROFILE))
|
||||
ifdef API_BUILD
|
||||
DEFAULT_REFERENCES =
|
||||
API_BIN_REFS = System mscorlib
|
||||
LIBRARY_USE_INTERMEDIATE_FILE = 1
|
||||
else
|
||||
LIB_REFS = System
|
||||
endif
|
||||
|
||||
@@ -10,6 +10,7 @@ API_BUILD := $(filter basic build, $(PROFILE))
|
||||
ifdef API_BUILD
|
||||
DEFAULT_REFERENCES =
|
||||
API_BIN_REFS = System.Core System mscorlib
|
||||
LIBRARY_USE_INTERMEDIATE_FILE = 1
|
||||
else
|
||||
LIB_REFS = System.Core System
|
||||
endif
|
||||
|
||||
@@ -180,6 +180,7 @@
|
||||
<Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\Disposable.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\MergeSort.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\Type.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />
|
||||
<Compile Include="Consts.cs" />
|
||||
|
||||
@@ -15,10 +15,13 @@ KEYFILE = ../mono.pub
|
||||
LIB_MCS_FLAGS = /unsafe \
|
||||
$(RESOURCES:%=-resource:%) -d:SQLITE_STANDARD
|
||||
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
|
||||
TEST_RESOURCE_FILES = Test/test.db
|
||||
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
|
||||
|
||||
EXTRA_DISTFILES = Test/SqliteTest.cs \
|
||||
Test/test.sql \
|
||||
$(TEST_RESOURCE_FILES) \
|
||||
resources/SR.resx \
|
||||
resources/DataTypes.xml \
|
||||
resources/MetaDataCollections.xml \
|
||||
@@ -29,11 +32,9 @@ CLEAN_FILES += $(RESX_RESOURCES)
|
||||
|
||||
CLEAN_FILES = $(RESX_RESOURCES)
|
||||
|
||||
test-local: test.db
|
||||
|
||||
test.db: Test/test.sql
|
||||
Test/test.db: Test/test.sql
|
||||
rm -f $@
|
||||
sqlite3 $@ < $< || :
|
||||
sqlite3 $@ < $<
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
../../test-helpers/TestResourceHelper.cs
|
||||
SqliteCommandUnitTests.cs
|
||||
SqliteConnectionTest.cs
|
||||
SqliteDataAdapterUnitTests.cs
|
||||
|
||||
@@ -37,12 +37,14 @@ using Mono.Data.Sqlite;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
using MonoTests.Helpers;
|
||||
|
||||
namespace MonoTests.Mono.Data.Sqlite
|
||||
{
|
||||
[TestFixture]
|
||||
public class SqliteDataReaderTest
|
||||
{
|
||||
readonly static string _uri = "./test.db";
|
||||
readonly static string _uri = TestResourceHelper.GetFullPathOfResource("Test/test.db");
|
||||
readonly static string _connectionString = "URI=file://" + _uri + ", version=3";
|
||||
SqliteConnection _conn = new SqliteConnection ();
|
||||
|
||||
|
||||
Binary file not shown.
@@ -1 +0,0 @@
|
||||
#include Mono.Data.Sqlite_test.dll.sources
|
||||
@@ -0,0 +1,3 @@
|
||||
Bug27864.cs
|
||||
SqliteDataReaderTest.cs
|
||||
SqliteTests.cs
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_Mono.Data.Sqlite_test.dll.exclude.sources
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_Mono.Data.Sqlite_test.dll.exclude.sources
|
||||
@@ -8,18 +8,13 @@ LIB_REFS = System Mono.Cecil System.Core
|
||||
LIB_MCS_FLAGS = /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS /publicsign
|
||||
KEYFILE = $(LIBRARY_SNK)
|
||||
|
||||
TEST_MCS_FLAGS =
|
||||
TEST_LIB_REFS = Mono.Cecil System System.Core
|
||||
|
||||
VALID_TEST_PROFILE := $(filter net_4_x, $(PROFILE))
|
||||
|
||||
# The test exe is not profile specific, and compiling a 2.0 will make the 4.5 tests fail
|
||||
ifdef VALID_TEST_PROFILE
|
||||
|
||||
test-local: dtest-app.exe dtest-excfilter.exe
|
||||
|
||||
dtest-excfilter.exe: Test/dtest-excfilter.il
|
||||
$(ILASM) -out:$@ /exe /debug Test/dtest-excfilter.il
|
||||
test-local: build-dtest
|
||||
|
||||
else
|
||||
|
||||
@@ -28,20 +23,29 @@ check:
|
||||
|
||||
endif
|
||||
|
||||
test_output_dir=$(topdir)/class/lib/$(PROFILE)/tests
|
||||
|
||||
$(test_output_dir):
|
||||
mkdir -p $@
|
||||
|
||||
build-dtest: $(test_output_dir)/dtest-app.exe $(test_output_dir)/dtest-excfilter.exe
|
||||
|
||||
$(test_output_dir)/dtest-excfilter.exe: Test/dtest-excfilter.il | $(test_output_dir)
|
||||
$(ILASM) -out:$@ /exe /debug Test/dtest-excfilter.il
|
||||
|
||||
$(test_output_dir)/dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES) | $(test_output_dir)
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES)
|
||||
|
||||
TEST_HELPERS_SOURCES = \
|
||||
../test-helpers/NetworkHelpers.cs \
|
||||
Test/TypeLoadClass.cs
|
||||
|
||||
dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES)
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES)
|
||||
|
||||
CLEAN_FILES = dtest-app.exe dtest-app.exe.mdb dtest-app.pdb dtest-excfilter.exe dtest-excfilter.exe.mdb dtest-excfilter.pdb
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
Test/dtest-app.cs \
|
||||
Test/dtest.cs \
|
||||
Test/dtest-excfilter.il
|
||||
Test/dtest-excfilter.il \
|
||||
$(TEST_HELPERS_SOURCES)
|
||||
|
||||
#NO_TEST = yes
|
||||
CLEAN_FILES = $(addprefix $(test_output_dir)/, dtest-app.exe dtest-app.exe.mdb dtest-app.pdb dtest-excfilter.exe dtest-excfilter.exe.mdb dtest-excfilter.pdb)
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -85,6 +85,31 @@ public class Tests2 {
|
||||
}
|
||||
}
|
||||
|
||||
public struct TestEnumeratorInsideGenericStruct<TKey, TValue>
|
||||
{
|
||||
private KeyValuePair<TKey, TValue> _bucket;
|
||||
private Position _currentPosition;
|
||||
internal TestEnumeratorInsideGenericStruct(KeyValuePair<TKey, TValue> bucket)
|
||||
{
|
||||
_bucket = bucket;
|
||||
_currentPosition = Position.BeforeFirst;
|
||||
}
|
||||
|
||||
public KeyValuePair<TKey, TValue> Current
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_currentPosition == Position.BeforeFirst)
|
||||
return _bucket;
|
||||
return _bucket;
|
||||
}
|
||||
}
|
||||
private enum Position
|
||||
{
|
||||
BeforeFirst
|
||||
}
|
||||
}
|
||||
|
||||
public struct AStruct : ITest2 {
|
||||
public int i;
|
||||
public string s;
|
||||
@@ -385,9 +410,26 @@ public class Tests : TestsBase, ITest2
|
||||
new Tests ().invoke_abort ();
|
||||
new Tests ().evaluate_method ();
|
||||
Bug59649 ();
|
||||
inspect_enumerator_in_generic_struct();
|
||||
if_property_stepping();
|
||||
return 3;
|
||||
}
|
||||
|
||||
private class TestClass {
|
||||
private string oneLineProperty = "";
|
||||
public string OneLineProperty {
|
||||
get { return oneLineProperty; }
|
||||
set { oneLineProperty = value; }
|
||||
}
|
||||
}
|
||||
|
||||
public static void if_property_stepping() {
|
||||
var test = new TestClass();
|
||||
if (test.OneLineProperty == "someInvalidValue6049e709-7271-41a1-bc0a-f1f1b80d4125")
|
||||
return;
|
||||
Console.Write("");
|
||||
}
|
||||
|
||||
public static void local_reflect () {
|
||||
//Breakpoint line below, and reflect someField via ObjectMirror;
|
||||
LocalReflectClass.RunMe ();
|
||||
@@ -466,6 +508,8 @@ public class Tests : TestsBase, ITest2
|
||||
ss_fp_clobber ();
|
||||
ss_no_frames ();
|
||||
ss_await ();
|
||||
ss_nested_with_three_args_wrapper();
|
||||
ss_nested_twice_with_two_args_wrapper();
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
@@ -577,16 +621,53 @@ public class Tests : TestsBase, ITest2
|
||||
ss_nested_with_two_args(ss_nested_arg (), ss_nested_arg ());
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void ss_nested_with_three_args_wrapper () {
|
||||
ss_nested_with_three_args(ss_nested_arg1 (), ss_nested_arg2 (), ss_nested_arg3 ());
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void ss_nested_twice_with_two_args_wrapper () {
|
||||
ss_nested_with_two_args(ss_nested_arg1 (), ss_nested_with_two_args(ss_nested_arg2 (), ss_nested_arg3 ()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void inspect_enumerator_in_generic_struct() {
|
||||
TestEnumeratorInsideGenericStruct<String, String> generic_struct = new TestEnumeratorInsideGenericStruct<String, String>(new KeyValuePair<string, string>("0", "f1"));
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_with_two_args (int a1, int a2) {
|
||||
return a1 + a2;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_with_three_args (int a1, int a2, int a3) {
|
||||
return a1 + a2 + a3;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_arg () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_arg1 () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_arg2 () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_arg3 () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void ss_nested_1 (int i) {
|
||||
}
|
||||
@@ -1813,6 +1894,12 @@ public class Tests : TestsBase, ITest2
|
||||
public static ref string get_ref_string() {
|
||||
return ref ref_return_string;
|
||||
}
|
||||
|
||||
|
||||
static BlittableStruct ref_return_struct = new BlittableStruct () { i = 1, d = 2.0 };
|
||||
public static ref BlittableStruct get_ref_struct() {
|
||||
return ref ref_return_struct;
|
||||
}
|
||||
}
|
||||
|
||||
public class SentinelClass : MarshalByRefObject {
|
||||
|
||||
@@ -47,6 +47,15 @@ public class DebuggerTests
|
||||
public static string runtime = Environment.GetEnvironmentVariable ("DBG_RUNTIME");
|
||||
public static string runtime_args = Environment.GetEnvironmentVariable ("DBG_RUNTIME_ARGS");
|
||||
public static string agent_args = Environment.GetEnvironmentVariable ("DBG_AGENT_ARGS");
|
||||
#if MONODROID_TEST
|
||||
// AssemblyInfo.Location doesn't work on Android, we expect test .exe's to be in the working dir
|
||||
public static string this_assembly_path = "";
|
||||
#else
|
||||
// expect test .exe's to be next to this assembly
|
||||
public static string this_assembly_path = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
|
||||
#endif
|
||||
|
||||
public static string dtest_app_path = Path.Combine (this_assembly_path, "dtest-app.exe");
|
||||
|
||||
// Not currently used, but can be useful when debugging individual tests.
|
||||
void StackTraceDump (Event e)
|
||||
@@ -74,16 +83,16 @@ public class DebuggerTests
|
||||
|
||||
if (runtime != null) {
|
||||
pi.FileName = runtime;
|
||||
} else if (Path.DirectorySeparatorChar == '\\') {
|
||||
} else {
|
||||
string processExe = Diag.Process.GetCurrentProcess ().MainModule.FileName;
|
||||
if (processExe != null) {
|
||||
string fileName = Path.GetFileName (processExe);
|
||||
if (fileName.StartsWith ("mono") && fileName.EndsWith (".exe"))
|
||||
if (fileName.StartsWith ("mono"))
|
||||
pi.FileName = processExe;
|
||||
}
|
||||
}
|
||||
if (string.IsNullOrEmpty (pi.FileName))
|
||||
pi.FileName = "mono";
|
||||
throw new ArgumentException ("Couldn't find mono runtime.");
|
||||
pi.Arguments = String.Join (" ", args);
|
||||
if (runtime_args != null)
|
||||
pi.Arguments = runtime_args + " " + pi.Arguments;
|
||||
@@ -362,7 +371,7 @@ public class DebuggerTests
|
||||
[SetUp]
|
||||
public void SetUp () {
|
||||
ThreadMirror.NativeTransitions = false;
|
||||
Start (new string [] { "dtest-app.exe" });
|
||||
Start (new string [] { dtest_app_path });
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
@@ -494,7 +503,7 @@ public class DebuggerTests
|
||||
public void IsDynamicAssembly () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string[] {"dtest-app.exe", "ref-emit-test"});
|
||||
Start (new string[] { dtest_app_path, "ref-emit-test"});
|
||||
|
||||
run_until ("ref_emit_call");
|
||||
var assemblyMirrors = entry_point.DeclaringType.Assembly.Domain.GetAssemblies ();
|
||||
@@ -672,7 +681,7 @@ public class DebuggerTests
|
||||
public void ClassLocalReflection () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "local-reflect" });
|
||||
Start (new string [] { dtest_app_path, "local-reflect" });
|
||||
|
||||
MethodMirror m = entry_point.DeclaringType.Assembly.GetType ("LocalReflectClass").GetMethod ("RunMe");
|
||||
|
||||
@@ -2573,7 +2582,7 @@ public class DebuggerTests
|
||||
public void Suspend () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "suspend-test" });
|
||||
Start (new string [] { dtest_app_path, "suspend-test" });
|
||||
|
||||
Event e = run_until ("suspend");
|
||||
|
||||
@@ -3052,7 +3061,7 @@ public class DebuggerTests
|
||||
public void InvokeSingleThreaded () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "invoke-single-threaded" });
|
||||
Start (new string [] { dtest_app_path, "invoke-single-threaded" });
|
||||
|
||||
Event e = run_until ("invoke_single_threaded_2");
|
||||
|
||||
@@ -3133,7 +3142,7 @@ public class DebuggerTests
|
||||
public void InvokeAbort () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "invoke-abort" });
|
||||
Start (new string [] { dtest_app_path, "invoke-abort" });
|
||||
|
||||
Event e = run_until ("invoke_abort");
|
||||
|
||||
@@ -3466,7 +3475,7 @@ public class DebuggerTests
|
||||
public void ExceptionFilter2 () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-excfilter.exe" });
|
||||
Start (new string [] { Path.Combine (this_assembly_path, "dtest-excfilter.exe") });
|
||||
|
||||
MethodMirror filter_method = entry_point.DeclaringType.GetMethod ("Filter");
|
||||
Assert.IsNotNull (filter_method);
|
||||
@@ -3566,7 +3575,7 @@ public class DebuggerTests
|
||||
public void MemberInOtherDomain () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "domain-test" });
|
||||
Start (new string [] { dtest_app_path, "domain-test" });
|
||||
|
||||
vm.EnableEvents (EventType.AppDomainCreate, EventType.AppDomainUnload, EventType.AssemblyUnload);
|
||||
|
||||
@@ -3582,7 +3591,7 @@ public class DebuggerTests
|
||||
public void Domains () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "domain-test" });
|
||||
Start (new string [] { dtest_app_path, "domain-test" });
|
||||
|
||||
vm.EnableEvents (EventType.AppDomainCreate, EventType.AppDomainUnload, EventType.AssemblyUnload);
|
||||
|
||||
@@ -3705,7 +3714,7 @@ public class DebuggerTests
|
||||
public void RefEmit () {
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "ref-emit-test" });
|
||||
Start (new string [] { dtest_app_path, "ref-emit-test" });
|
||||
|
||||
Event e = run_until ("ref_emit_call");
|
||||
|
||||
@@ -3741,7 +3750,7 @@ public class DebuggerTests
|
||||
// Check that stack traces can be produced for threads in native code
|
||||
vm.Detach ();
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "frames-in-native" });
|
||||
Start (new string [] { dtest_app_path, "frames-in-native" });
|
||||
|
||||
var e = run_until ("frames_in_native");
|
||||
|
||||
@@ -4115,7 +4124,7 @@ public class DebuggerTests
|
||||
public void UnhandledException () {
|
||||
vm.Exit (0);
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "unhandled-exception" });
|
||||
Start (new string [] { dtest_app_path, "unhandled-exception" });
|
||||
|
||||
var req = vm.CreateExceptionRequest (null, false, true);
|
||||
req.Enable ();
|
||||
@@ -4134,7 +4143,7 @@ public class DebuggerTests
|
||||
public void UnhandledException_2 () {
|
||||
vm.Exit (0);
|
||||
|
||||
Start (new string [] { "dtest-app.exe", "unhandled-exception-endinvoke" });
|
||||
Start (new string [] { dtest_app_path, "unhandled-exception-endinvoke" });
|
||||
|
||||
var req = vm.CreateExceptionRequest (null, false, true);
|
||||
req.Enable ();
|
||||
@@ -4158,7 +4167,7 @@ public class DebuggerTests
|
||||
vm.Detach ();
|
||||
|
||||
// Exceptions caught in non-user code are treated as unhandled
|
||||
Start (new string [] { "dtest-app.exe", "unhandled-exception-user" });
|
||||
Start (new string [] { dtest_app_path, "unhandled-exception-user" });
|
||||
|
||||
var req = vm.CreateExceptionRequest (null, false, true);
|
||||
req.AssemblyFilter = new List<AssemblyMirror> () { entry_point.DeclaringType.Assembly };
|
||||
@@ -4229,7 +4238,7 @@ public class DebuggerTests
|
||||
[Test]
|
||||
public void InspectThreadSuspenedOnWaitOne () {
|
||||
TearDown ();
|
||||
Start (true, "dtest-app.exe", "wait-one" );
|
||||
Start (true, dtest_app_path, "wait-one" );
|
||||
|
||||
ThreadMirror.NativeTransitions = true;
|
||||
|
||||
@@ -4401,7 +4410,7 @@ public class DebuggerTests
|
||||
[Test]
|
||||
public void ThreadpoolIOsinglestep () {
|
||||
TearDown ();
|
||||
Start ("dtest-app.exe", "threadpool-io");
|
||||
Start (dtest_app_path, "threadpool-io");
|
||||
// This is a regression test for #42625. It tests the
|
||||
// interaction (particularly in coop GC) of the
|
||||
// threadpool I/O mechanism and the soft debugger.
|
||||
@@ -4418,7 +4427,7 @@ public class DebuggerTests
|
||||
[Category("NotWorking")] // flaky, see https://github.com/mono/mono/issues/6997
|
||||
public void StepOutAsync () {
|
||||
vm.Detach ();
|
||||
Start (new string [] { "dtest-app.exe", "step-out-void-async" });
|
||||
Start (new string [] { dtest_app_path, "step-out-void-async" });
|
||||
var e = run_until ("step_out_void_async_2");
|
||||
create_step (e);
|
||||
var e2 = step_out ();
|
||||
@@ -4435,7 +4444,83 @@ public class DebuggerTests
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("NotWorking")]
|
||||
public void StepOverOnExitFromArgsAfterStepInMethodParameter2() {
|
||||
Event e = run_until ("ss_nested_with_three_args_wrapper");
|
||||
|
||||
var req = create_step(e);
|
||||
req.Enable();
|
||||
|
||||
e = step_once();
|
||||
assert_location(e, "ss_nested_with_three_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg1");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg1");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg1");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_with_three_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg2");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg2");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg2");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_with_three_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg3");
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
public void StepOverOnExitFromArgsAfterStepInMethodParameter3() {
|
||||
Event e = run_until ("ss_nested_twice_with_two_args_wrapper");
|
||||
|
||||
var req = create_step(e);
|
||||
req.Enable();
|
||||
|
||||
e = step_once();
|
||||
assert_location(e, "ss_nested_twice_with_two_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg1");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg1");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg1");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_twice_with_two_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg2");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg2");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg2");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_twice_with_two_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg3");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ShouldCorrectlyStepOverOnExitFromArgsAfterStepInMethodParameter() {
|
||||
Event e = run_until ("ss_nested_with_two_args_wrapper");
|
||||
|
||||
@@ -4461,6 +4546,25 @@ public class DebuggerTests
|
||||
assert_location(e, "ss_nested_arg");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void InspectEnumeratorInGenericStruct() {
|
||||
//files.myBucket.GetEnumerator().get_Current().Key watching this generates an exception in Debugger
|
||||
Event e = run_until("inspect_enumerator_in_generic_struct");
|
||||
var req = create_step(e);
|
||||
req.Enable();
|
||||
e = step_once();
|
||||
e = step_over();
|
||||
StackFrame frame = e.Thread.GetFrames () [0];
|
||||
var ginst = frame.Method.GetLocal ("generic_struct");
|
||||
Value variable = frame.GetValue (ginst);
|
||||
StructMirror thisObj = (StructMirror)variable;
|
||||
TypeMirror thisType = thisObj.Type;
|
||||
variable = thisObj.InvokeMethod(e.Thread, thisType.GetMethod("get_Current"), null);
|
||||
thisObj = (StructMirror)variable;
|
||||
thisType = thisObj.Type;
|
||||
AssertValue ("f1", thisObj["value"]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
// Uses a fixed port
|
||||
[Category("NotWorking")]
|
||||
@@ -4468,7 +4572,7 @@ public class DebuggerTests
|
||||
vm.Exit (0);
|
||||
|
||||
// Launch the app using server=y,suspend=n
|
||||
var pi = CreateStartInfo (new string[] { "--debugger-agent=transport=dt_socket,address=127.0.0.1:10000,server=y,suspend=n", "dtest-app.exe", "attach" });
|
||||
var pi = CreateStartInfo (new string[] { "--debugger-agent=transport=dt_socket,address=127.0.0.1:10000,server=y,suspend=n", dtest_app_path, "attach" });
|
||||
var process = Diag.Process.Start (pi);
|
||||
|
||||
// Wait for the app to reach the Sleep () in attach ().
|
||||
@@ -4621,6 +4725,33 @@ public class DebuggerTests
|
||||
m = t.GetMethod ("get_ref_string");
|
||||
v = t.InvokeMethod (e.Thread, m, null);
|
||||
AssertValue ("byref", v);
|
||||
|
||||
m = t.GetMethod ("get_ref_struct");
|
||||
v = t.InvokeMethod (e.Thread, m, null);
|
||||
Assert.IsTrue(v is StructMirror);
|
||||
|
||||
var mirror = (StructMirror)v;
|
||||
AssertValue (1, mirror["i"]);
|
||||
AssertValue (2.0, mirror["d"]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void IfPropertyStepping () {
|
||||
Event e = run_until ("if_property_stepping");
|
||||
var req = create_step (e);
|
||||
req.Enable ();
|
||||
e = step_once ();
|
||||
e = step_over ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
e = step_into ();
|
||||
Assert.IsTrue ((e as StepEvent).Method.Name == "op_Equality" || (e as StepEvent).Method.Name == "if_property_stepping");
|
||||
}
|
||||
} // class DebuggerTests
|
||||
} // namespace
|
||||
@@ -11,17 +11,18 @@ LIB_MCS_FLAGS = /unsafe /publicsign /nowarn:0618
|
||||
|
||||
XTEST_LIB_REFS = System System.Core Facades/System.Threading.Tasks
|
||||
|
||||
xunit-test-local: log-profiler-test.exe
|
||||
xunit-test-local: $(topdir)/class/lib/$(PROFILE_DIRECTORY)/tests/log-profiler-test.exe
|
||||
|
||||
log-profiler-test.exe: Test/log-profiler-test.cs
|
||||
$(topdir)/class/lib/$(PROFILE_DIRECTORY)/tests/log-profiler-test.exe: Test/log-profiler-test.cs
|
||||
mkdir -p $(dir $@)
|
||||
$(CSCOMPILE) $(PLATFORM_DEBUG_FLAGS) /unsafe $(if $(MCS_MODE),,/warnaserror) /r:$(build_libdir)/mscorlib.dll /r:$(build_lib) /out:$@ $<
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
Test/log-profiler-test.cs
|
||||
|
||||
CLEAN_FILES = \
|
||||
log-profiler-test.exe \
|
||||
log-profiler-test.exe.mdb \
|
||||
log-profiler-test.pdb
|
||||
$(topdir)/class/lib/$(PROFILE_DIRECTORY)/tests/log-profiler-test.exe \
|
||||
$(topdir)/class/lib/$(PROFILE_DIRECTORY)/tests/log-profiler-test.exe.mdb \
|
||||
$(topdir)/class/lib/$(PROFILE_DIRECTORY)/tests/log-profiler-test.pdb
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -37,8 +37,13 @@ namespace MonoTests.Mono.Profiler.Log {
|
||||
|
||||
static volatile int _id;
|
||||
|
||||
static string _testAssemblyPath;
|
||||
static Process _currentProcess;
|
||||
|
||||
public ProfilerTestRun (string name, string options)
|
||||
{
|
||||
_testAssemblyPath = Path.Combine (Path.GetDirectoryName (System.Reflection.Assembly.GetExecutingAssembly ().Location), "log-profiler-test.exe");
|
||||
_currentProcess = Process.GetCurrentProcess();
|
||||
Name = name;
|
||||
Options = options;
|
||||
_output = $"test-{_id++}.mlpd";
|
||||
@@ -57,8 +62,8 @@ namespace MonoTests.Mono.Profiler.Log {
|
||||
using (var proc = new Process ()) {
|
||||
proc.StartInfo = new ProcessStartInfo {
|
||||
UseShellExecute = false,
|
||||
FileName = Path.GetFullPath (Path.Combine ("..", "..", "..", "runtime", "mono-wrapper")),
|
||||
Arguments = $"--debug --profile=log:nodefaults,output={_output},{Options} log-profiler-test.exe {Name}",
|
||||
FileName = _currentProcess.MainModule.FileName,
|
||||
Arguments = $"--debug --profile=log:nodefaults,output=\"{_output}\",{Options} {_testAssemblyPath} {Name}",
|
||||
};
|
||||
|
||||
proc.Start ();
|
||||
|
||||
+11
@@ -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
@@ -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
@@ -0,0 +1 @@
|
||||
#include monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources
|
||||
+1
@@ -0,0 +1 @@
|
||||
#include monotouch_System.ComponentModel.Composition_xtest.dll.exclude.sources
|
||||
-8
@@ -110,14 +110,6 @@ namespace System.ComponentModel.Composition.ReflectionModel
|
||||
{
|
||||
Requires.NotNull(importDefinition, "importDefinition");
|
||||
|
||||
ReflectionImportDefinition reflectionImportDefinition = importDefinition as ReflectionImportDefinition;
|
||||
if (reflectionImportDefinition == null)
|
||||
{
|
||||
throw new ArgumentException(
|
||||
string.Format(CultureInfo.CurrentCulture, Strings.ReflectionModel_InvalidImportDefinition, importDefinition.GetType()),
|
||||
"importDefinition");
|
||||
}
|
||||
|
||||
return (importDefinition is IPartCreatorImportDefinition);
|
||||
}
|
||||
|
||||
|
||||
+9
@@ -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
|
||||
@@ -916,7 +916,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Fcntl.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Fcntl.SetCloseOnExec.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetDomainSocketSizes.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetHostName.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetPeerID.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetPeerUserName.cs" />
|
||||
@@ -927,7 +926,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Poll.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Read.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.SetEUid.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Unlink.cs" />
|
||||
@@ -982,6 +980,7 @@
|
||||
<Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
|
||||
<Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
|
||||
<Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
|
||||
<Compile Include="corefx\Interop.cs" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
<When Condition="'$(HostPlatform)' == 'macos'">
|
||||
@@ -994,7 +993,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Fcntl.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Fcntl.SetCloseOnExec.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetDomainSocketSizes.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetHostName.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetPeerID.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetPeerUserName.cs" />
|
||||
@@ -1005,7 +1003,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Poll.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Read.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.SetEUid.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Unlink.cs" />
|
||||
@@ -1060,6 +1057,7 @@
|
||||
<Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
|
||||
<Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
|
||||
<Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
|
||||
<Compile Include="corefx\Interop.cs" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
<When Condition="'$(HostPlatform)' == 'linux'">
|
||||
@@ -1072,7 +1070,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Fcntl.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Fcntl.SetCloseOnExec.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetDomainSocketSizes.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetHostName.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetPeerID.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetPeerUserName.cs" />
|
||||
@@ -1083,7 +1080,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Poll.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Read.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.SetEUid.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.Pipe.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Unlink.cs" />
|
||||
@@ -1138,6 +1134,7 @@
|
||||
<Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
|
||||
<Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
|
||||
<Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
|
||||
<Compile Include="corefx\Interop.cs" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
|
||||
@@ -393,7 +393,7 @@ namespace MonoTests.System.IO.MemoryMappedFiles {
|
||||
[Test]
|
||||
public void CreateViewStreamAlignToPageSize ()
|
||||
{
|
||||
#if __WATCHOS__
|
||||
#if MONOTOUCH_WATCH
|
||||
int pageSize = 4096;
|
||||
#elif MONOTOUCH
|
||||
// iOS bugs on ARM64 - bnc #27667 - apple #
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
|
||||
internal static partial class Interop
|
||||
{
|
||||
internal static partial class Sys
|
||||
{
|
||||
internal static uint GetEUid ()
|
||||
{
|
||||
throw new PlatformNotSupportedException ();
|
||||
}
|
||||
|
||||
internal static int SetEUid (uint euid)
|
||||
{
|
||||
throw new PlatformNotSupportedException ();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Core_xtest.dll.exclude.sources
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Core_xtest.dll.exclude.sources
|
||||
@@ -35,5 +35,8 @@ System.IO.Pipes/AnonymousPipeServerStream.Unix.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Stat.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Stat.Pipe.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetPeerID.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetEUid.cs
|
||||
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.SetEUid.cs
|
||||
|
||||
# FIXME: the native side is not there yet.
|
||||
# ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetEUid.cs
|
||||
# ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.SetEUid.cs
|
||||
corefx/Interop.cs
|
||||
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs
|
||||
@@ -26,8 +26,10 @@ LIB_MCS_FLAGS += -d:MONO_FEATURE_APPLETLS
|
||||
endif
|
||||
|
||||
ifdef ENABLE_GSS
|
||||
ifndef NO_GSS
|
||||
LIB_MCS_FLAGS += -d:ENABLE_GSS
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef PROFILE_DISABLE_BTLS
|
||||
ifdef HAVE_BTLS
|
||||
|
||||
@@ -44,12 +44,12 @@
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
|
||||
<OutputPath>./../../class/lib/monotouch_watch</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_watch</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;NO_CODEDOM;NO_OLEDB;NO_ODBC;NO_CONFIGURATION;ENABLE_GSS</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;NO_CODEDOM;NO_OLEDB;NO_ODBC;NO_CONFIGURATION</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
|
||||
<OutputPath>./../../class/lib/monotouch_tv</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;NO_CODEDOM;NO_OLEDB;NO_ODBC;NO_CONFIGURATION;MONO_FEATURE_APPLETLS;ENABLE_GSS</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;NO_CODEDOM;NO_OLEDB;NO_ODBC;NO_CONFIGURATION;MONO_FEATURE_APPLETLS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
|
||||
@@ -119,7 +119,6 @@
|
||||
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecResult.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecurityHandle.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecurityInteger.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecurityWrapper.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs
|
||||
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SSPIResponse.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,8 @@
|
||||
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
|
||||
System.Drawing/TestBitmap.cs
|
||||
@@ -57,13 +57,35 @@ namespace System.Net.Http
|
||||
public HttpRequestMessage Request;
|
||||
public CancellationTokenRegistration CancellationTokenRegistration;
|
||||
public CFContentStream ContentStream;
|
||||
public bool StreamCanBeDisposed;
|
||||
|
||||
public void Close ()
|
||||
{
|
||||
CancellationTokenRegistration.Dispose ();
|
||||
if (ContentStream != null) {
|
||||
ContentStream.Close ();
|
||||
}
|
||||
if (ContentStream != null) {
|
||||
// The Close method of the CFContentStream blocks as you can see:
|
||||
// public void Close ()
|
||||
// {
|
||||
// data_read_event.WaitOne (); // make sure there's no pending data
|
||||
//
|
||||
// data_mutex.WaitOne ();
|
||||
// data = null;
|
||||
// this.http_stream.ErrorEvent -= HandleErrorEvent;
|
||||
// data_mutex.ReleaseMutex ();
|
||||
//
|
||||
// data_event.Set ();
|
||||
// }
|
||||
// This means. that when we want to ignore the data of the content, which happens
|
||||
// in the first request of a redirect, if we want to close, ignoring the content
|
||||
// we will have a deadlock.
|
||||
// Dispose will clean all the data, without waiting for the read, which by design in the
|
||||
// CFContentStream, blocks the thread. This happens ONLY after the first request that gets
|
||||
// a redirect status code. All other cases should call close.
|
||||
if (StreamCanBeDisposed)
|
||||
ContentStream.Dispose ();
|
||||
else
|
||||
ContentStream.Close ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,6 +195,11 @@ namespace System.Net.Http
|
||||
}
|
||||
|
||||
protected internal override async Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken)
|
||||
{
|
||||
return await SendAsync (request, cancellationToken, true).ConfigureAwait (false);
|
||||
}
|
||||
|
||||
internal async Task<HttpResponseMessage> SendAsync (HttpRequestMessage request, CancellationToken cancellationToken, bool isFirstRequest)
|
||||
{
|
||||
sentRequest = true;
|
||||
|
||||
@@ -194,7 +221,8 @@ namespace System.Net.Http
|
||||
}
|
||||
}
|
||||
|
||||
stream.ShouldAutoredirect = allowAutoRedirect;
|
||||
if (!isFirstRequest && allowAutoRedirect)
|
||||
stream.ShouldAutoredirect = allowAutoRedirect;
|
||||
stream.HasBytesAvailableEvent += HandleHasBytesAvailableEvent;
|
||||
stream.ErrorEvent += HandleErrorEvent;
|
||||
stream.ClosedEvent += HandleClosedEvent;
|
||||
@@ -234,9 +262,31 @@ namespace System.Net.Http
|
||||
CloseStream (stream);
|
||||
});
|
||||
|
||||
if (isFirstRequest) {
|
||||
var initialRequest = await response.Task;
|
||||
var status = initialRequest.StatusCode;
|
||||
if (IsRedirect (status) && allowAutoRedirect) {
|
||||
bucket.StreamCanBeDisposed = true;
|
||||
// remove headers in a redirect for Authentication.
|
||||
request.Headers.Authorization = null;
|
||||
return await SendAsync (request, cancellationToken, false).ConfigureAwait (false);
|
||||
}
|
||||
return initialRequest;
|
||||
}
|
||||
return await response.Task;
|
||||
}
|
||||
|
||||
// Decide if we redirect or not, similar to what is done in the managed handler
|
||||
// https://github.com/mono/mono/blob/eca15996c7163f331c9f2cd0a17b63e8f92b1d55/mcs/class/referencesource/System/net/System/Net/HttpWebRequest.cs#L5681
|
||||
static bool IsRedirect (HttpStatusCode status)
|
||||
{
|
||||
return status == HttpStatusCode.Ambiguous || // 300
|
||||
status == HttpStatusCode.Moved || // 301
|
||||
status == HttpStatusCode.Redirect || // 302
|
||||
status == HttpStatusCode.RedirectMethod || // 303
|
||||
status == HttpStatusCode.RedirectKeepVerb; // 307
|
||||
}
|
||||
|
||||
void HandleErrorEvent (object sender, CFStream.StreamEventArgs e)
|
||||
{
|
||||
var stream = (CFHTTPStream)sender;
|
||||
|
||||
@@ -115,6 +115,8 @@ namespace System.Net.Http
|
||||
if (disposing && !disposed) {
|
||||
disposed = true;
|
||||
|
||||
//We don't use CancelPendingRequests() because we don't want to create new CancellationTokenSource
|
||||
cts.Cancel ();
|
||||
cts.Dispose ();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,17 @@ 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)
|
||||
ifneq ($(PROFILE),monotouch_tv)
|
||||
ifneq ($(PROFILE),monotouch_watch)
|
||||
XTEST_LIB_REFS += System.Drawing
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (2.1, $(FRAMEWORK_VERSION))
|
||||
LIB_REFS += System.Data System.Configuration SMDiagnostics
|
||||
@@ -35,9 +45,10 @@ TEST_RESOURCE_FILES = \
|
||||
|
||||
# we need to write the test resource args into a response file to avoid
|
||||
# hitting "argument list too long" errors because of too many files
|
||||
TEST_RESOURCES_RESPONSE_FILE = $(depsdir)/$(test_lib).resources.response
|
||||
TEST_RESOURCES_RESPONSE_FILE = $(depsdir)/$(LIBRARY)_test.resources.response
|
||||
|
||||
$(TEST_RESOURCES_RESPONSE_FILE): $(TEST_RESOURCE_FILES)
|
||||
@echo Creating $@ ...
|
||||
@echo $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r)) > $(TEST_RESOURCES_RESPONSE_FILE)
|
||||
|
||||
test-local: $(TEST_RESOURCES_RESPONSE_FILE)
|
||||
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs
|
||||
+1
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources
|
||||
+1
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Runtime.Serialization_xtest.dll.exclude.sources
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../external/corefx/src/System.Runtime.Serialization.Xml/tests/SerializationTypes.RuntimeOnly.cs
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Security_test.dll.exclude.sources
|
||||
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Security_test.dll.exclude.sources
|
||||
@@ -0,0 +1 @@
|
||||
System.Security.Permissions/DataProtectionPermissionAttributeTest.cs
|
||||
@@ -41,7 +41,8 @@ namespace System.ServiceModel.Channels
|
||||
{
|
||||
HttpChannelFactory<IRequestChannel> source;
|
||||
|
||||
List<WebRequest> web_requests = new List<WebRequest> ();
|
||||
object locker = new object();
|
||||
List<WebRequest> web_requests = new List<WebRequest> (); //synced by locker
|
||||
|
||||
// Constructor
|
||||
|
||||
@@ -86,7 +87,12 @@ namespace System.ServiceModel.Channels
|
||||
}
|
||||
|
||||
var web_request = (HttpWebRequest) HttpWebRequest.Create (destination);
|
||||
web_requests.Add (web_request);
|
||||
|
||||
lock (locker)
|
||||
{
|
||||
web_requests.Add (web_request);
|
||||
}
|
||||
|
||||
result.WebRequest = web_request;
|
||||
web_request.Method = "POST";
|
||||
web_request.ContentType = Encoder.ContentType;
|
||||
@@ -350,9 +356,20 @@ namespace System.ServiceModel.Channels
|
||||
|
||||
protected override void OnAbort ()
|
||||
{
|
||||
foreach (var web_request in web_requests.ToArray ())
|
||||
WebRequest[] current_web_requests;
|
||||
|
||||
lock (locker)
|
||||
{
|
||||
current_web_requests = web_requests.ToArray();
|
||||
}
|
||||
|
||||
foreach (var web_request in current_web_requests)
|
||||
web_request.Abort ();
|
||||
web_requests.Clear ();
|
||||
|
||||
lock(locker)
|
||||
{
|
||||
web_requests.Clear ();
|
||||
}
|
||||
}
|
||||
|
||||
// Close
|
||||
@@ -497,7 +514,10 @@ namespace System.ServiceModel.Channels
|
||||
|
||||
void Cleanup ()
|
||||
{
|
||||
owner.web_requests.Remove (WebRequest);
|
||||
lock (owner.locker)
|
||||
{
|
||||
owner.web_requests.Remove (WebRequest);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
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
|
||||
+1
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Web.Services_test.dll.exclude.sources
|
||||
+1
@@ -0,0 +1 @@
|
||||
#include monotouch_System.Web.Services_test.dll.exclude.sources
|
||||
@@ -0,0 +1,7 @@
|
||||
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
|
||||
@@ -272,7 +272,8 @@ namespace System.Web.Configuration
|
||||
{
|
||||
string path = NormalizeVirtualPath (virtualPath);
|
||||
|
||||
foreach (VirtualDirectoryMapping mapping in map.VirtualDirectories) {
|
||||
for (int j = 0; j < map.VirtualDirectories.Count; j++) {
|
||||
VirtualDirectoryMapping mapping = map.VirtualDirectories.Get(j);
|
||||
if (path.StartsWith (mapping.VirtualDirectory)) {
|
||||
int i = mapping.VirtualDirectory.Length;
|
||||
if (path.Length == i) {
|
||||
|
||||
@@ -483,7 +483,7 @@ namespace System.Windows.Forms.Layout
|
||||
CalculateColumnWidths (settings, actual_positions, max_colspan, settings.ColumnStyles, auto_size, column_widths, false);
|
||||
|
||||
// Calculate available width
|
||||
int available_width = size.Width - (border_width * (columns + 1));
|
||||
int available_width = size.Width < Int16.MaxValue ? size.Width - (border_width * (columns + 1)) : 0;
|
||||
foreach (int width in column_widths)
|
||||
available_width -= width;
|
||||
|
||||
@@ -516,7 +516,7 @@ namespace System.Windows.Forms.Layout
|
||||
CalculateRowHeights (settings, actual_positions, max_rowspan, settings.RowStyles, auto_size, column_widths, row_heights);
|
||||
|
||||
// Calculate available height
|
||||
int available_height = size.Height - (border_width * (rows + 1));
|
||||
int available_height = size.Height < Int16.MaxValue ? size.Height - (border_width * (rows + 1)) : 0;
|
||||
foreach (int height in row_heights)
|
||||
available_height -= height;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -18,7 +18,17 @@ 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)
|
||||
ifneq ($(PROFILE),monotouch_tv)
|
||||
ifneq ($(PROFILE),monotouch_watch)
|
||||
XTEST_LIB_REFS += System.Drawing
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
|
||||
Loaded 100 of 444 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user