mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 01:41:18 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd3a38cd27 | ||
|
|
d373a38d2a | ||
|
|
592a4a7105 | ||
|
|
219f32ec1a | ||
|
|
4acdb7d122 | ||
|
|
a1bcfe45ec | ||
|
|
759c911ae0 | ||
|
|
956572edf6 | ||
|
|
821dddc994 |
No files matched your search
@@ -26,6 +26,9 @@
|
||||
[submodule "external/nuget-buildtasks"]
|
||||
path = external/nuget-buildtasks
|
||||
url = git://github.com/mono/NuGet.BuildTasks
|
||||
[submodule "external/buildtools"]
|
||||
path = external/buildtools
|
||||
url = git://github.com/mono/buildtools.git
|
||||
[submodule "external/cecil-legacy"]
|
||||
path = external/cecil-legacy
|
||||
url = git://github.com/mono/cecil.git
|
||||
|
||||
@@ -44,26 +44,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
static class Program {
|
||||
|
||||
static readonly string[] _options = new [] {
|
||||
"domain",
|
||||
"assembly",
|
||||
"module",
|
||||
"class",
|
||||
"jit",
|
||||
"exception",
|
||||
"gcalloc",
|
||||
"gc",
|
||||
"thread",
|
||||
// "calls", // Way too heavy.
|
||||
"monitor",
|
||||
"gcmove",
|
||||
"gcroot",
|
||||
"context",
|
||||
"finalization",
|
||||
"counter",
|
||||
"gchandle",
|
||||
};
|
||||
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (6);
|
||||
|
||||
static string FilterInvalidXmlChars (string text) {
|
||||
@@ -95,22 +75,14 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
for (var i = 0; i < benchmarks.Length; i++) {
|
||||
var bench = benchmarks [i];
|
||||
|
||||
var sampleFreq = rand.Next (-1000, 1001);
|
||||
var sampleFreq = rand.Next (0, 1001);
|
||||
var sampleMode = rand.Next (0, 2) == 1 ? "real" : "process";
|
||||
var maxSamples = rand.Next (0, cpus * 2000 + 1);
|
||||
var heapShotFreq = rand.Next (-10, 11);
|
||||
var heapShotFreq = rand.Next (0, 11);
|
||||
var maxFrames = rand.Next (0, 33);
|
||||
var options = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
var allocMode = rand.Next (0, 2) == 1 ? "alloc" : "noalloc";
|
||||
|
||||
var profOptions = $"maxframes={maxFrames},{string.Join (",", options)},output=/dev/null";
|
||||
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $",sample={sampleFreq},sampling-{sampleMode},maxsamples={maxSamples}";
|
||||
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $",heapshot={heapShotFreq}gc";
|
||||
var profOptions = $"sample=cycles/{sampleFreq},sampling-{sampleMode},maxsamples={maxSamples},heapshot={heapShotFreq}gc,maxframes={maxFrames},{allocMode},output=/dev/null";
|
||||
|
||||
var info = new ProcessStartInfo {
|
||||
UseShellExecute = false,
|
||||
|
||||
+110
-36
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.5.0],
|
||||
AC_INIT(mono, [5.3.0],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -264,8 +264,17 @@ case "$host" in
|
||||
with_sgen_default_concurrent=yes
|
||||
;;
|
||||
*-*-nacl*)
|
||||
echo "nacl no longer supported."
|
||||
exit 1
|
||||
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
|
||||
if test "x$disable_munmap" != "xyes"; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
|
||||
fi
|
||||
libmono_cflags="-D_REENTRANT"
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
use_sigposix=yes
|
||||
ikvm_native=no
|
||||
AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support])
|
||||
AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
|
||||
;;
|
||||
*-*-hpux*)
|
||||
CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
|
||||
@@ -734,6 +743,10 @@ fi
|
||||
|
||||
AM_CONDITIONAL(DISABLE_LIBRARIES, test x$enable_libraries = xno)
|
||||
|
||||
case $host in
|
||||
*nacl* ) with_shared_mono=yes;;
|
||||
esac
|
||||
|
||||
if test "x$host_win32" = "xyes"; then
|
||||
# Boehm GC requires the runtime to be in its own dll
|
||||
with_static_mono=no
|
||||
@@ -812,8 +825,7 @@ AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you w
|
||||
AC_ARG_WITH(testing_aot_hybrid, [ --with-testing_aot_hybrid=yes,no If you want to build the testing_aot_hybrid assemblies (defaults to no)], [], [with_testing_aot_hybrid=default])
|
||||
AC_ARG_WITH(testing_aot_full, [ --with-testing_aot_full=yes,no If you want to build the testing_aot_full assemblies (defaults to no)], [], [with_testing_aot_full=default])
|
||||
AC_ARG_WITH(winaot, [ --with-winaot=yes,no If you want to build the Windows friendly AOT assemblies (defaults to no)], [], [with_winaot=default])
|
||||
AC_ARG_WITH(orbis, [ --with-orbis=yes,no If you want to build the Orbis assemblies (defaults to no)], [], [with_orbis=default])
|
||||
AC_ARG_WITH(unreal, [ --with-unreal=yes,no If you want to build the Unreal assemblies (defaults to no)], [], [with_unreal=default])
|
||||
AC_ARG_WITH(orbis, [ --with-orbis=yes,no If you want to build the Orbis assemblies (defaults to no)], [], [with_orbis=default])
|
||||
|
||||
|
||||
AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot,hybridaot,fullaot,bitcode Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
|
||||
@@ -834,7 +846,6 @@ with_testing_aot_hybrid_default=no
|
||||
with_testing_aot_full_default=no
|
||||
with_winaot_default=no
|
||||
with_orbis_default=no
|
||||
with_unreal_default=no
|
||||
|
||||
with_bitcode_default=no
|
||||
with_cooperative_gc_default=no
|
||||
@@ -854,7 +865,6 @@ elif test x$with_runtime_preset = xall; then
|
||||
with_xammac_default=yes
|
||||
with_winaot_default=yes
|
||||
with_orbis_default=yes
|
||||
with_unreal_default=yes
|
||||
elif test x$with_runtime_preset = xfullaot; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_testing_aot_full_default=yes
|
||||
@@ -925,17 +935,6 @@ elif test x$with_runtime_preset = xorbis; then
|
||||
|
||||
AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
|
||||
elif test x$with_runtime_preset = xunreal; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_unreal_default=yes
|
||||
TEST_PROFILE=ounreal
|
||||
|
||||
mono_feature_disable_com='yes'
|
||||
mono_feature_disable_remoting='yes'
|
||||
mono_feature_disable_appdomains='yes'
|
||||
|
||||
AOT_BUILD_FLAGS="--runtime=mobile --aot=hybrid,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot"
|
||||
else
|
||||
with_profile4_x_default=yes
|
||||
fi
|
||||
@@ -982,9 +981,6 @@ fi
|
||||
if test "x$with_orbis" = "xdefault"; then
|
||||
with_orbis=$with_orbis_default
|
||||
fi
|
||||
if test "x$with_unreal" = "xdefault"; then
|
||||
with_unreal=$with_unreal_default
|
||||
fi
|
||||
|
||||
|
||||
AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = "xyes"])
|
||||
@@ -998,9 +994,8 @@ AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" !=
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_WINAOT, [test "x$with_winaot" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_ORBIS, [test "x$with_orbis" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_UNREAL, [test "x$with_unreal" != "xno"])
|
||||
AM_CONDITIONAL(FULL_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_full"] || [test "x$TEST_PROFILE" = "xwinaot"] || [test "x$TEST_PROFILE" = "xorbis"])
|
||||
AM_CONDITIONAL(HYBRID_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_hybrid"] || [test "x$TEST_PROFILE" = "xunreal"])
|
||||
AM_CONDITIONAL(HYBRID_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_hybrid"])
|
||||
|
||||
default_profile=net_4_x
|
||||
if test -z "$INSTALL_MONODROID_TRUE"; then :
|
||||
@@ -1024,9 +1019,6 @@ fi
|
||||
if test -z "$INSTALL_ORBIS_TRUE"; then :
|
||||
default_profile=orbis
|
||||
fi
|
||||
if test -z "$INSTALL_UNREAL_TRUE"; then :
|
||||
default_profile=unreal
|
||||
fi
|
||||
if test -z "$INSTALL_4_x_TRUE"; then :
|
||||
default_profile=net_4_x
|
||||
fi
|
||||
@@ -1283,7 +1275,7 @@ dnl
|
||||
dnl Boehm GC configuration
|
||||
dnl
|
||||
|
||||
AC_ARG_WITH(libgc, [ --with-libgc=included,none Controls the Boehm GC config, default=included],[libgc=$with_libgc],[libgc=included])
|
||||
AC_ARG_WITH(libgc, [ --with-libgc=included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=included])
|
||||
|
||||
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
|
||||
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
|
||||
@@ -1341,7 +1333,7 @@ if test "x$support_boehm" = "xyes"; then
|
||||
gc_msg="none"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Invalid argument $libgc to --with-libgc.])
|
||||
AC_MSG_ERROR([Invalid argument to --with-libgc.])
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1357,7 +1349,6 @@ if test "x$support_boehm" = "xyes"; then
|
||||
AC_SUBST(BOEHM_DEFINES)
|
||||
|
||||
fi
|
||||
AM_CONDITIONAL(SUPPORT_NULLGC, test "x$libgc" = "xnone")
|
||||
|
||||
dnl
|
||||
dnl End of Boehm GC Configuration
|
||||
@@ -1380,6 +1371,8 @@ AC_TRY_COMPILE([
|
||||
AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 1, [Length of zero length arrays])
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS(nacl/nacl_dyncode.h)
|
||||
|
||||
dnl ***********************************
|
||||
dnl *** Checks for signals
|
||||
dnl ***********************************
|
||||
@@ -1956,7 +1949,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_setname_np)
|
||||
AC_CHECK_FUNCS(pthread_kill)
|
||||
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
|
||||
AC_TRY_COMPILE([ #include <pthread.h>], [
|
||||
@@ -2227,11 +2220,13 @@ if test x$host_win32 = xno; then
|
||||
dnl **********************************
|
||||
dnl *** epoll ***
|
||||
dnl **********************************
|
||||
AC_CHECK_HEADERS(sys/epoll.h)
|
||||
haveepoll=no
|
||||
AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
|
||||
if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
|
||||
AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
|
||||
if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xno"; then
|
||||
AC_CHECK_HEADERS(sys/epoll.h)
|
||||
haveepoll=no
|
||||
AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
|
||||
if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
|
||||
AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
|
||||
fi
|
||||
fi
|
||||
|
||||
havekqueue=no
|
||||
@@ -2864,6 +2859,40 @@ fi
|
||||
AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
|
||||
AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
|
||||
|
||||
dnl **************
|
||||
dnl *** NaCl ***
|
||||
dnl **************
|
||||
|
||||
AC_ARG_ENABLE(nacl_codegen, [ --enable-nacl-codegen Enable Native Client code generation], enable_nacl_codegen=$enableval, enable_nacl_codegen=no)
|
||||
AC_ARG_ENABLE(nacl_gc, [ --enable-nacl-gc Enable Native Client garbage collection], enable_nacl_gc=$enableval, enable_nacl_gc=no)
|
||||
|
||||
AM_CONDITIONAL(NACL_CODEGEN, test x$enable_nacl_codegen != xno)
|
||||
|
||||
dnl
|
||||
dnl Hack to use system mono for operations in build/install not allowed in NaCl.
|
||||
dnl
|
||||
nacl_self_host=""
|
||||
if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xyes"; then
|
||||
nacl_self_host="nacl_self_host"
|
||||
fi
|
||||
AC_SUBST(nacl_self_host)
|
||||
|
||||
if test "x$enable_nacl_codegen" = "xyes"; then
|
||||
MONO_NACL_ALIGN_MASK_OFF=1
|
||||
AC_DEFINE(TARGET_NACL, 1, [...])
|
||||
AC_DEFINE(__native_client_codegen__, 1, [...])
|
||||
fi
|
||||
if test "x$enable_nacl_gc" = "xyes"; then
|
||||
if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
|
||||
INSTRUMENT_CFLAG="-finstrument-for-thread-suspension"
|
||||
else
|
||||
# Not yet implemented
|
||||
INSTRUMENT_CFLAG=""
|
||||
fi
|
||||
CPPFLAGS="$CPPFLAGS $INSTRUMENT_CFLAG -D__native_client_gc__"
|
||||
fi
|
||||
AC_SUBST(MONO_NACL_ALIGN_MASK_OFF)
|
||||
|
||||
dnl **************************
|
||||
dnl *** AOT cross offsets ***
|
||||
dnl **************************
|
||||
@@ -3126,6 +3155,12 @@ case "$host" in
|
||||
mingw*)
|
||||
;;
|
||||
esac
|
||||
case "$host" in
|
||||
x86_64-*-nacl*)
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
sparc*-*-*)
|
||||
if test "x$ac_cv_sizeof_void_p" = "x8"; then
|
||||
@@ -3206,6 +3241,13 @@ case "$host" in
|
||||
ACCESS_UNALIGNED="no"
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
;;
|
||||
# TODO: make proper support for NaCl host.
|
||||
# arm*-*nacl)
|
||||
# TARGET=ARM;
|
||||
# arch_target=arm;
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# AOT_SUPPORTED="no"
|
||||
# ;;
|
||||
aarch64-*)
|
||||
# https://lkml.org/lkml/2012/7/15/133
|
||||
TARGET=ARM64
|
||||
@@ -3266,6 +3308,38 @@ if test "x$host" != "x$target"; then
|
||||
sizeof_register=8
|
||||
target_byte_order=G_BIG_ENDIAN
|
||||
;;
|
||||
x86_64-*-nacl)
|
||||
TARGET=AMD64
|
||||
arch_target=amd64
|
||||
AC_DEFINE(TARGET_AMD64, 1, [...])
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
;;
|
||||
# TODO: make proper support for NaCl target.
|
||||
# arm*-*nacl)
|
||||
# TARGET=ARM
|
||||
# arch_target=arm
|
||||
# AC_DEFINE(TARGET_ARM, 1, [...])
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# sizeof_register=4
|
||||
# CPPFLAGS="$CPPFLAGS \
|
||||
# -D__ARM_EABI__ \
|
||||
# -D__arm__ \
|
||||
# -D__portable_native_client__ \
|
||||
# -Dtimezone=_timezone \
|
||||
# -DDISABLE_SOCKETS \
|
||||
# -DDISABLE_ATTACH \
|
||||
# -DUSE_NEWLIB"
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
# with_tls=pthread
|
||||
# ;;
|
||||
i686-*-nacl)
|
||||
TARGET=X86
|
||||
arch_target=x86
|
||||
AC_DEFINE(TARGET_X86, 1, [...])
|
||||
sizeof_register=4
|
||||
;;
|
||||
arm*-linux-*)
|
||||
TARGET=ARM;
|
||||
arch_target=arm;
|
||||
@@ -3556,6 +3630,7 @@ fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_INTERPRETER, [test x$enable_interpreter = xyes])
|
||||
|
||||
|
||||
dnl
|
||||
dnl Simple Generational checks (sgen)
|
||||
dnl
|
||||
@@ -4578,7 +4653,6 @@ echo "
|
||||
Xamarin.Mac: $with_xammac
|
||||
Windows AOT: $with_winaot
|
||||
Orbis: $with_orbis
|
||||
Unreal: $with_unreal
|
||||
Test profiles: AOT Full ($with_testing_aot_full), AOT Hybrid ($with_testing_aot_hybrid)
|
||||
JNI support: $jdk_headers_found
|
||||
libgdiplus: $libgdiplus_msg
|
||||
|
||||
+1
-1
@@ -141,7 +141,7 @@ AC_CHECK_SIZEOF(int)
|
||||
AC_CHECK_SIZEOF(void *)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf strerror_r)
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ typedef signed @GSIZE@ gssize;
|
||||
#define G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#if defined (HOST_WATCHOS)
|
||||
#if defined (__native_client__) || defined (HOST_WATCHOS)
|
||||
#undef G_BREAKPOINT
|
||||
#define G_BREAKPOINT()
|
||||
#endif
|
||||
|
||||
@@ -154,6 +154,15 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
|
||||
gchar *
|
||||
g_get_current_dir (void)
|
||||
{
|
||||
#ifdef __native_client__
|
||||
char *buffer;
|
||||
if ((buffer = g_getenv("NACL_PWD"))) {
|
||||
buffer = g_strdup(buffer);
|
||||
} else {
|
||||
buffer = g_strdup(".");
|
||||
}
|
||||
return buffer;
|
||||
#else
|
||||
int s = 32;
|
||||
char *buffer = NULL, *r;
|
||||
gboolean fail;
|
||||
@@ -172,4 +181,5 @@ g_get_current_dir (void)
|
||||
* so we return the buffer here since it has a pointer to the valid string
|
||||
*/
|
||||
return buffer;
|
||||
#endif
|
||||
}
|
||||
@@ -14,7 +14,6 @@
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <eglib-config.h>
|
||||
#ifndef EGLIB_NO_REMAP
|
||||
|
||||
+1
-69
@@ -32,12 +32,6 @@
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
/*
|
||||
* g_strndup and g_vasprintf need to allocate memory with g_malloc if
|
||||
* ENABLE_OVERRIDABLE_ALLOCATORS is defined so that it can be safely freed with g_free
|
||||
@@ -197,72 +191,10 @@ g_strdup_printf (const gchar *format, ...)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Max error number we support. It's empirically found by looking at our target OS.
|
||||
|
||||
Last this was checked was June-2017.
|
||||
|
||||
Apple is at 106.
|
||||
Android is at 133.
|
||||
*/
|
||||
#define MONO_ERRNO_MAX 200
|
||||
#define str(s) #s
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static pthread_mutex_t strerror_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
#endif
|
||||
|
||||
static char *error_messages [MONO_ERRNO_MAX];
|
||||
|
||||
const gchar *
|
||||
g_strerror (gint errnum)
|
||||
{
|
||||
if (errnum < 0)
|
||||
errnum = -errnum;
|
||||
if (errnum >= MONO_ERRNO_MAX)
|
||||
return ("Error number higher than " str (MONO_ERRNO_MAX));
|
||||
|
||||
if (!error_messages [errnum]) {
|
||||
#ifndef G_OS_WIN32
|
||||
pthread_mutex_lock (&strerror_lock);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRERROR_R
|
||||
char tmp_buff [128]; //Quite arbitrary, should be large enough
|
||||
char *buff = tmp_buff;
|
||||
int buff_len = sizeof (tmp_buff);
|
||||
int r;
|
||||
buff [0] = 0;
|
||||
|
||||
while ((r = strerror_r (errnum, buff, buff_len - 1))) {
|
||||
if (r != ERANGE) {
|
||||
buff = g_strdup_printf ("Invalid Error code '%d'", errnum);
|
||||
break;
|
||||
}
|
||||
if (buff == tmp_buff)
|
||||
buff = g_malloc (buff_len * 2);
|
||||
else
|
||||
buff = g_realloc (buff, buff_len * 2);
|
||||
buff_len *= 2;
|
||||
//Spec is not clean on whether size argument includes space for null terminator or not
|
||||
}
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup (buff);
|
||||
if (buff != tmp_buff)
|
||||
g_free (buff);
|
||||
#else
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup_printf ("Error code '%d'", errnum);
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
pthread_mutex_unlock (&strerror_lock);
|
||||
#endif
|
||||
|
||||
}
|
||||
return error_messages [errnum];
|
||||
return strerror (errnum);
|
||||
}
|
||||
|
||||
gchar *
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: 1cd7cc5a14...366b5e92d7.
Vendored
+1
-1
Submodule external/bockbuild updated: 4ae08e8dd6...c783777342.
+1
Submodule external/buildtools added at b5cc6e6ab5.
Vendored
+1
-1
Submodule external/cecil updated: c76ba7b410...0b523fa7e0.
Vendored
+1
-1
Submodule external/corefx updated: 7e70a4e923...5b7e0d739f.
Vendored
+1
-1
Submodule external/corert updated: 48dba73801...814f76de6a.
Vendored
+1
-1
Submodule external/ikdasm updated: 1d7d436037...88b67c42ca.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: dcb0a0534d...98069dbb17.
Vendored
+1
-1
Submodule external/xunit-binaries updated: d4433b0972...b8e20d265b.
+13
-29
@@ -181,16 +181,6 @@ Gives the path for the temporary LLVM bitcode file created during AOT.
|
||||
.I info
|
||||
Print the architecture the AOT in this copy of Mono targets and quit.
|
||||
.TP
|
||||
.I interp
|
||||
Generates all required wrappers, so that it is possible to run --interpreter without
|
||||
any code generation at runtime. This option only makes sense with \fBmscorlib.dll\fR.
|
||||
Embedders can set
|
||||
|
||||
.nf
|
||||
mono_jit_set_aot_mode (MONO_AOT_MODE_INTERP);
|
||||
.fi
|
||||
.ne
|
||||
.TP
|
||||
.I ld-flags
|
||||
Additional flags to pass to the C linker (if the current AOT mode calls for invoking it).
|
||||
.TP
|
||||
@@ -300,7 +290,7 @@ mono_aot_register_module (mono_aot_module_hello_info);
|
||||
.I stats
|
||||
Print various stats collected during AOT compilation.
|
||||
.TP
|
||||
.I temp-path=[path]
|
||||
.I temp_path=[path]
|
||||
Explicitly specify path to store temporary files created during AOT compilation.
|
||||
.TP
|
||||
.I threads=[number]
|
||||
@@ -1101,6 +1091,11 @@ code generation backend. For example \fBLLVM_COUNT=10\fR would only
|
||||
compile 10 methods with LLVM and then switch to the Mono JIT engine.
|
||||
\fBLLVM_COUNT=0\fR would disable the LLVM engine altogether.
|
||||
.TP
|
||||
\fBMONO_AOT_CACHE\fR
|
||||
If set, this variable will instruct Mono to ahead-of-time compile new
|
||||
assemblies on demand and store the result into a cache in
|
||||
~/.mono/aot-cache.
|
||||
.TP
|
||||
\fBMONO_ASPNET_INHIBIT_SETTINGSMAP\fR
|
||||
Mono contains a feature which allows modifying settings in the .config files shipped
|
||||
with Mono by using config section mappers. The mappers and the mapping rules are
|
||||
@@ -1309,19 +1304,10 @@ first generation (of two). A larger nursery will usually speed up the
|
||||
program but will obviously use more memory. The default nursery size
|
||||
4 MB.
|
||||
.TP
|
||||
\fBmajor=\fIcollector\fR
|
||||
Specifies which major collector to use.
|
||||
Options are `marksweep' for the Mark&Sweep collector, `marksweep-conc'
|
||||
for concurrent Mark&Sweep and `marksweep-conc-par' for parallel and
|
||||
concurrent Mark&Sweep. The concurrent Mark&Sweep collector is the default.
|
||||
.TP
|
||||
\fBmode=balanced|throughput|pause\fR[:\fImax-pause\fR]
|
||||
Specifies what should be the garbage collector's target. The `throughput'
|
||||
mode aims to reduce time spent in the garbage collector and improve
|
||||
application speed, the `pause' mode aims to keep pause times to a minimum
|
||||
and it receives the argument \fImax-pause\fR which specifies the maximum
|
||||
pause time in milliseconds that is acceptable and the `balanced' mode
|
||||
which is a general purpose optimal mode.
|
||||
\fBmajor=\fIcollector\fR Specifies which major collector to use.
|
||||
Options are `marksweep' for the Mark&Sweep collector, and
|
||||
`marksweep-conc' for concurrent Mark&Sweep. The non-concurrent
|
||||
Mark&Sweep collector is the default.
|
||||
.TP
|
||||
\fBsoft-heap-limit=\fIsize\fR
|
||||
Once the heap size gets larger than this size, ignore what the default
|
||||
@@ -1384,11 +1370,9 @@ more memory when it reaches a stable size.
|
||||
This option is EXPERIMENTAL, so it might disappear in later versions of mono.
|
||||
.TP
|
||||
\fBminor=\fIminor-collector\fR
|
||||
Specifies which minor collector to use. Options are `simple' which
|
||||
promotes all objects from the nursery directly to the old generation,
|
||||
`simple-par' which has same promotion behavior as `simple' but using
|
||||
multiple workers and `split' which lets objects stay longer on the nursery
|
||||
before promoting.
|
||||
Specifies which minor collector to use. Options are 'simple' which
|
||||
promotes all objects from the nursery directly to the old generation
|
||||
and 'split' which lets object stay longer on the nursery before promoting.
|
||||
.TP
|
||||
\fBalloc-ratio=\fIratio\fR
|
||||
Specifies the ratio of memory from the nursery to be use by the alloc space.
|
||||
|
||||
+2
-4
@@ -23,7 +23,6 @@ xbuild_12_SUBDIRS := build class tools/xbuild
|
||||
xbuild_14_SUBDIRS := build class tools/xbuild
|
||||
winaot_SUBDIRS := build class
|
||||
orbis_SUBDIRS := build class
|
||||
unreal_SUBDIRS := build class
|
||||
|
||||
include build/rules.make
|
||||
|
||||
@@ -78,7 +77,6 @@ $(_boot_:%=profile-do--testing_aot_hybrid--%): profile-do--testing_aot_hy
|
||||
$(_boot_:%=profile-do--testing_aot_full--%): profile-do--testing_aot_full--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--winaot--%): profile-do--winaot--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--orbis--%): profile-do--orbis--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--unreal--%): profile-do--unreal--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
|
||||
|
||||
testcorlib:
|
||||
@@ -144,13 +142,13 @@ distcheck: dist-tarball
|
||||
MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/
|
||||
GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/GenAPI.exe
|
||||
MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll Mono.Profiler.Log.dll)
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll)
|
||||
MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
|
||||
MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)
|
||||
|
||||
$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt
|
||||
@mkdir -p $(dir $@)
|
||||
$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -assembly:$< || echo "Couldn't process assembly." > $@
|
||||
$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -assembly:$< || echo "Couldn't process assembly." > $@
|
||||
|
||||
mono-api-current: $(MONO_API_ASSEMBLIES_CS)
|
||||
|
||||
|
||||
@@ -320,9 +320,8 @@ include ../../build/library.make
|
||||
|
||||
Where you library is called $(LIBRARY); it will be put into
|
||||
$(topdir)/class/lib. LIB_MCS_FLAGS is the set of MCS flags to use when
|
||||
compiling the library; in addition, a global set of flags called
|
||||
$(LIBRARY_FLAGS) is added (that variable is defined in
|
||||
config-defaults.make), as well as the usual $(LOCAL_MCS_FLAGS).
|
||||
compiling the library; in addition, a set of flags called
|
||||
$(LOCAL_MCS_FLAGS) is added.
|
||||
|
||||
As in executable.make, the sources for your library are listed in
|
||||
$(LIBRARY).sources. Note: these source lists should have Unix forward
|
||||
@@ -418,13 +417,15 @@ just "mono --debug".
|
||||
|
||||
|
||||
|
||||
* Calling the compiler directly? Use $(MCS).
|
||||
* Calling the compiler directly? Use $(BUILD_MCS).
|
||||
|
||||
Really, you should use $(CSCOMPILE) whenever possible, but $(MCS) is
|
||||
out there. $(BOOTSTRAP_MCS) is the C# compiler that we use to build
|
||||
mcs.exe; on Linux, we then use mcs.exe to build everything else, but
|
||||
on Windows, we use csc.exe to build everything. Only use
|
||||
$(BOOTSTRAP_MCS) if you know what you're doing.
|
||||
Really, you should use $(CSCOMPILE) whenever possible, but $(BUILD_MCS) is
|
||||
out there. For the `basic` profile, $(BUILD_MCS) is the C# compiler that we
|
||||
use to build mcs.exe; on Linux, we then use mcs.exe to build everything else,
|
||||
but on Windows, we use csc.exe to build everything. For the `build` profile,
|
||||
$(BUILD_MCS) is the C# compiler we built in the `basic` profile. For the
|
||||
other profiles, $(BUILD_MCS) is the C# compiler we built in the `build`
|
||||
profile.
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ PLATFORM_CHANGE_SEPARATOR_CMD
|
||||
A command to change filename separators given on stdin. Leave undefined
|
||||
if Unixy filenames will work. See win32.make.
|
||||
|
||||
BOOTSTRAP_MCS
|
||||
BUILD_MCS
|
||||
The C# compiler used to compile mcs/mcs.exe, and possibly other
|
||||
assemblies if the user is doing a standalone build (that is, not
|
||||
a bootstrap).
|
||||
|
||||
@@ -40,14 +40,7 @@ class X {
|
||||
if (!Version.TryParse (field.GetValue (null) as string, out version))
|
||||
return 4;
|
||||
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 4);
|
||||
#else
|
||||
min_mono_version = new Version (4, 9);
|
||||
#endif
|
||||
|
||||
if (version < min_mono_version)
|
||||
if (version < new Version (4, 9))
|
||||
return 5;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -14,7 +14,6 @@ TEST_HARNESS = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/$(PARENT_PROFILE)nunit-l
|
||||
PLATFORM_DEBUG_FLAGS = /debug:portable
|
||||
MCS_FLAGS =
|
||||
MBAS_FLAGS = -debug
|
||||
LIBRARY_FLAGS =
|
||||
ifndef CFLAGS
|
||||
CFLAGS = -g -O2
|
||||
endif
|
||||
|
||||
@@ -20,25 +20,18 @@ endif
|
||||
|
||||
ifndef the_libdir
|
||||
the_libdir = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/
|
||||
ifdef PROGRAM_USE_INTERMEDIATE_FILE
|
||||
build_libdir = $(the_libdir)tmp/
|
||||
else
|
||||
build_libdir = $(the_libdir)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef base_prog_config
|
||||
PROGRAM_config := $(build_libdir)$(PROGRAM).config
|
||||
PROGRAM_config := $(the_libdir)$(PROGRAM).config
|
||||
endif
|
||||
|
||||
sn = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/sn.exe
|
||||
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
|
||||
sn = $(topdir)/class/lib/$(BUILD_PROFILE)/sn.exe
|
||||
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
|
||||
|
||||
the_lib = $(the_libdir)$(base_prog)
|
||||
build_lib = $(build_libdir)$(base_prog)
|
||||
|
||||
executable_CLEAN_FILES += $(the_lib) $(the_lib).so $(the_lib).mdb $(the_lib:.exe=.pdb)
|
||||
executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib:.exe=.pdb)
|
||||
executable_CLEAN_FILES += $(the_lib) $(the_lib).so $(the_lib).mdb $(the_lib:.exe=.pdb)
|
||||
|
||||
makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
|
||||
|
||||
@@ -124,19 +117,12 @@ $(topdir)/class/lib/$(PROFILE)/.stamp: | $(topdir)/class/lib/$(PROFILE)-$(HOST_P
|
||||
$(if $(filter $(HOST_PLATFORM),$(BUILD_PLATFORM)),$(if $(filter $(BUILD_PLATFORM),win32),CYGWIN=winsymlinks:nativestrict) ln -s $(abspath $(topdir)/class/lib/$(PROFILE)-$(BUILD_PLATFORM)) $(abspath $(topdir)/class/lib/$(PROFILE)))
|
||||
endif
|
||||
|
||||
$(build_lib): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response) $(build_libdir:=/.stamp)
|
||||
$(the_lib): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response) $(the_libdir:=/.stamp)
|
||||
$(PROGRAM_COMPILE) $(MCS_REFERENCES) -target:exe -out:$@ $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
|
||||
ifdef PROGRAM_SNK
|
||||
$(Q) $(SN) -R $@ $(PROGRAM_SNK)
|
||||
endif
|
||||
|
||||
ifdef PROGRAM_USE_INTERMEDIATE_FILE
|
||||
$(the_lib): $(build_lib)
|
||||
$(Q) cp $(build_lib) $@
|
||||
$(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb [email protected]
|
||||
$(Q) test ! -f $(build_lib:.exe=.pdb) || mv $(build_lib:.exe=.pdb) $(the_lib:.exe=.pdb)
|
||||
endif
|
||||
|
||||
ifdef PROGRAM_config
|
||||
ifneq ($(base_prog_config),$(PROGRAM_config))
|
||||
executable_CLEAN_FILES += $(PROGRAM_config)
|
||||
@@ -147,7 +133,7 @@ endif
|
||||
|
||||
$(makefrag): $(sourcefile)
|
||||
# @echo Creating $@ ...
|
||||
@sed 's,^,$(build_lib): ,' $< >$@
|
||||
@sed 's,^,$(the_lib): ,' $< >$@
|
||||
@if test ! -f $(sourcefile).makefrag; then :; else \
|
||||
cat $(sourcefile).makefrag >> $@ ; \
|
||||
echo '$@: $(sourcefile).makefrag' >> $@; \
|
||||
@@ -176,10 +162,10 @@ csproj-local:
|
||||
config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo $(is_boot); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
|
||||
echo $(USE_MCS_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
|
||||
echo $(PROGRAM); \
|
||||
echo $(BUILT_SOURCES_cmdline); \
|
||||
echo $(build_lib); \
|
||||
echo $(the_lib); \
|
||||
echo $(FRAMEWORK_VERSION); \
|
||||
echo $(PROFILE); \
|
||||
echo $(RESOURCE_DEFS); \
|
||||
|
||||
+22
-47
@@ -38,11 +38,8 @@ endif
|
||||
|
||||
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE_DIRECTORY)/$(if $(LIBRARY_SUBDIR),$(LIBRARY_SUBDIR)/)
|
||||
|
||||
ifdef RESOURCE_STRINGS
|
||||
ifneq (basic, $(PROFILE))
|
||||
RESOURCE_STRINGS_FILES += $(RESOURCE_STRINGS:%=--resourcestrings:%)
|
||||
endif
|
||||
endif
|
||||
the_libdir = $(the_libdir_base)$(intermediate)
|
||||
the_lib = $(the_libdir)$(LIBRARY_NAME)
|
||||
|
||||
#
|
||||
# The bare directory contains the plain versions of System and System.Xml
|
||||
@@ -55,25 +52,18 @@ bare_libdir = $(the_libdir_base)bare
|
||||
#
|
||||
secxml_libdir = $(the_libdir_base)secxml
|
||||
|
||||
the_libdir = $(the_libdir_base)$(intermediate)
|
||||
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
build_libdir = $(the_libdir)tmp/
|
||||
else
|
||||
build_libdir = $(the_libdir)
|
||||
ifdef RESOURCE_STRINGS
|
||||
ifneq (basic, $(PROFILE))
|
||||
RESOURCE_STRINGS_FILES += $(RESOURCE_STRINGS:%=--resourcestrings:%)
|
||||
endif
|
||||
endif
|
||||
|
||||
the_lib = $(the_libdir)$(LIBRARY_NAME)
|
||||
build_lib = $(build_libdir)$(LIBRARY_NAME)
|
||||
library_CLEAN_FILES += $(the_lib) $(the_lib).so $(the_lib).mdb $(the_lib:.dll=.pdb)
|
||||
library_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib:.dll=.pdb)
|
||||
|
||||
ifdef NO_SIGN_ASSEMBLY
|
||||
SN = :
|
||||
else
|
||||
ifeq ("$(SN)","")
|
||||
sn = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/sn.exe
|
||||
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
|
||||
sn = $(topdir)/class/lib/$(BUILD_PROFILE)/sn.exe
|
||||
SN = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) -q
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -90,12 +80,6 @@ ifndef NO_BUILD
|
||||
all-local: $(the_lib) $(extra_targets)
|
||||
endif
|
||||
|
||||
ifeq ($(LIBRARY_COMPILE),$(BOOT_COMPILE))
|
||||
is_boot=true
|
||||
else
|
||||
is_boot=false
|
||||
endif
|
||||
|
||||
csproj-local: csproj-library csproj-test
|
||||
|
||||
intermediate_clean=$(subst /,-,$(intermediate))
|
||||
@@ -103,11 +87,11 @@ csproj-library:
|
||||
config_file=`basename $(LIBRARY) .dll`-$(intermediate_clean)$(PROFILE).input; \
|
||||
case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; *"legacy"*) config_file=legacy_$$config_file;; esac; \
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo $(is_boot); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
|
||||
(echo $(if $(filter $(PROFILE),basic),true,false); \
|
||||
echo $(USE_MCS_FLAGS) $(LIB_MCS_FLAGS); \
|
||||
echo $(LIBRARY_NAME); \
|
||||
echo $(BUILT_SOURCES_cmdline); \
|
||||
echo $(build_lib); \
|
||||
echo $(the_lib); \
|
||||
echo $(FRAMEWORK_VERSION); \
|
||||
echo $(PROFILE); \
|
||||
echo $(RESOURCE_DEFS); \
|
||||
@@ -244,10 +228,6 @@ dist-local: dist-default
|
||||
for d in . $$subs ; do \
|
||||
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
|
||||
|
||||
ifndef LIBRARY_COMPILE
|
||||
LIBRARY_COMPILE = $(CSCOMPILE)
|
||||
endif
|
||||
|
||||
ifndef LIBRARY_SNK
|
||||
LIBRARY_SNK = $(topdir)/class/mono.snk
|
||||
endif
|
||||
@@ -284,7 +264,7 @@ library_CLEAN_FILES += $(response)
|
||||
makefrag = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).makefrag
|
||||
$(makefrag): $(sourcefile) $(topdir)/build/library.make $(depsdir)/.stamp
|
||||
# @echo Creating $@ ...
|
||||
@sed 's,^,$(build_lib): ,' $< >$@
|
||||
@sed 's,^,$(the_lib): ,' $< >$@
|
||||
@if test ! -f $(sourcefile).makefrag; then :; else \
|
||||
cat $(sourcefile).makefrag >> $@ ; \
|
||||
echo '$@: $(sourcefile).makefrag' >> $@; \
|
||||
@@ -307,30 +287,25 @@ endif
|
||||
|
||||
ifndef NO_BUILD
|
||||
|
||||
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir)/.stamp $(GEN_RESOURCE_DEPS)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
$(the_lib): $(response) $(sn) $(BUILT_SOURCES) $(the_libdir)/.stamp $(GEN_RESOURCE_DEPS)
|
||||
$(CSCOMPILE) $(LIB_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
ifdef RESOURCE_STRINGS_FILES
|
||||
$(Q) $(STRING_REPLACER) $(RESOURCE_STRINGS_FILES) $@
|
||||
endif
|
||||
$(Q) $(SN) -R $@ $(LIBRARY_SNK)
|
||||
echo $(Q) $(SN) -R $@ $(LIBRARY_SNK)
|
||||
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
$(the_lib): $(build_lib)
|
||||
$(Q) cp $(build_lib) $@
|
||||
$(Q) $(SN) -v $@
|
||||
$(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb [email protected]
|
||||
$(Q) test ! -f $(build_lib:.dll=.pdb) || mv $(build_lib:.dll=.pdb) $(the_lib:.dll=.pdb)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
library_CLEAN_FILES += $(PROFILE)_$(LIBRARY_NAME)_aot.log
|
||||
library_CLEAN_FILES += $(the_lib) $(the_lib).mdb $(the_lib:.dll=.pdb)
|
||||
|
||||
ifdef PLATFORM_AOT_SUFFIX
|
||||
|
||||
$(the_lib)$(PLATFORM_AOT_SUFFIX): $(the_lib)
|
||||
$(Q_AOT) MONO_PATH='$(the_libdir_base)' > $(PROFILE)_$(LIBRARY_NAME)_aot.log 2>&1 $(RUNTIME) $(AOT_BUILD_FLAGS) --debug $(the_lib)
|
||||
|
||||
all-local-aot: $(the_lib)$(PLATFORM_AOT_SUFFIX)
|
||||
|
||||
library_CLEAN_FILES += $(the_lib)$(PLATFORM_AOT_SUFFIX) $(PROFILE)_$(LIBRARY_NAME)_aot.log
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
# for now, don't give any /lib flags or set MONO_PATH, since we
|
||||
@@ -358,4 +333,4 @@ gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
|
||||
update-corefx-sr: $(RESX_RESOURCE_STRING)
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs
|
||||
@@ -0,0 +1,162 @@
|
||||
# -*- makefile -*-
|
||||
#
|
||||
# The rules for building with msbuild.
|
||||
#
|
||||
# The NO_TEST stuff is not too pleasant but whatcha
|
||||
# gonna do.
|
||||
|
||||
ifndef ASSEMBLY_NAME
|
||||
ASSEMBLY_NAME = $(ASSEMBLY)
|
||||
endif
|
||||
|
||||
the_assemblydir_base = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/$(if $(ASSEMBLY_SUBDIR),$(ASSEMBLY_SUBDIR)/)
|
||||
|
||||
the_assemblydir = $(the_assemblydir_base)$(intermediate)
|
||||
the_assembly = $(the_assemblydir)$(ASSEMBLY_NAME)
|
||||
|
||||
ifeq ($(BUILD_PLATFORM), win32)
|
||||
GACDIR = `cygpath -w $(mono_libdir)`
|
||||
GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`
|
||||
test_flags += -d:WINDOWS
|
||||
else
|
||||
GACDIR = $(mono_libdir)
|
||||
GACROOT = $(DESTDIR)$(mono_libdir)
|
||||
endif
|
||||
|
||||
ifndef NO_BUILD
|
||||
all-local: $(extra_targets)
|
||||
endif
|
||||
|
||||
csproj-local:
|
||||
|
||||
install-local: all-local
|
||||
test-local: all-local
|
||||
uninstall-local:
|
||||
|
||||
ifdef NO_INSTALL
|
||||
install-local uninstall-local:
|
||||
@:
|
||||
|
||||
else
|
||||
|
||||
aot_lib = $(the_assembly)$(PLATFORM_AOT_SUFFIX)
|
||||
aot_libname = $(ASSEMBLY_NAME)$(PLATFORM_AOT_SUFFIX)
|
||||
|
||||
ifdef ASSEMBLY_INSTALL_DIR
|
||||
install-local:
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)
|
||||
$(INSTALL_LIB) $(the_assembly) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME)
|
||||
test ! -f $(the_assembly).mdb || $(INSTALL_LIB) $(the_assembly).mdb $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME).mdb
|
||||
test ! -f $(the_assembly:.dll=.pdb) || $(INSTALL_LIB) $(the_assembly:.dll=.pdb) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME:.dll=.pdb)
|
||||
|
||||
ifdef PLATFORM_AOT_SUFFIX
|
||||
test ! -f $(aot_lib) || $(INSTALL_LIB) $(aot_lib) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)
|
||||
endif
|
||||
|
||||
uninstall-local:
|
||||
-rm -f $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME) $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME).mdb $(DESTDIR)$(ASSEMBLY_INSTALL_DIR)/$(ASSEMBLY_NAME:.dll=.pdb)
|
||||
|
||||
else
|
||||
|
||||
# If RUNTIME_HAS_CONSISTENT_GACDIR is set, it implies that the internal GACDIR
|
||||
# of the runtime is the same as the GACDIR we want. So, we don't need to pass it
|
||||
# to gacutil. Note that the GACDIR we want may not be the same as the value of
|
||||
# GACDIR set above, since the user could have overridden the value of $(prefix).
|
||||
#
|
||||
# This makes a difference only when we're building from the mono/ tree, since we
|
||||
# have to ensure that the internal GACDIR of the in-tree runtime matches where we
|
||||
# install the DLLs.
|
||||
|
||||
ifndef RUNTIME_HAS_CONSISTENT_GACDIR
|
||||
gacdir_flag = /gacdir $(GACDIR)
|
||||
endif
|
||||
|
||||
ifndef ASSEMBLY_PACKAGE
|
||||
ifdef ASSEMBLY_COMPAT
|
||||
ASSEMBLY_PACKAGE = compat-$(FRAMEWORK_VERSION)
|
||||
else
|
||||
ASSEMBLY_PACKAGE = $(FRAMEWORK_VERSION)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (none, $(ASSEMBLY_PACKAGE))
|
||||
package_flag = /package $(ASSEMBLY_PACKAGE)
|
||||
endif
|
||||
|
||||
install-local: $(gacutil)
|
||||
$(GACUTIL) /i $(the_assembly) /f $(gacdir_flag) /root $(GACROOT) $(package_flag)
|
||||
|
||||
uninstall-local: $(gacutil)
|
||||
-$(GACUTIL) /u $(ASSEMBLY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) $(package_flag)
|
||||
|
||||
endif # ASSEMBLY_INSTALL_DIR
|
||||
endif # NO_INSTALL
|
||||
|
||||
clean-local:
|
||||
-rm -rf $(tests_CLEAN_FILES) $(assembly_CLEAN_FILES) $(CLEAN_FILES)
|
||||
|
||||
test-local run-test-local run-test-ondotnet-local:
|
||||
@:
|
||||
|
||||
DISTFILES = $(wildcard $(ASSEMBLY:$(ASSEMBLY_EXT)=.csproj)) $(EXTRA_DISTFILES)
|
||||
|
||||
ASSEMBLY_EXT = $(suffix $(ASSEMBLY))
|
||||
include $(topdir)/build/tests.make
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
DISTFILES += $(test_sourcefile)
|
||||
endif
|
||||
|
||||
# make dist will collect files in .sources files from all profiles
|
||||
dist-local: dist-default
|
||||
subs=' ' ; \
|
||||
for f in `$(topdir)/tools/removecomments.sh $(filter-out $(wildcard *_test.dll.sources) $(wildcard *_xtest.dll.sources) $(wildcard *exclude.sources),$(wildcard *.sources))` $(TEST_FILES) ; do \
|
||||
case $$f in \
|
||||
../*) : ;; \
|
||||
*.g.cs) : ;; \
|
||||
*) dest=`dirname "$$f"` ; \
|
||||
case $$subs in *" $$dest "*) : ;; *) subs=" $$dest$$subs" ; $(MKINSTALLDIRS) $(distdir)/$$dest ;; esac ; \
|
||||
cp -p "$$f" $(distdir)/$$dest || exit 1 ;; \
|
||||
esac ; done ; \
|
||||
for d in . $$subs ; do \
|
||||
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
|
||||
|
||||
# The assembly
|
||||
|
||||
ifndef NO_BUILD
|
||||
ifdef PLATFORM_AOT_SUFFIX
|
||||
|
||||
$(the_assembly)$(PLATFORM_AOT_SUFFIX): $(the_assembly)
|
||||
$(Q_AOT) MONO_PATH='$(the_assemblydir_base)' > $(PROFILE)_$(ASSEMBLY_NAME)_aot.log 2>&1 $(RUNTIME) $(AOT_BUILD_FLAGS) --debug $(the_assembly)
|
||||
|
||||
all-local-aot: $(the_assembly)$(PLATFORM_AOT_SUFFIX)
|
||||
|
||||
assembly_CLEAN_FILES += $(the_assembly)$(PLATFORM_AOT_SUFFIX) $(PROFILE)_$(ASSEMBLY_NAME)_aot.log
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
# for now, don't give any /lib flags or set MONO_PATH, since we
|
||||
# give a full path to the assembly.
|
||||
|
||||
## Include corcompare stuff
|
||||
include $(topdir)/build/corcompare.make
|
||||
|
||||
ifndef NO_BUILD
|
||||
all-local: $(test_makefrag) $(btest_makefrag)
|
||||
endif
|
||||
|
||||
$(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/msbuild.make $(depsdir)/.stamp
|
||||
|
||||
## Documentation stuff
|
||||
|
||||
doc-update-local: $(the_assemblydir)/.doc-stamp
|
||||
|
||||
$(the_assemblydir)/.doc-stamp: $(the_assembly)
|
||||
$(MDOC_UP) $(the_assembly)
|
||||
@echo "doc-stamp" > $@
|
||||
|
||||
gen-deps:
|
||||
|
||||
update-corefx-sr: $(RESX_RESOURCE_STRING)
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs
|
||||
@@ -0,0 +1,188 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Choose>
|
||||
<When Condition="'$(BuildPlatform)' == 'darwin'">
|
||||
</When>
|
||||
<When Condition="'$(BuildPlatform)' == 'linux'">
|
||||
</When>
|
||||
<When Condition="'$(BuildPlatform)' == 'win32'">
|
||||
</When>
|
||||
</Choose>
|
||||
|
||||
<Choose>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'basic'">
|
||||
<PropertyGroup>
|
||||
<Profile>basic</Profile>
|
||||
<HostPlatform>$(BuildPlatform)</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'build-darwin'">
|
||||
<PropertyGroup>
|
||||
<Profile>build</Profile>
|
||||
<HostPlatform>darwin</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'build-linux'">
|
||||
<PropertyGroup>
|
||||
<Profile>build</Profile>
|
||||
<HostPlatform>linux</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'build-win32'">
|
||||
<PropertyGroup>
|
||||
<Profile>build</Profile>
|
||||
<HostPlatform>win32</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'net_4_x-darwin'">
|
||||
<PropertyGroup>
|
||||
<Profile>net_4_x</Profile>
|
||||
<HostPlatform>darwin</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'net_4_x-linux'">
|
||||
<PropertyGroup>
|
||||
<Profile>net_4_x</Profile>
|
||||
<HostPlatform>linux</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'net_4_x-win32'">
|
||||
<PropertyGroup>
|
||||
<Profile>net_4_x</Profile>
|
||||
<HostPlatform>win32</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'binary_reference_assemblies'">
|
||||
<PropertyGroup>
|
||||
<Profile>binary_reference_assemblies</Profile>
|
||||
<HostPlatform>$(BuildPlatform)</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_12-darwin'">
|
||||
<PropertyGroup>
|
||||
<Profile>xbuild_12</Profile>
|
||||
<HostPlatform>darwin</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_12-linux'">
|
||||
<PropertyGroup>
|
||||
<Profile>xbuild_12</Profile>
|
||||
<HostPlatform>linux</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_12-win32'">
|
||||
<PropertyGroup>
|
||||
<Profile>xbuild_12</Profile>
|
||||
<HostPlatform>win32</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_14-darwin'">
|
||||
<PropertyGroup>
|
||||
<Profile>xbuild_14</Profile>
|
||||
<HostPlatform>darwin</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_14-linux'">
|
||||
<PropertyGroup>
|
||||
<Profile>xbuild_14</Profile>
|
||||
<HostPlatform>linux</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Profile)' == '' AND '$(HostPlatform)' == '' AND '$(Configuration)' == 'xbuild_14-win32'">
|
||||
<PropertyGroup>
|
||||
<Profile>xbuild_14</Profile>
|
||||
<HostPlatform>win32</HostPlatform>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
|
||||
<Import Project="$(MSBuildThisFileDirectory)\profiles\$(Profile).props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<BuildPlatform Condition="'$(BuildPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</BuildPlatform>
|
||||
<BuildPlatform Condition="'$(BuildPlatform)' == '' and '$(OS)' == 'Unix'">linux</BuildPlatform>
|
||||
<BuildPlatform Condition="'$(BuildPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</BuildPlatform>
|
||||
<HostPlatform Condition="'$(HostPlatform)' == ''">$(BuildPlatform)</HostPlatform>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<CodePage Condition="'$(CodePage)' == ''">65001</CodePage>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == '' AND '$(BuildIntermediate)' == ''">obj-$(ProfileDirectory)</IntermediateOutputPath>
|
||||
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == '' AND '$(BuildIntermediate)' != ''">obj-$(ProfileDirectory)-$(BuildIntermediate)</IntermediateOutputPath>
|
||||
<OutputPath Condition="'$(OutputPath)' == '' AND '$(BuildIntermediate)' == ''">$(MSBuildThisFileDirectory)\..\class\lib\$(ProfileDirectory)</OutputPath>
|
||||
<OutputPath Condition="'$(OutputPath)' == '' AND '$(BuildIntermediate)' != ''">$(MSBuildThisFileDirectory)\..\class\lib\$(ProfileDirectory)\$(BuildIntermediate)</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<NoConfig>true</NoConfig>
|
||||
<NoLogo>true</NoLogo>
|
||||
<NoWarn>$(NoWarn),1699</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<BypassFrameworkInstallChecks>true</BypassFrameworkInstallChecks>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<NoStdLib>true</NoStdLib>
|
||||
<NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<CopyNuGetImplementations>false</CopyNuGetImplementations>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- <SignAssembly>true</SignAssembly> -->
|
||||
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\..\class\mono.snk</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<Choose>
|
||||
<When Condition="'$(Configuration)' == 'Debug'">
|
||||
<PropertyGroup>
|
||||
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
|
||||
<Optimize Condition="'$(Optimize)' == ''">false</Optimize>
|
||||
<DebugType Condition="'$(DebugType)' == ''">full</DebugType>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<When Condition="'$(Configuration)' == 'Release'">
|
||||
<PropertyGroup>
|
||||
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
|
||||
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
|
||||
<!-- <DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType> -->
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
|
||||
<PropertyGroup>
|
||||
<!-- Build library by default -->
|
||||
<OutputType>Library</OutputType>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -10,23 +10,26 @@ use_monolite := $(wildcard $(monolite_flag))
|
||||
MONOLITE_MSCORLIB = $(monolite_path)/mscorlib.dll
|
||||
|
||||
ifdef use_monolite
|
||||
ifdef MCS_MODE
|
||||
CSC_LOCATION = $(monolite_path)/mcs.exe
|
||||
endif
|
||||
|
||||
PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
|
||||
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
|
||||
else
|
||||
PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
|
||||
ifdef MCS_MODE
|
||||
BOOTSTRAP_MCS = mcs
|
||||
else
|
||||
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
endif
|
||||
endif
|
||||
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
# ifdef use_monolite
|
||||
# BUILD_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
# else
|
||||
# ifdef MCS_MODE
|
||||
# BUILD_MCS = mcs
|
||||
# else
|
||||
# BUILD_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
# endif
|
||||
# endif
|
||||
|
||||
BUILD_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
|
||||
ifdef MCS_MODE
|
||||
CSC_LOCATION = $(if $(use_monolite),$(monolite_path)/)mcs.exe
|
||||
endif
|
||||
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
@@ -36,9 +39,6 @@ NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
FRAMEWORK_VERSION = 4.0
|
||||
|
||||
# Compiler all using same bootstrap compiler
|
||||
LIBRARY_COMPILE = $(BOOT_COMPILE)
|
||||
|
||||
# Verbose basic only
|
||||
# V = 1
|
||||
|
||||
@@ -111,7 +111,7 @@ endif
|
||||
|
||||
$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
|
||||
$(MAKE) $(MAKE_Q) -C $(topdir)/packages
|
||||
$(BOOTSTRAP_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
|
||||
$(BUILD_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
|
||||
|
||||
$(PROFILE_OUT): $(PROFILE_EXE)
|
||||
$(PROFILE_RUNTIME) $< > $@ 2>&1
|
||||
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;MONO;WIN_PLATFORM;BOOTSTRAP_BASIC</DefineConstants>
|
||||
<FrameworkVersion>4.0</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = basic
|
||||
BUILD_TOOLS_PROFILE = basic
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
BUILD_PROFILE = basic
|
||||
|
||||
PLATFORMS = darwin linux win32
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)-$(HostPlatform)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<FrameworkVersion>4.5</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(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>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<ProfileIsMobileDynamic>true</ProfileIsMobileDynamic>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)\monotouch_runtime.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);FULL_AOT_RUNTIME</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<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</DefineConstants>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<DisableConsole>true</DisableConsole>
|
||||
<DisableBoringTls>true</DisableBoringTls>
|
||||
<EnableAppleTls>true</EnableAppleTls>
|
||||
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)\monotouch.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DisableThreadAbort>true</DisableThreadAbort>
|
||||
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
|
||||
<DisableAppDomains>true</DisableAppDomains>
|
||||
<DisableProcessStart>true</DisableProcessStart>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)\monotouch_runtime.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DisableThreadAbort>true</DisableThreadAbort>
|
||||
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
|
||||
<!-- The binding generator (btv) still needs to execute processes, so we need a System.dll that can do that -->
|
||||
<!-- <DisableProcessStart>true</DisableProcessStart> -->
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)\monotouch.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DisableThreadAbort>true</DisableThreadAbort>
|
||||
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
|
||||
<DisableAppDomains>true</DisableAppDomains>
|
||||
<DisableProcessStart>true</DisableProcessStart>
|
||||
<DisableMonoSecurity>true</DisableMonoSecurity>
|
||||
<EnableAppleTls>true</EnableAppleTls>
|
||||
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
|
||||
<EnableAppleX509>true</EnableAppleX509>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildThisFileDirectory)\monotouch_runtime.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DisableThreadAbort>true</DisableThreadAbort>
|
||||
<DisableThreadSuspendResume>true</DisableThreadSuspendResume>
|
||||
<DisableAppDomains>true</DisableAppDomains>
|
||||
<!-- The binding generator (btv) still needs to execute processes, so we need a System.dll that can do that -->
|
||||
<!-- <DisableProcessStart>true</DisableProcessStart> -->
|
||||
<DisableMonoSecurity>true</DisableMonoSecurity>
|
||||
<EnableAppleTls>true</EnableAppleTls>
|
||||
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
|
||||
<EnableAppleX509>true</EnableAppleX509>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
PLATFORMS = darwin linux win32
|
||||
|
||||
# nuttzing!
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)-$(HostPlatform)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<FrameworkVersion>4.5</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<EnableAppleTls>true</EnableAppleTls>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(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>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<EnableAotTesting>true</EnableAotTesting>
|
||||
<DisableConsole>true</DisableConsole>
|
||||
<DisableBorintTls>true</DisableBorintTls>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(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>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<DisableConsole>true</DisableConsole>
|
||||
<EnableAotTesting>true</EnableAotTesting>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<ProfileIsMobileDynamic>true</ProfileIsMobileDynamic>
|
||||
<DisableConsole>true</DisableConsole>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:MOBILE \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MONO \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
MOBILE_DYNAMIC = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_CONSOLE = yes
|
||||
@@ -1,10 +1,5 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(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>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsAotFriendly>true</ProfileIsAotFriendly>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<EnableAotTesting>true</EnableAotTesting>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(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>
|
||||
<FrameworkVersion>2.1</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<ProfileIsMobile>true</ProfileIsMobile>
|
||||
<ProfileIsMobileDynamic>true</ProfileIsMobileDynamic>
|
||||
<DisableConsole>true</DisableConsole>
|
||||
<DisableBoringTls>true</DisableBoringTls>
|
||||
<EnableAppleTls>true</EnableAppleTls>
|
||||
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
<FrameworkVersion>4.5</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DisableWindowsBase>true</DisableWindowsBase>
|
||||
<DisableSystemWebDependency>true</DisableSystemWebDependency>
|
||||
<DisableSystemWebAppServicesDependency>true</DisableSystemWebAppServicesDependency>
|
||||
<DisableSystemWinformsDependency>true</DisableSystemWinformsDependency>
|
||||
<DisableSystemDrawingDependency>true</DisableSystemDrawingDependency>
|
||||
<DisableSystemServiceModelActivationDependency>true</DisableSystemServiceModelActivationDependency>
|
||||
<DisableSystemDesignDependency>true</DisableSystemDesignDependency>
|
||||
<DisableSystemDirectoryServicesDependency>true</DisableSystemDirectoryServicesDependency>
|
||||
<DisableBoringTls>true</DisableBoringTls>
|
||||
<EnableAppleTls>true</EnableAppleTls>
|
||||
<EnableAppleTlsOnly>true</EnableAppleTlsOnly>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\class\corlib\corlib.csproj" Condition="'$(AssemblyName)' != 'mscorlib'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;XBUILD_12</DefineConstants>
|
||||
<FrameworkVersion>4.5</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="mscorlib">
|
||||
<HintPath>$(MSBuildThisFileDirectory)\..\..\class\lib\net_4_x-$(HostPlatform)\mscorlib.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProfileDirectory>$(Profile)</ProfileDirectory>
|
||||
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;XBUILD_12;XBUILD_14</DefineConstants>
|
||||
<FrameworkVersion>4.5</FrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="mscorlib">
|
||||
<HintPath>$(MSBuildThisFileDirectory)\..\..\class\lib\net_4_x-$(HostPlatform)\mscorlib.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
+15
-19
@@ -25,18 +25,14 @@ Q=$(if $(V),,@)
|
||||
Q_MCS=$(if $(V),,@echo "$(if $(MCS_MODE),MCS,CSC) [$(intermediate)$(PROFILE_DIRECTORY)] $(notdir $(@))";)
|
||||
Q_AOT=$(if $(V),,@echo "AOT [$(intermediate)$(PROFILE_DIRECTORY)] $(notdir $(@))";)
|
||||
|
||||
ifndef BUILD_TOOLS_PROFILE
|
||||
BUILD_TOOLS_PROFILE = build
|
||||
endif
|
||||
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(DEFAULT_REFERENCES)
|
||||
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
|
||||
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
|
||||
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
|
||||
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)) --gc-params=nursery-size=64m
|
||||
CSCOMPILE = $(Q_MCS) $(BUILD_MCS) $(USE_MCS_FLAGS)
|
||||
CSC_RUNTIME_FLAGS = --aot-path=$(abspath $(topdir)/class/lib/$(BUILD_PROFILE)) --gc-params=nursery-size=64m
|
||||
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
|
||||
CCOMPILE = $(CC) $(USE_CFLAGS)
|
||||
BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
|
||||
INSTALL = $(SHELL) $(topdir)/../mono/install-sh
|
||||
INSTALL_DATA = $(INSTALL) -c -m 644
|
||||
INSTALL_BIN = $(INSTALL) -c -m 755
|
||||
@@ -44,26 +40,25 @@ INSTALL_LIB = $(INSTALL_BIN)
|
||||
MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
|
||||
INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
|
||||
INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
|
||||
INTERNAL_CSC_LOCATION = $(CSC_LOCATION)
|
||||
|
||||
BUILD_PROFILE = build
|
||||
# Using CSC_SDK_PATH_DISABLED for sanity check that all references have path specified
|
||||
INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION)
|
||||
BUILD_MCS = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" CSC_SDK_PATH_DISABLED= \
|
||||
$(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
|
||||
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE) $(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
|
||||
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(RESGEN_EXE) $(topdir)/class/lib/$(BUILD_PROFILE)/resgen.exe
|
||||
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_PROFILE)/cil-stringreplacer.exe
|
||||
|
||||
depsdir = $(topdir)/build/deps
|
||||
|
||||
# Make sure these propagate if set manually
|
||||
|
||||
export PROFILE
|
||||
export MCS
|
||||
export MCS_FLAGS
|
||||
export CC
|
||||
export CFLAGS
|
||||
export INSTALL
|
||||
export MKINSTALLDIRS
|
||||
export BOOTSTRAP_MCS
|
||||
export DESTDIR
|
||||
export RESGEN
|
||||
|
||||
@@ -98,6 +93,10 @@ endif
|
||||
|
||||
# Rest of the configuration
|
||||
|
||||
ifdef MCS_MODE
|
||||
CSC_LOCATION = $(topdir)/class/lib/$(BUILD_PROFILE)/mcs.exe
|
||||
endif
|
||||
|
||||
ifndef PROFILE
|
||||
PROFILE = $(DEFAULT_PROFILE)
|
||||
endif
|
||||
@@ -109,12 +108,9 @@ PROFILE_MCS_FLAGS += -optimize
|
||||
endif
|
||||
|
||||
ifdef MCS_MODE
|
||||
INTERNAL_CSC_LOCATION = $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
|
||||
|
||||
ifdef PLATFORM_DEBUG_FLAGS
|
||||
PLATFORM_DEBUG_FLAGS = /debug:full
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
# Design:
|
||||
@@ -151,8 +147,8 @@ endif
|
||||
ifdef NO_INSTALL
|
||||
GACUTIL = :
|
||||
else
|
||||
gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe
|
||||
GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
|
||||
gacutil = $(topdir)/class/lib/$(BUILD_PROFILE)/gacutil.exe
|
||||
GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
|
||||
endif
|
||||
|
||||
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
|
||||
|
||||
@@ -20,10 +20,9 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
ifndef NO_TEST
|
||||
|
||||
test_nunit_lib = nunitlite.dll
|
||||
xunit_core := xunit.core xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_core := xunit.core xunit.abstractions xunit.assert
|
||||
xunit_deps := System.Runtime
|
||||
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs)
|
||||
xunit_class_deps :=
|
||||
xunit_class_deps := Xunit.NetCore.Extensions
|
||||
|
||||
xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core))
|
||||
xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$(xunit_deps))
|
||||
@@ -90,6 +89,9 @@ endif
|
||||
|
||||
tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
|
||||
|
||||
$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)Xunit.NetCore.Extensions.dll:
|
||||
$(MAKE) -C $(topdir)/class/Xunit.NetCore.Extensions
|
||||
|
||||
endif
|
||||
|
||||
test_assemblies :=
|
||||
@@ -167,7 +169,7 @@ endif
|
||||
ifdef HAVE_CS_TESTS
|
||||
|
||||
$(test_lib): $(the_assembly) $(test_response) $(test_nunit_dep)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
|
||||
$(TEST_COMPILE) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
|
||||
|
||||
test_response_preprocessed = $(test_response)_preprocessed
|
||||
|
||||
@@ -220,8 +222,8 @@ run-xunit-test-lib: xunit-test-local
|
||||
$$ok
|
||||
@rm -f xunit.execution.desktop.dll
|
||||
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep)
|
||||
$(TEST_COMPILE) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response)
|
||||
|
||||
xtest_response_preprocessed = $(xtest_response)_preprocessed
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/lib
|
||||
/compat/
|
||||
monolite-*.tar.gz
|
||||
/**/obj-*
|
||||
@@ -27,7 +27,7 @@
|
||||
static Read() method of RelaxngPattern class:
|
||||
|
||||
RelaxngPattern pattern = RelaxngPattern.Read (
|
||||
new XmlTextReader ("relaxng.rng"));
|
||||
new XmlTextReader ("relaxng.rng");
|
||||
|
||||
You can also use RelaxngPattern class to reuse grammar instance, as
|
||||
already described (see Grammar Object Model).
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -21,159 +21,39 @@
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DBNull))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.AcceptRejectRule))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandBehavior))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.CommandType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.CatalogLocation))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataColumnMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataColumnMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataTableMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DataTableMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommand))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbCommandBuilder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbConnectionStringBuilder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataReaderExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataRecord))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbDataSourceEnumerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbEnumerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbMetaDataCollectionNames))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbMetaDataColumnNames))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbParameter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbParameterCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbProviderFactory))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbProviderSpecificTypePropertyAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.DbTransaction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.GroupByBehavior))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.IDbColumnSchemaGenerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.IdentifierCase))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.RowUpdatedEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.RowUpdatingEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SchemaTableColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SchemaTableOptionalColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Common.SupportedJoinOperators))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConflictOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConnectionState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Constraint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConstraintCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ConstraintException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DBConcurrencyException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumn))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnChangeEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnChangeEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataColumnCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRelation))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRelationCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRow))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowAction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowBuilder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowChangeEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowChangeEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowVersion))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataRowView))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSet))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSetDateTime))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataSysDescriptionAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTable))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableClearEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableClearEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableNewRowEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableNewRowEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataTableReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataView))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewManager))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewRowState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewSetting))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DataViewSettingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DbType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DeletedRowInaccessibleException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.DuplicateNameException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.EvaluateException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.FillErrorEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.FillErrorEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ForeignKeyConstraint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IColumnMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataParameterCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDataRecord))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbCommand))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbConnection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbDataAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbDataParameter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IDbTransaction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ITableMapping))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ITableMappingCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InRowChangingEventException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InternalDataCollectionBase))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InvalidConstraintException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.InvalidExpressionException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.IsolationLevel))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.KeyRestrictionBehavior))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.LoadOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MappingType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MergeFailedEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MergeFailedEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingMappingAction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingPrimaryKeyException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.MissingSchemaAction))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.NoNullAllowedException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ParameterDirection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.PropertyCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.ReadOnlyException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.RowNotInTableException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.Rule))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SchemaSerializationMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SchemaType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SerializationFormat))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlDbType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.INullable))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlAlreadyFilledException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBinary))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBoolean))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlByte))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlBytes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlChars))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlCompareOptions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDateTime))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDecimal))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlDouble))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlGuid))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt16))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt32))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlInt64))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlMoney))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlNotFilledException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlNullValueException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlSingle))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlString))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlTruncateException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlTypeException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.SqlXml))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SqlTypes.StorageState))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StateChangeEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StateChangeEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementCompletedEventHandler))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StatementType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.StrongTypingException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.SyntaxErrorException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UniqueConstraint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UpdateRowSource))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.UpdateStatus))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.VersionNotFoundException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.XmlReadMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Data.XmlWriteMode))]
|
||||
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.2.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -22,19 +22,4 @@
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackFrame))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackTrace))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder1))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolDocument))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolDocumentWriter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolMethod))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolNamespace))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolReader))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolScope))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolVariable))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolWriter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymAddressKind))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymDocumentType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymLanguageType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymLanguageVendor))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.SymbolToken))]
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -23,7 +23,7 @@ EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hyb
|
||||
ifndef EMBEDDED_DRAWING_DEP
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -27,7 +27,6 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.LingerOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.MulticastOption))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.NetworkStream))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.ProtocolFamily))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.ProtocolType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SelectMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SendPacketsElement))]
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.3.0")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
|
||||
|
||||
+3
-3
@@ -8,7 +8,7 @@
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{71D02788-3AD8-4C43-BDEB-1A3D277496BA}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699,436</NoWarn>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
|
||||
@@ -36,7 +36,7 @@
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699,1616,1699,436</NoWarn>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
@@ -44,7 +44,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699,1616,1699,436</NoWarn>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
|
||||
@@ -12,7 +12,7 @@ LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll
|
||||
RESX_RESOURCE_STRING = ../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699,436
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
|
||||
|
||||
|
||||
+4
-1
@@ -35,9 +35,12 @@ namespace System.Runtime.InteropServices
|
||||
{
|
||||
public static class RuntimeInformation
|
||||
{
|
||||
[DllImport ("__Internal")]
|
||||
extern static string mono_get_runtime_build_info ();
|
||||
|
||||
public static string FrameworkDescription {
|
||||
get {
|
||||
return "Mono " + Mono.Runtime.GetDisplayName ();
|
||||
return mono_get_runtime_build_info ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.2.1.0")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -25,11 +25,7 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.DataContractAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.DataMemberAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.EnumMemberAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ExportOptions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ExtensionDataObject))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IExtensibleDataObject))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IgnoreDataMemberAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.KnownTypeAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializedAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializingAttribute))]
|
||||
@@ -37,13 +33,4 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnSerializingAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.SerializationException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContext))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.StreamingContextStates))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XmlSerializableServices))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XPathQueryGenerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.XsdDataContractExporter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IFragmentCapableXmlDictionaryWriter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IStreamProvider))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlBinaryReaderInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlBinaryWriterInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlTextReaderInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Xml.IXmlTextWriterInitializer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.3.1.0")]
|
||||
[assembly: AssemblyVersion ("4.2.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -21,55 +21,27 @@
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Aes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AesManaged))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricKeyExchangeDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricKeyExchangeFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricSignatureDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.AsymmetricSignatureFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.CryptoConfig))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DeriveBytes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DES))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSA))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSAParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSASignatureDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.DSASignatureFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDiffieHellmanPublicKey))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECDsa))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACMD5))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA1))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA256))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA384))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA512))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MaskGenerationMethod))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MD5))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.PKCS1MaskGenerationMethod))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RandomNumberGenerator))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RC2))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Rfc2898DeriveBytes))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.Rijndael))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RijndaelManaged))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSA))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAEncryptionPadding))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAEncryptionPaddingMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAOAEPKeyExchangeFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1SignatureDeformatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSAPKCS1SignatureFormatter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSASignaturePadding))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.RSASignaturePaddingMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA1))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA1Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA256))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA256Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA384Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SHA512Managed))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.SignatureDescription))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.TripleDES))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECCurve))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECParameters))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.ECPoint))]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -22,6 +22,5 @@
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.IOCompletionCallback))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.NativeOverlapped))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Overlapped))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.PreAllocatedOverlapped))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.ThreadPoolBoundHandle))]
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.3.0")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -30,7 +30,7 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.1.1.0")]
|
||||
[assembly: AssemblyVersion ("4.0.1.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
|
||||
@@ -29,7 +29,7 @@ LIB_REFS += System.Web
|
||||
endif
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
|
||||
@@ -58,9 +58,9 @@ System.Linq.Expressions System.Dynamic.Runtime System.Linq System.Threading.Task
|
||||
System.Diagnostics.Tools System.Reflection.Primitives System.Runtime.Extensions System.Runtime.InteropServices System.Text.Encoding.Extensions \
|
||||
System.Runtime.Numerics System.Xml.XDocument System.Reflection.Extensions System.IO.FileSystem.Primitives System.IO.FileSystem \
|
||||
System.Diagnostics.FileVersionInfo System.Security.Cryptography.Primitives System.Security.Cryptography.Algorithms System.ValueTuple \
|
||||
System.Text.Encoding.CodePages
|
||||
System.Text.Encoding.CodePages System.Diagnostics.Tracing
|
||||
|
||||
build_PARALLEL_SUBDIRS = $(basic_PARALLEL_SUBDIRS) System.Text.RegularExpressions System.Diagnostics.Contracts
|
||||
build_PARALLEL_SUBDIRS = $(basic_PARALLEL_SUBDIRS) System.Text.RegularExpressions System.Diagnostics.Contracts System.Diagnostics.Tracing
|
||||
|
||||
monodroid_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
monodroid_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
@@ -83,9 +83,6 @@ winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy
|
||||
|
||||
|
||||
+17
-33
@@ -10,25 +10,15 @@ endif
|
||||
|
||||
# The minimal set of csc dependencies
|
||||
basic_SUBDIRS := \
|
||||
corlib \
|
||||
Mono.Security \
|
||||
System \
|
||||
System.XML \
|
||||
System.Core \
|
||||
System.ComponentModel.Composition.4.5 \
|
||||
System.Numerics \
|
||||
System.Xml.Linq \
|
||||
Mono.Cecil \
|
||||
$(MCS_MODE_dirs) \
|
||||
System.Xaml \
|
||||
../tools/cil-stringreplacer
|
||||
|
||||
build_SUBDIRS := \
|
||||
corlib \
|
||||
Mono.Security \
|
||||
System \
|
||||
System.XML \
|
||||
Mono.Posix \
|
||||
System.Core \
|
||||
System.ComponentModel.Composition.4.5 \
|
||||
System.Numerics \
|
||||
System.Xml.Linq \
|
||||
@@ -36,8 +26,8 @@ build_SUBDIRS := \
|
||||
System.Drawing \
|
||||
Mono.Cecil \
|
||||
$(MCS_MODE_dirs) \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
PEAPI \
|
||||
PEAPI \
|
||||
System.Xaml \
|
||||
../tools/cil-stringreplacer
|
||||
|
||||
ifdef MCS_MODE
|
||||
@@ -130,11 +120,6 @@ winaot_dirs := \
|
||||
System.Drawing \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
unreal_dirs := \
|
||||
$(mobile_common_dirs) \
|
||||
System.Drawing \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
xammac_4_5_dirs := \
|
||||
corlib \
|
||||
Mono.Security \
|
||||
@@ -184,15 +169,6 @@ xammac_4_5_dirs := \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
net_4_x_dirs := \
|
||||
corlib \
|
||||
Mono.Security \
|
||||
System \
|
||||
System.XML \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
Mono.Posix \
|
||||
System.Core \
|
||||
System.Security \
|
||||
System.Configuration \
|
||||
System.Drawing \
|
||||
System.IO.Compression \
|
||||
System.IO.Compression.FileSystem \
|
||||
@@ -320,7 +296,6 @@ net_4_x_parallel_dirs := \
|
||||
System.Workflow.ComponentModel \
|
||||
System.Workflow.Runtime \
|
||||
System.Reflection.Context \
|
||||
Mono.Profiler.Log \
|
||||
legacy/Mono.Cecil \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
@@ -358,11 +333,10 @@ xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
|
||||
xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
|
||||
winaot_SUBDIRS := $(winaot_dirs)
|
||||
orbis_SUBDIRS := $(orbis_dirs)
|
||||
unreal_SUBDIRS := $(unreal_dirs)
|
||||
|
||||
include ../build/rules.make
|
||||
|
||||
SUBDIRS = $(testing_aot_full_dirs) $(testing_aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) $(unreal_dirs)
|
||||
SUBDIRS = $(testing_aot_full_dirs) $(testing_aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
|
||||
|
||||
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
|
||||
|
||||
@@ -400,7 +374,7 @@ monolite_dir = monolite-$(HOST_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
|
||||
# Files needed to bootstrap C# compiler
|
||||
build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \
|
||||
System.Numerics.dll System.Xml.Linq.dll \
|
||||
System.Numerics.dll System.Xml.Linq.dll System.Xaml \
|
||||
Facades/System.Collections.Concurrent.dll Facades/System.Linq.dll Facades/System.Runtime.dll Facades/System.Collections.dll \
|
||||
Facades/System.Reflection.Extensions.dll Facades/System.Text.Encoding.Extensions.dll Facades/System.Diagnostics.Debug.dll \
|
||||
Facades/System.Reflection.Primitives.dll Facades/System.Text.Encoding.dll Facades/System.Diagnostics.Tools.dll Facades/System.Reflection.dll \
|
||||
@@ -409,7 +383,7 @@ build_files = mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Co
|
||||
Facades/System.IO.dll Facades/System.Runtime.InteropServices.dll Facades/System.Xml.ReaderWriter.dll Facades/System.Linq.Expressions.dll \
|
||||
Facades/System.Runtime.Numerics.dll Facades/System.Xml.XDocument.dll Facades/System.IO.FileSystem.Primitives.dll Facades/System.IO.FileSystem.dll \
|
||||
Facades/System.Diagnostics.FileVersionInfo.dll Facades/System.Security.Cryptography.Primitives.dll Facades/System.Security.Cryptography.Algorithms.dll \
|
||||
Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll
|
||||
Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll Facades/System.Diagnostics.Tracing.dll
|
||||
|
||||
monolite_files = $(build_files:%=lib/$(monolite_dir)/%)
|
||||
|
||||
@@ -460,5 +434,15 @@ dist-local: dist-default
|
||||
|
||||
csproj-local:
|
||||
|
||||
do-clean:
|
||||
.PHONY: all-msbuild
|
||||
all-msbuild:
|
||||
$(Q_MSBUILD) CSC_SDK_PATH_DISABLED= MONO_ENV_OPTIONS="$(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $$MONO_ENV_OPTIONS" msbuild class.sln /p:CscToolPath=$(abspath $(dir $(CSC_LOCATION))) /p:CscToolExe=$(notdir $(CSC_LOCATION)) /p:Configuration=$(PROFILE)$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM)) /p:Profile=$(PROFILE) /p:HostPlatform=$(HOST_PLATFORM) /m /verbosity:$(if $(V),$(if $(filter $(V),1),normal,$(if $(filter $(V),2),detailed,diagnostic)),minimal)
|
||||
|
||||
all-recursive: all-msbuild
|
||||
|
||||
.PHONY: clean-msbuild
|
||||
clean-msbuild:
|
||||
$(Q_MSBUILD) CSC_SDK_PATH_DISABLED= MONO_ENV_OPTIONS="$(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $$MONO_ENV_OPTIONS" msbuild class.sln /t:Clean /p:Configuration=$(PROFILE)$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM)) /p:Profile=$(PROFILE) /p:HostPlatform=$(HOST_PLATFORM)
|
||||
|
||||
do-clean: clean-msbuild
|
||||
$(RM) -rf $(topdir)/class/lib/$(PROFILE)
|
||||
@@ -150,18 +150,18 @@ namespace MonoTests.Microsoft.Build.Execution
|
||||
var bm = new BuildManager ();
|
||||
bm.BeginBuild (new BuildParameters () { Loggers = new ILogger [] {new ConsoleLogger (LoggerVerbosity.Diagnostic, TextWriter.Null.WriteLine, null, null)} });
|
||||
DateTime waitDone = DateTime.MinValue;
|
||||
DateTime beforeExec = DateTime.UtcNow;
|
||||
DateTime beforeExec = DateTime.Now;
|
||||
var l = new List<BuildSubmission> ();
|
||||
for (int i = 0; i < 10; i++) {
|
||||
var sub = bm.PendBuildRequest (new BuildRequestData (proj, new string [] { "Wait1Sec" }));
|
||||
l.Add (sub);
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.UtcNow; }, null);
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.Now; }, null);
|
||||
}
|
||||
bm.EndBuild ();
|
||||
Assert.IsTrue (l.All (s => s.BuildResult.OverallResult == BuildResultCode.Success), "#1");
|
||||
DateTime endBuildDone = DateTime.UtcNow;
|
||||
AssertHelper.GreaterOrEqual (endBuildDone - beforeExec, TimeSpan.FromSeconds (1), "#2");
|
||||
AssertHelper.Greater (endBuildDone, waitDone, "#3");
|
||||
DateTime endBuildDone = DateTime.Now;
|
||||
Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
|
||||
Assert.IsTrue (endBuildDone > waitDone, "#3");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -101,15 +101,15 @@ namespace MonoTests.Microsoft.Build.Execution
|
||||
var bm = new BuildManager ();
|
||||
bm.BeginBuild (new BuildParameters ());
|
||||
DateTime waitDone = DateTime.MinValue;
|
||||
DateTime beforeExec = DateTime.UtcNow;
|
||||
DateTime beforeExec = DateTime.Now;
|
||||
var sub = bm.PendBuildRequest (new BuildRequestData (proj, new string [] { "Wait1Sec" }));
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.UtcNow; }, null);
|
||||
sub.ExecuteAsync (delegate { waitDone = DateTime.Now; }, null);
|
||||
bm.EndBuild ();
|
||||
Assert.AreEqual (BuildResultCode.Success, sub.BuildResult.OverallResult, "#1");
|
||||
DateTime endBuildDone = DateTime.UtcNow;
|
||||
AssertHelper.GreaterOrEqual (endBuildDone - beforeExec, TimeSpan.FromSeconds (1), "#2");
|
||||
AssertHelper.GreaterOrEqual (waitDone, beforeExec, "#3");
|
||||
AssertHelper.GreaterOrEqual (endBuildDone, waitDone, "#4");
|
||||
Assert.IsTrue (sub.BuildResult.OverallResult == BuildResultCode.Success, "#1");
|
||||
DateTime endBuildDone = DateTime.Now;
|
||||
Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
|
||||
Assert.IsTrue (waitDone >= beforeExec, "#3");
|
||||
Assert.IsTrue (endBuildDone >= waitDone, "#4");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -106,6 +106,9 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversions.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\COperators.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\AggregateDeclaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\Declaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\GlobalAttributeDeclaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Declarations\NamespaceDeclaration.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExplicitConversion.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionBinder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionKind.cs" />
|
||||
@@ -136,6 +139,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\EventSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\FieldSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\IndexerSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LabelSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\LocalVariableSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodOrPropertySymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\MethodSymbol.cs" />
|
||||
@@ -153,11 +157,13 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolTable.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactory.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactoryBase.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TransparentIdentifierMemberSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TypeParameterSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\UnresolvedAggregateSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\VariableSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayIndex.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayInitialization.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayLength.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Assignment.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BinaryOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Block.cs" />
|
||||
@@ -167,6 +173,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Class.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\CompoundOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Concatenate.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ConditionalOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Constant.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Event.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />
|
||||
|
||||
@@ -58,6 +58,9 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Conversions.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/COperators.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/AggregateDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/Declaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/GlobalAttributeDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Declarations/NamespaceDeclaration.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExplicitConversion.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionBinder.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExpressionKind.cs
|
||||
@@ -88,6 +91,7 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/EventSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/FieldSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/IndexerSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LabelSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/LocalVariableSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodOrPropertySymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/MethodSymbol.cs
|
||||
@@ -105,11 +109,13 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymbolTable.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactory.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/SymFactoryBase.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TransparentIdentifierMemberSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/TypeParameterSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/UnresolvedAggregateSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/VariableSymbol.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayIndex.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayInitialization.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ArrayLength.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Assignment.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/BinaryOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Block.cs
|
||||
@@ -119,6 +125,7 @@ corefx/SR.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Class.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/CompoundOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Concatenate.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/ConditionalOperator.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Constant.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Event.cs
|
||||
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/EXPR.cs
|
||||
|
||||
@@ -104,7 +104,6 @@
|
||||
<Compile Include="..\..\mcs\settings.cs" />
|
||||
<Compile Include="..\..\mcs\statement.cs" />
|
||||
<Compile Include="..\..\mcs\support.cs" />
|
||||
<Compile Include="..\..\mcs\tuples.cs" />
|
||||
<Compile Include="..\..\mcs\typemanager.cs" />
|
||||
<Compile Include="..\..\mcs\typespec.cs" />
|
||||
<Compile Include="..\..\mcs\visit.cs" />
|
||||
|
||||
@@ -49,7 +49,6 @@ aot.cs
|
||||
../../mcs/support.cs
|
||||
../../mcs/typemanager.cs
|
||||
../../mcs/typespec.cs
|
||||
../../mcs/tuples.cs
|
||||
../../mcs/visit.cs
|
||||
../../class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
|
||||
../../class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
|
||||
|
||||
@@ -2,25 +2,8 @@ thisdir = class/Mono.CompilerServices.SymbolWriter
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Mono.CompilerServices.SymbolWriter.dll
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS =
|
||||
ASSEMBLY = Mono.CompilerServices.SymbolWriter.dll
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
ifneq (basic, $(PROFILE))
|
||||
USE_BOOT_COMPILE = yes
|
||||
endif
|
||||
|
||||
ifdef USE_BOOT_COMPILE
|
||||
LIBRARY_COMPILE = $(BOOT_COMPILE)
|
||||
endif
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
$(build_lib): $(bare_libdir)/System.dll
|
||||
|
||||
$(bare_libdir)/System.dll:
|
||||
(cd ../System; make $@)
|
||||
|
||||
.NOTPARALLEL: $(bare_libdir)/System.dll
|
||||
include ../../build/msbuild.make
|
||||
-98
@@ -1,98 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{88177C4B-894F-485D-B95A-44199C06BE9F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>obj-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Mono.CompilerServices.SymbolWriter</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="MonoSymbolFile.cs" />
|
||||
<Compile Include="MonoSymbolTable.cs" />
|
||||
<Compile Include="MonoSymbolWriter.cs" />
|
||||
<Compile Include="SourceMethodBuilder.cs" />
|
||||
<Compile Include="SymbolWriterImpl.cs" />␍ </ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\..\build\msbuild.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<AssemblyName>Mono.CompilerServices.SymbolWriter</AssemblyName>
|
||||
<ProjectGuid>{88177C4B-894F-485D-B95A-44199C06BE9F}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\System\System.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Include="MonoSymbolWriter.cs" />
|
||||
<Compile Include="MonoSymbolTable.cs" />
|
||||
<Compile Include="MonoSymbolFile.cs" />
|
||||
<Compile Include="SourceMethodBuilder.cs" />
|
||||
<Compile Include="SymbolWriterImpl.cs" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
-8
@@ -1,8 +0,0 @@
|
||||
Assembly/AssemblyInfo.cs
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/Locale.cs
|
||||
MonoSymbolWriter.cs
|
||||
MonoSymbolTable.cs
|
||||
MonoSymbolFile.cs
|
||||
SourceMethodBuilder.cs
|
||||
SymbolWriterImpl.cs
|
||||
@@ -2214,7 +2214,7 @@ namespace Mono.Debugger.Soft
|
||||
internal ValueImpl[] Type_GetValues (long id, long[] fields, long thread_id) {
|
||||
int len = fields.Length;
|
||||
PacketReader r;
|
||||
if (thread_id != 0 && Version.AtLeast(2, 3))
|
||||
if (thread_id != 0)
|
||||
r = SendReceive (CommandSet.TYPE, (int)CmdType.GET_VALUES_2, new PacketWriter ().WriteId (id).WriteId (thread_id).WriteInt (len).WriteIds (fields));
|
||||
else
|
||||
r = SendReceive (CommandSet.TYPE, (int)CmdType.GET_VALUES, new PacketWriter ().WriteId (id).WriteInt (len).WriteIds (fields));
|
||||
|
||||
@@ -30,11 +30,6 @@ namespace Mono.Debugger.Soft
|
||||
if (args != null && args.Length != 0)
|
||||
throw new NotSupportedException ();
|
||||
|
||||
//If method is virtual we can't optimize(execute IL) because it's maybe
|
||||
//overriden... call runtime to invoke overriden version...
|
||||
if (method.IsVirtual)
|
||||
throw new NotSupportedException ();
|
||||
|
||||
if (method.IsStatic || method.DeclaringType.IsValueType || this_val == null || !(this_val is ObjectMirror))
|
||||
throw new NotSupportedException ();
|
||||
|
||||
@@ -355,12 +350,6 @@ namespace Mono.Debugger.Soft
|
||||
} catch {
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
} else if (method.ReturnType.IsEnum && primitive != null) {
|
||||
try {
|
||||
res = method.VirtualMachine.CreateEnumMirror (method.ReturnType, primitive);
|
||||
} catch {
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace Mono.Debugger.Soft
|
||||
sb.Append (ReturnType.Name);
|
||||
sb.Append (' ');
|
||||
if (type_namespace != String.Empty)
|
||||
sb.Append (type_namespace).Append (".");
|
||||
sb.Append (type_namespace + ".");
|
||||
sb.Append(type_name);
|
||||
sb.Append(":");
|
||||
sb.Append(Name);
|
||||
|
||||
Loaded 100 of 981 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user