mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 01:41:18 -10:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8386f9b91a | ||
|
|
de6b204d7c | ||
|
|
f1551de7fa | ||
|
|
28b1845940 |
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
|
||||
|
||||
+6
-1
@@ -50,9 +50,14 @@ noinst_DATA = mono-uninstalled.pc
|
||||
DISTCLEANFILES= mono-uninstalled.pc
|
||||
|
||||
# building with monolite
|
||||
mcslib = $(mcs_topdir)/class/lib
|
||||
monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
|
||||
.PHONY: get-monolite-latest
|
||||
get-monolite-latest:
|
||||
$(MAKE) -C $(mcs_topdir)/class get-monolite-latest
|
||||
-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
|
||||
-mkdir -p $(mcslib)/monolite
|
||||
cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
|
||||
|
||||
if BITCODE
|
||||
BITCODE_CHECK=yes
|
||||
|
||||
@@ -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,
|
||||
|
||||
+184
-38
@@ -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])
|
||||
@@ -40,7 +40,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
|
||||
# This can be reset to 0 when Mono's version number is bumped
|
||||
# since it's part of the corlib version (the prefix '1' in the full
|
||||
# version number is to ensure the number isn't treated as octal in C)
|
||||
MONO_CORLIB_COUNTER=2
|
||||
MONO_CORLIB_COUNTER=1
|
||||
MONO_CORLIB_VERSION=`printf "1%02d%02d%02d%03d" $MONO_VERSION_MAJOR $MONO_VERSION_MINOR $MONO_VERSION_BUILD $MONO_CORLIB_COUNTER`
|
||||
|
||||
AC_DEFINE_UNQUOTED(MONO_CORLIB_VERSION,$MONO_CORLIB_VERSION,[Version of the corlib-runtime interface])
|
||||
@@ -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
|
||||
@@ -3224,6 +3266,77 @@ case "$host" in
|
||||
;;
|
||||
esac
|
||||
|
||||
COREFX_PAL_SUPPORTED=no
|
||||
COREFX_PAL_ARCH=
|
||||
COREFX_PAL_OS=
|
||||
|
||||
case "$host" in
|
||||
i*86-*-linux*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=x86
|
||||
COREFX_PAL_OS=Linux
|
||||
;;
|
||||
i*86-*-darwin*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=x86
|
||||
COREFX_PAL_OS=OSX
|
||||
;;
|
||||
i*86-*-freebsd*|i*86-*-kfreebsd-gnu*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=x86
|
||||
COREFX_PAL_OS=FreeBSD
|
||||
;;
|
||||
x86_64-*-linux*|amd64-*-linux*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=x64
|
||||
COREFX_PAL_OS=Linux
|
||||
;;
|
||||
x86_64-*-darwin*|amd64-*-darwin*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=x64
|
||||
COREFX_PAL_OS=OSX
|
||||
;;
|
||||
x86_64-*-freebsd*|amd64-*-freebsd*|x86_64-*-kfreebsd-gnu*|amd64-*-kfreebsd-gnu*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=x64
|
||||
COREFX_PAL_OS=FreeBSD
|
||||
;;
|
||||
arm*-*-darwin*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=arm
|
||||
COREFX_PAL_OS=OSX
|
||||
;;
|
||||
arm*-*-linux*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=arm
|
||||
COREFX_PAL_OS=Linux
|
||||
;;
|
||||
arm*-*-freebsd*|arm*-*-kfreebsd-gnu*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=arm
|
||||
COREFX_PAL_OS=FreeBSD
|
||||
;;
|
||||
aarch64-*-darwin*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=arm64
|
||||
COREFX_PAL_OS=OSX
|
||||
;;
|
||||
aarch64-*-linux*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=arm64
|
||||
COREFX_PAL_OS=Linux
|
||||
;;
|
||||
aarch64-*-freebsd*|aarch64-*-kfreebsd-gnu*)
|
||||
COREFX_PAL_SUPPORTED=yes
|
||||
COREFX_PAL_ARCH=arm64
|
||||
COREFX_PAL_OS=FreeBSD
|
||||
;;
|
||||
esac
|
||||
|
||||
AM_CONDITIONAL(COREFX_PAL_SUPPORTED, [test x$COREFX_PAL_SUPPORTED = xyes])
|
||||
AC_SUBST(COREFX_PAL_ARCH)
|
||||
AC_SUBST(COREFX_PAL_OS)
|
||||
|
||||
HOST=$TARGET
|
||||
|
||||
if test "x$host" != "x$target"; then
|
||||
@@ -3266,6 +3379,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 +3701,7 @@ fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_INTERPRETER, [test x$enable_interpreter = xyes])
|
||||
|
||||
|
||||
dnl
|
||||
dnl Simple Generational checks (sgen)
|
||||
dnl
|
||||
@@ -4156,7 +4302,7 @@ AC_SUBST(mono_build_root)
|
||||
mono_runtime=mono/mini/mono
|
||||
AC_SUBST(mono_runtime)
|
||||
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.3.0/tools/csc.exe
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.1.0/tools/csc.exe
|
||||
|
||||
if test $csc_compiler = mcs; then
|
||||
CSC=$mcs_topdir/class/lib/build/mcs.exe
|
||||
@@ -4351,6 +4497,7 @@ scripts/mono-find-provides
|
||||
scripts/mono-find-requires
|
||||
mono/Makefile
|
||||
mono/btls/Makefile
|
||||
mono/pal/Makefile
|
||||
mono/utils/Makefile
|
||||
mono/metadata/Makefile
|
||||
mono/dis/Makefile
|
||||
@@ -4578,7 +4725,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
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/System.Native@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
|
||||
|
||||
+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...ba90b3440d.
Vendored
+1
-1
Submodule external/bockbuild updated: 4ae08e8dd6...31c98f3cab.
Vendored
+1
-1
Submodule external/boringssl updated: 3e0770e188...c06ac6b33d.
+1
Submodule external/buildtools added at b5cc6e6ab5.
Vendored
+1
-1
Submodule external/cecil updated: c76ba7b410...0b523fa7e0.
Vendored
+1
-1
Submodule external/corefx updated: 7e70a4e923...b6cf577f9c.
Vendored
+1
-1
Submodule external/corert updated: 48dba73801...814f76de6a.
Vendored
+1
-1
Submodule external/ikdasm updated: 1d7d436037...88b67c42ca.
Vendored
+1
-1
Submodule external/ikvm updated: 847e05fced...7c1e61bec8.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: dcb0a0534d...1e3dfe1003.
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.
|
||||
|
||||
+3
-1
@@ -1,5 +1,7 @@
|
||||
This list of authors is outdated. For a full list of contributors
|
||||
check out the git history.
|
||||
see:
|
||||
|
||||
http://www.go-mono.com/archive/mono-1.0.html
|
||||
|
||||
C# Compiler:
|
||||
Miguel de Icaza ([email protected])
|
||||
|
||||
+340
-1
@@ -1 +1,340 @@
|
||||
See LICENSE file in the project root for full license information.
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
+477
-1
@@ -1 +1,477 @@
|
||||
Please see http://www.mono-project.com/community/contributing/coding-guidelines/ for latest guidelines.
|
||||
* Coding Style for the Mono C# source code.
|
||||
|
||||
* Class Libraries and Assembly Layout
|
||||
|
||||
The class libraries are grouped together in the assemblies
|
||||
they belong.
|
||||
|
||||
Each directory here represents an assembly, and inside each
|
||||
directory we divide the code based on the namespace they
|
||||
implement.
|
||||
|
||||
In addition, each assembly directory contains a Test directory
|
||||
that holds the NUnit tests for that assembly.
|
||||
|
||||
We use a new build system which is described by various README
|
||||
files in mcs/build
|
||||
|
||||
The build process typically builds an assembly, but in some
|
||||
cases it also builds special versions of the assemblies
|
||||
intended to be used for testing.
|
||||
|
||||
* Missing implementation bits
|
||||
|
||||
If you implement a class and you are missing implementation bits,
|
||||
please use the attribute [MonoTODO]. This attribute can be used
|
||||
to programatically generate our status web pages:
|
||||
|
||||
[MonoTODO("My Function is not available on Mono")]
|
||||
int MyFunction ()
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
Ideally, write a human description of the reason why there is
|
||||
a MonoTODO, this will be useful in the future for our
|
||||
automated tools that can assist in developers porting their code.
|
||||
|
||||
* Tagging buggy code
|
||||
|
||||
If there is a bug in your implementation tag the problem by using
|
||||
the word "FIXME" in the code, together with a description of the
|
||||
problem.
|
||||
|
||||
Do not use XXX or obscure descriptions, because otherwise people
|
||||
will not be able to understand what you mean.
|
||||
|
||||
* Tagging Problematic specs.
|
||||
|
||||
If the documentation and the Microsoft implementation do
|
||||
differ (you wrote a test case to prove this), I suggest that you edit
|
||||
the file `mcs/class/doc/API-notes' so we can keep track of these problems
|
||||
and submit our comments to ECMA or Microsoft and seek clarification.
|
||||
|
||||
Sometimes the documentation might be buggy, and sometimes the implementation
|
||||
might be buggy. Lets try to identify and pinpoint which one
|
||||
is the correct one.
|
||||
|
||||
Sometimes the specification will be lame (consider Version.ToString (fieldCount)
|
||||
where there is no way of knowing how many fields are available, making the API
|
||||
not only stupid, but leading to unreliable code).
|
||||
|
||||
In those cases, use the keyword "LAMESPEC".
|
||||
|
||||
|
||||
* Coding considerations and style.
|
||||
|
||||
In order to keep the code consistent, please use the following
|
||||
conventions. From here on `good' and `bad' are used to attribute
|
||||
things that would make the coding style match, or not match. It is not
|
||||
a judgement call on your coding abilities, but more of a style and
|
||||
look call. Please try to follow these guidelines to ensure prettiness.
|
||||
|
||||
Use 8 space tabs for writing your code (hopefully we can keep
|
||||
this consistent). If you are modifying someone else's code, try
|
||||
to keep the coding style similar.
|
||||
|
||||
Since we are using 8-space tabs, you might want to consider the Linus
|
||||
Torvals trick to reduce code nesting. Many times in a loop, you will
|
||||
find yourself doing a test, and if the test is true, you will nest.
|
||||
Many times this can be changed. Example:
|
||||
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
if (something (i)) {
|
||||
do_more ();
|
||||
}
|
||||
}
|
||||
|
||||
This take precious space, instead write it like this:
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
if (!something (i))
|
||||
continue;
|
||||
do_more ();
|
||||
}
|
||||
|
||||
* Performance and readability
|
||||
|
||||
It is more important to be correct than to be fast.
|
||||
|
||||
It is more important to be maintainable than to be fast.
|
||||
|
||||
Fast code that is difficult to maintain is likely going to
|
||||
be looked down upon.
|
||||
|
||||
* Style Guidelines
|
||||
|
||||
* Use a space before an opening parenthesis when calling
|
||||
functions, or indexing, like this:
|
||||
|
||||
method (a);
|
||||
b [10];
|
||||
|
||||
* Do not put a space after the opening parenthesis and the
|
||||
closing one, ie:
|
||||
|
||||
good: method (a); array [10];
|
||||
|
||||
bad: method ( a ); array[ 10 ];
|
||||
|
||||
* Inside a code block, put the opening brace on the same line
|
||||
as the statement:
|
||||
|
||||
good:
|
||||
if (a) {
|
||||
code ();
|
||||
code ();
|
||||
}
|
||||
|
||||
bad:
|
||||
if (a)
|
||||
{
|
||||
code ();
|
||||
code ();
|
||||
}
|
||||
|
||||
* Avoid using unnecessary open/close braces, vertical space
|
||||
is usually limited:
|
||||
|
||||
good:
|
||||
if (a)
|
||||
code ();
|
||||
|
||||
bad:
|
||||
if (a) {
|
||||
code ();
|
||||
}
|
||||
|
||||
* When defining a method, use the C style for brace placement,
|
||||
that means, use a new line for the brace, like this:
|
||||
|
||||
good:
|
||||
void Method ()
|
||||
{
|
||||
}
|
||||
|
||||
bad:
|
||||
void Method () {
|
||||
}
|
||||
|
||||
* Properties and indexers are an exception, keep the
|
||||
brace on the same line as the property declaration.
|
||||
Rationale: this makes it visually
|
||||
simple to distinguish them.
|
||||
|
||||
good:
|
||||
int Property {
|
||||
get {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
bad:
|
||||
int Property
|
||||
{
|
||||
get {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
Notice how the accessor "get" also keeps its brace on the same
|
||||
line.
|
||||
|
||||
For very small properties, you can compress things:
|
||||
|
||||
ok:
|
||||
int Property {
|
||||
get { return value; }
|
||||
set { x = value; }
|
||||
}
|
||||
|
||||
* Use white space in expressions liberally, except in the presence
|
||||
of parenthesis:
|
||||
|
||||
good:
|
||||
|
||||
if (a + 5 > method (blah () + 4))
|
||||
|
||||
bad:
|
||||
if (a+5>method(blah()+4))
|
||||
|
||||
* For any new files, please use a descriptive introduction, like
|
||||
this:
|
||||
|
||||
//
|
||||
// System.Comment.cs: Handles comments in System files.
|
||||
//
|
||||
// Author:
|
||||
// Juan Perez ([email protected])
|
||||
//
|
||||
// (C) 2002 Address, Inc (http://www.address.com)
|
||||
//
|
||||
|
||||
* If you are modyfing someone else's code, and your contribution
|
||||
is significant, please add yourself to the Authors list.
|
||||
|
||||
* Switch statements have the case at the same indentation as the
|
||||
switch:
|
||||
|
||||
switch (x) {
|
||||
case 'a':
|
||||
...
|
||||
case 'b':
|
||||
...
|
||||
}
|
||||
|
||||
* Argument names should use the camel casing for
|
||||
identifiers, like this:
|
||||
|
||||
good:
|
||||
void Method (string myArgument)
|
||||
|
||||
bad:
|
||||
void Method (string lpstrArgument)
|
||||
void Method (string my_string)
|
||||
|
||||
* Empty methods: They should have the body of code using two
|
||||
lines, in consistency with the rest:
|
||||
|
||||
good:
|
||||
void EmptyMethod ()
|
||||
{
|
||||
}
|
||||
|
||||
bad:
|
||||
void EmptyMethod () {}
|
||||
|
||||
void EmptyMethod ()
|
||||
{}
|
||||
|
||||
* Line length: The line length for C# source code is 134 columns.
|
||||
|
||||
|
||||
If your function declaration arguments go beyond
|
||||
this point, please align your arguments to match the
|
||||
opening brace, like this:
|
||||
|
||||
void Function (int arg, string argb,
|
||||
int argc)
|
||||
{
|
||||
}
|
||||
|
||||
When invoking functions, the rule is different, the
|
||||
arguments are not aligned with the previous
|
||||
argument, instead they begin at the tabbed position,
|
||||
like this:
|
||||
|
||||
void M ()
|
||||
{
|
||||
MethodCall ("Very long string that will force",
|
||||
"Next argument on the 8-tab pos",
|
||||
"Just like this one")
|
||||
|
||||
}
|
||||
|
||||
* Variable declaration indentation.
|
||||
|
||||
Sometimes it is convenient to indent the variables to make the code
|
||||
look pretier, but do not add gratuitous space, try to use the minimally
|
||||
necessary space, for example:
|
||||
|
||||
Good:
|
||||
|
||||
void Method ()
|
||||
{
|
||||
string b;
|
||||
int a;
|
||||
byte c;
|
||||
}
|
||||
|
||||
Bad:
|
||||
|
||||
void Method ()
|
||||
{
|
||||
string b;
|
||||
int a;
|
||||
byte c;
|
||||
}
|
||||
|
||||
* Braces and the `else' clause
|
||||
|
||||
If there are braces closing or opening next to the else clause,
|
||||
they go on the same line as the word `else', for example:
|
||||
|
||||
Good:
|
||||
|
||||
if (..) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
|
||||
Bad:
|
||||
|
||||
if (..) {
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
}
|
||||
|
||||
Bad:
|
||||
|
||||
if (..) {
|
||||
|
||||
} else
|
||||
{
|
||||
}
|
||||
|
||||
Bad:
|
||||
|
||||
if (..) {
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
* RCS and CVS tags
|
||||
|
||||
Some users like to use the special RCS/CVS tags in their
|
||||
source code: $id$, $log$ and so on.
|
||||
|
||||
The use of these is not permitted on the Mono source code
|
||||
repository. This metadata belongs on a ChangeLog or in the
|
||||
SVN metadata.
|
||||
|
||||
* File formats
|
||||
|
||||
Historically our repository has used a mix of line-endings,
|
||||
this is a mistake that we are trying hard to fix.
|
||||
|
||||
For existing files, please make sure that you do not convert
|
||||
the file, as that causes us to loose precious history (the
|
||||
full file is commited).
|
||||
|
||||
For new files that you create, please make sure that you use
|
||||
Subversion's support for mapping the line endings
|
||||
automatically, after adding your file:
|
||||
|
||||
$ svn add file.cs
|
||||
|
||||
Execute this command:
|
||||
|
||||
$ svn propset svn:eol-style native file.cs
|
||||
|
||||
Which will make the file automatically receive the proper
|
||||
treatment from that point on.
|
||||
|
||||
Please verify before commiting that your changes wont loose
|
||||
history, you can do this by running:
|
||||
|
||||
$ svn diff
|
||||
|
||||
And examining the output.
|
||||
|
||||
* Warnings
|
||||
|
||||
Avoid commiting code with warnings to the repository, the use
|
||||
of #pragmas to disable warnings is strongly discouraged, but
|
||||
can be used on unique cases. Please justify the use of the
|
||||
warning ignore clause on a comment.
|
||||
|
||||
Do not commit changes to the Makefiles that removes warnings,
|
||||
if anything warnings should be eliminated one at a time, and
|
||||
if not possible, they must be flagged.
|
||||
|
||||
|
||||
* Examples:
|
||||
|
||||
class X : Y {
|
||||
|
||||
bool Method (int argument_1, int argument_2)
|
||||
{
|
||||
if (argument_1 == argument_2)
|
||||
throw new Exception (Locale.GetText ("They are equal!");
|
||||
|
||||
if (argument_1 < argument_2) {
|
||||
if (argument_1 * 3 > 4)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
//
|
||||
// This sample helps keep your sanity while using 8-spaces for tabs
|
||||
//
|
||||
VeryLongIdentifierWhichTakesManyArguments (
|
||||
Argument1, Argument2, Argument3,
|
||||
NestedCallHere (
|
||||
MoreNested));
|
||||
}
|
||||
|
||||
bool MyProperty {
|
||||
get {
|
||||
return x;
|
||||
}
|
||||
|
||||
set {
|
||||
x = value;
|
||||
}
|
||||
}
|
||||
|
||||
void AnotherMethod ()
|
||||
{
|
||||
if ((a + 5) != 4) {
|
||||
}
|
||||
|
||||
while (blah) {
|
||||
if (a)
|
||||
continue;
|
||||
b++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
* Conditional compilation
|
||||
|
||||
Ideally we would not need conditional compilation, and the use
|
||||
of #ifdef is strongly discouraged. But due to our support for
|
||||
old C# 1.0 compilers we have to use it in a few places.
|
||||
|
||||
Try to avoid negative tests that have an else clause, for
|
||||
example:
|
||||
|
||||
#if !NET_2_0
|
||||
CODE_FOR_1_0
|
||||
#else
|
||||
CODE_FOR_2_0
|
||||
#endif
|
||||
|
||||
Instead use:
|
||||
|
||||
#if NET_2_0
|
||||
CODE_FOR_2_0
|
||||
#else
|
||||
CODE_FOR_1_0
|
||||
#endif
|
||||
|
||||
When a major feature differs across compilation targets, try
|
||||
to factor out the code into a separate class, a helper class
|
||||
or a separate file, and include that in your profile while
|
||||
surrounding that helper file/class with the ifdefs to reduce
|
||||
the amount of ifdefs in the code.
|
||||
|
||||
For instance, this is used for some parts of Grasshopper where
|
||||
the code is ifdefed out, when large parts of a file would have
|
||||
been ifdefed out, we moved the code into a MyOtherFile.jvm.cs
|
||||
|
||||
For 2.0 classes, this is even simpler as code can be trivially
|
||||
factored out into
|
||||
|
||||
MyHelperClass.cli.cs
|
||||
MyHelperClass.jvm.cs
|
||||
|
||||
By using partial classes.
|
||||
+108
-4
@@ -23,7 +23,7 @@ compilers and tools.
|
||||
* *
|
||||
*********************************************************************
|
||||
|
||||
If you only want to build a snapshot or a fresh checkout of the
|
||||
If you only want to build a snapshot or a fresh CVS checkout of the
|
||||
sources, you should go into the `mono' sibling directory and issue the
|
||||
make command, like this:
|
||||
|
||||
@@ -35,6 +35,72 @@ make command, like this:
|
||||
The compilation is bundled with the build due to dependencies on the
|
||||
class libraries on the runtime.
|
||||
|
||||
Build Features for Developers of Mono.
|
||||
======================================
|
||||
|
||||
These instructions apply to both Linux and Windows. To build this
|
||||
package, you must already have a C# compiler installed. This means
|
||||
that to build on Linux, you need to get a distribution of the MCS
|
||||
binaries; these are called monocharges. They can be found at
|
||||
www.go-mono.com/daily. On Windows, you can just use the
|
||||
Microsoft compiler. You also need GNU make to build the software (on
|
||||
Windows, you will need for example the Cygwin environment setup).
|
||||
|
||||
You can customize your MCS configuration by using:
|
||||
|
||||
./configure [--prefix=PREFIX] [--profile=PROFILE]
|
||||
|
||||
If you do not run the above, the defaults are /usr/local for the
|
||||
prefix, and `default' for the profile.
|
||||
|
||||
To build the compiler and class libraries, run:
|
||||
|
||||
make
|
||||
|
||||
The libraries will be placed in the directory class/lib/ and the mcs
|
||||
compiler executable in mcs/.
|
||||
|
||||
To install them, run the following:
|
||||
|
||||
make install
|
||||
|
||||
If you get "corlib out of sync" errors, try
|
||||
|
||||
make PROFILE="atomic"
|
||||
|
||||
A better alternative would be to fire off a 'make' from a sibling or
|
||||
parent 'mono/' tree.
|
||||
|
||||
Troubleshooting
|
||||
===============
|
||||
|
||||
We try to maintain the CVS tree such that it is bootstrapable from the
|
||||
latest released version of mono and mcs. Occasionally, something in the
|
||||
compiler or runtime changes enough that an existing installation cannot
|
||||
complete a bootstrap from cvs. In this case, go to
|
||||
http://go-mono.com/daily and download a monocharge or monolite tarball.
|
||||
Unpack and copy the .dlls to $prefix/lib and .exes to $prefix/bin/.
|
||||
Then you should be able to complete the build normally (i.e. using make
|
||||
bootstrap).
|
||||
|
||||
wget http://go-mono.com/daily/monolite-20040505.tar.gz
|
||||
tar -zxvf monolite-20040505.tar.gz
|
||||
cd monolite-20040505
|
||||
env prefix=/usr/local sh recharge.sh
|
||||
|
||||
Monocharges
|
||||
===========
|
||||
|
||||
If you are tracking Mono's development, you may sometimes need to share
|
||||
the compiled libraries with others, you can do:
|
||||
|
||||
make monocharge
|
||||
|
||||
Or a light version, which contains only the essential libraries and
|
||||
results in a much smaller file:
|
||||
|
||||
make monocharge-lite
|
||||
|
||||
Configuration
|
||||
=============
|
||||
|
||||
@@ -44,15 +110,48 @@ place your configuration options in build/config.make
|
||||
A list of variables that control the build are listed in the file
|
||||
build/config-default.make.
|
||||
|
||||
Build profiles? What?
|
||||
======================
|
||||
|
||||
Don't worry about them too much. If you're wondering which to use:
|
||||
use the default if you can (that's why it's the default!) and use
|
||||
the atomic if you have to.
|
||||
|
||||
The default profile uses the C# compiler and class libaries as they
|
||||
are built. This lets you build MCS without needing to have already
|
||||
installed it, but can fail if the libraries change significantly.
|
||||
(This is the source of the dreaded "corlib out of sync" warning, most
|
||||
of the time.)
|
||||
|
||||
The atomic profile tries to use the system compiler and preexisting
|
||||
MCS libraries. New libaries are built against this constant reference
|
||||
point, so if a newly built library has a binary incompatibility, the
|
||||
rest of your build can proceed.
|
||||
|
||||
If you want to always use the atomic profile, run this command:
|
||||
|
||||
./configure --profile=atomic
|
||||
|
||||
More About the Build System
|
||||
===========================
|
||||
|
||||
More information is found in build/README.*. Here's a quick rundown
|
||||
of the features:
|
||||
|
||||
* Unified build system for Windows and Linux. Windows is still
|
||||
fairly untested, but "should work." Unfortunately I don't
|
||||
have a Windows machine to test on, but Gonzalo can get
|
||||
corlib to build I think and that's about as complicated as
|
||||
it gets.
|
||||
|
||||
* Profile support. 'make PROFILE=profilename' or 'export
|
||||
PROFILE=profilename ; make' will work. Profiles are defined
|
||||
in build/profiles/profilename.make ;
|
||||
in build/profiles/profilename.make ; right now there isn't
|
||||
too much going on. The 'bootstrap' profile will build the
|
||||
way makefile.gnu did on Linux, by setting MONO_PATH and
|
||||
using mcs/mcs.exe; the default profile will build against
|
||||
the existing system libraries and compile with 'mcs', which
|
||||
should reduce a lot of 'corlib out of sync' warnings.
|
||||
|
||||
* Important variables are shared among makefiles now; you can
|
||||
edit build/config.make (see build/config-default.make for a
|
||||
@@ -65,11 +164,16 @@ of the features:
|
||||
|
||||
* Test libraries now live in class/Library/Library_test.dll,
|
||||
not class/Library/Test. 'make test' will build the test DLL,
|
||||
'make run-test' will actually run the nunit tests.
|
||||
'make run-test' will actually run the nunit tests. Set the
|
||||
variable TEST_HARNESS to run with a program other than
|
||||
nunit-console (for example, nunit-gtk).
|
||||
|
||||
* Standardized recursive targets: all, clean, install, test,
|
||||
run-test. Read build/README.makefiles for definitions of
|
||||
what they should do
|
||||
|
||||
* (Relatively) sane 'make dist' target; 'make distcheck'
|
||||
support;
|
||||
support; cute 'make monocharge' and 'make monocharge-lite'
|
||||
targets. They're made possible because 'make install' now
|
||||
supports DESTDIR a la automake, which I'm sure someone cares
|
||||
about.
|
||||
+25
-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:
|
||||
@@ -97,7 +95,8 @@ DISTFILES = \
|
||||
mkinstalldirs \
|
||||
MonoIcon.png \
|
||||
README \
|
||||
ScalableMonoIcon.svg
|
||||
ScalableMonoIcon.svg \
|
||||
winexe.in
|
||||
|
||||
dist-local: dist-default
|
||||
|
||||
@@ -139,12 +138,34 @@ distcheck: dist-tarball
|
||||
rm -f before.list after.list distdist.list ; \
|
||||
rm -rf $(package) InstallTest
|
||||
|
||||
monocharge:
|
||||
chargedir=monocharge-`date -u +%Y%m%d` ; \
|
||||
mkdir "$$chargedir" ; \
|
||||
DESTDIR=`cd "$$chargedir" && pwd` ; \
|
||||
$(MAKE) install DESTDIR="$$DESTDIR" || exit 1 ; \
|
||||
tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
|
||||
rm -rf "$$chargedir"
|
||||
|
||||
# A bare-bones monocharge.
|
||||
|
||||
monocharge-lite:
|
||||
chargedir=monocharge-lite-`date -u +%Y%m%d` ; \
|
||||
mkdir "$$chargedir" ; \
|
||||
DESTDIR=`cd "$$chargedir" && pwd` ; \
|
||||
$(MAKE) -C mcs install DESTDIR="$$DESTDIR" || exit 1; \
|
||||
$(MAKE) -C class/corlib install DESTDIR="$$DESTDIR" || exit 1; \
|
||||
$(MAKE) -C class/System install DESTDIR="$$DESTDIR" || exit 1; \
|
||||
$(MAKE) -C class/System.XML install DESTDIR="$$DESTDIR" || exit 1; \
|
||||
$(MAKE) -C class/Mono.CSharp.Debugger install DESTDIR="$$DESTDIR" || exit 1; \
|
||||
tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
|
||||
rm -rf "$$chargedir"
|
||||
|
||||
# Targets for creating API diffs of the framework
|
||||
|
||||
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)/, 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)
|
||||
|
||||
|
||||
+19
-20
@@ -19,34 +19,31 @@ package module which drives the compilation of this directory.
|
||||
class/
|
||||
The class libraries.
|
||||
|
||||
docs/
|
||||
Some notes on the compiler and the class libraries.
|
||||
|
||||
errors/
|
||||
Sample programs that should generate errors by the C# compiler.
|
||||
|
||||
ilasm/
|
||||
The IL assembler.
|
||||
|
||||
jay/
|
||||
Yacc-based parser generator.
|
||||
|
||||
mcs/
|
||||
The Mono C# compiler
|
||||
|
||||
nunit24/
|
||||
An old copy of the NUnit 2.4 library that we ship for historical reasons.
|
||||
|
||||
packages/
|
||||
Integrates some packages from NuGet (like Roslyn) into the build system.
|
||||
|
||||
tests/
|
||||
Regression test suite for the C# compiler
|
||||
|
||||
docs/
|
||||
Some notes on the compiler and the class libraries.
|
||||
|
||||
nant/
|
||||
A copy of nant source code, used during the build process
|
||||
on Windows.
|
||||
|
||||
tools/
|
||||
Various small development tools: CorCompare used to compare
|
||||
two assemblies for differences in the API; csharp is a C# REPL;
|
||||
cil-strip trims IL from assemblies.
|
||||
two assemblies for differences in the API; TypeReflector is
|
||||
a tool used to introspect types from assemblies from the
|
||||
command line; MonoStyle helps you keep your code indendented
|
||||
with the Mono programming style.
|
||||
|
||||
* Building Individual Directories
|
||||
=================================
|
||||
@@ -54,14 +51,14 @@ package module which drives the compilation of this directory.
|
||||
You can build individual components in the hierarchy by running the command
|
||||
"make", and to install it use "make install".
|
||||
|
||||
By default, the 4.x profile is built, if you want to build other profiles,
|
||||
By default, the 2.x profile is built, if you want to build the net 1.1 profile,
|
||||
use the following command:
|
||||
|
||||
make PROFILE=<profilename>
|
||||
make PROFILE=net_1_1
|
||||
|
||||
And to install:
|
||||
|
||||
make PROFILE=<profilename> install
|
||||
make PROFILE=net_1_1 install
|
||||
|
||||
To turn on verbose mode in the build (for example to diagnose a
|
||||
problem), you can use the V=1 flag, like this:
|
||||
@@ -71,14 +68,16 @@ problem), you can use the V=1 flag, like this:
|
||||
* Running Unit tests
|
||||
====================
|
||||
|
||||
You can run unit tests in individual components by running the command:
|
||||
You can run unit tests in individual components by running the command
|
||||
"make run-test". If you want to run tests for a different profile (say
|
||||
'net_1_1')
|
||||
|
||||
make run-test
|
||||
make run-test PROFILE=net_1_1
|
||||
|
||||
If you want to only run the tests in a single fixture (say
|
||||
'MonoTests.System.TypeTest'), you can use
|
||||
|
||||
make run-test TEST_FIXTURE=System.TypeTest
|
||||
make run-test TEST_HARNESS_FLAGS=/fixture:MonoTests.System.TypeTest
|
||||
|
||||
* Acknowledgements
|
||||
==================
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\ExtensionPack\MSBuild.ExtensionPack.tasks"/>
|
||||
<Target Name="Build">
|
||||
<Copy SourceFiles="common\Consts.cs.in" DestinationFiles="common\Consts.cs"/>
|
||||
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="@MONO_VERSION@" Replacement="2.7.0.0" Files="common\Consts.cs"/>
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -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;
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
/Mono.Common.targets -crlf
|
||||
/Mono.Default.targets -crlf
|
||||
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\ExtensionPack\MSBuild.ExtensionPack.tasks"/>
|
||||
<PropertyGroup Condition=" '$(USE_MONO_COMPILER)' == '1' ">
|
||||
<CscToolExe>gmcs.bat</CscToolExe>
|
||||
<CscToolPath>C:\MonoExperimental2.5.0\bin</CscToolPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" ('$(Configuration)' == 'basic' Or '$(Configuration)' == 'basic_XML_DEP') ">
|
||||
<OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\basic\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'net_2_0_bootstrap' ">
|
||||
<OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\net_2_0_bootstrap\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<OutputPath Condition=" '$(OutputPath)' == '' ">$(MSBuildProjectDirectory)\..\lib\$(Configuration)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<Target Name="SetupProject">
|
||||
<Copy SourceFiles="$(ResponseFile)" DestinationFiles="$(ResponseFile).msbuild"/>
|
||||
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(ResponseFile).msbuild"/>
|
||||
<MakeDir Directories="$(OutputDirectory)"/>
|
||||
</Target>
|
||||
<PropertyGroup Condition=" '$(ResponseFile)' == '' ">
|
||||
<ResponseFile>$(MSBuildProjectName).dll.sources</ResponseFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<CompilerResponseFile>$(ResponseFile).msbuild</CompilerResponseFile>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition="'$(Configuration)' == ''">net_2_0</Configuration>
|
||||
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,6 +1,6 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
monolite_path := $(topdir)/class/lib/monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
monolite_path := $(topdir)/class/lib/monolite/$(MONO_CORLIB_VERSION)
|
||||
|
||||
with_mono_path_monolite = MONO_PATH="$(monolite_path)$(PLATFORM_PATH_SEPARATOR)$(monolite_path)/Facades$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
|
||||
|
||||
@@ -90,7 +90,7 @@ ifdef use_monolite
|
||||
do-get-monolite:
|
||||
|
||||
do-profile-check-monolite:
|
||||
@echo "*** The contents of your 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
|
||||
@echo "*** The contents of your 'monolite/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
|
||||
@echo "*** You may want to try 'make get-monolite-latest'" 1>&2
|
||||
rm -f $(monolite_flag)
|
||||
exit 1
|
||||
@@ -98,12 +98,12 @@ do-profile-check-monolite:
|
||||
else
|
||||
|
||||
do-get-monolite:
|
||||
@echo "*** Downloading bootstrap required 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)'" 1>&2
|
||||
$(MAKE) $(MAKE_Q) -C $(topdir)/class get-monolite-latest
|
||||
@echo "*** Downloading bootstrap required 'monolite/$(MONO_CORLIB_VERSION)'" 1>&2
|
||||
$(MAKE) $(MAKE_Q) -C $(mono_build_root) get-monolite-latest
|
||||
|
||||
do-profile-check-monolite: $(depsdir)/.stamp
|
||||
@echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
|
||||
@echo "*** Trying the 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory." 1>&2
|
||||
@echo "*** Trying the 'monolite/$(MONO_CORLIB_VERSION)' directory." 1>&2
|
||||
@echo dummy > $(monolite_flag)
|
||||
$(MAKE) do-profile-check
|
||||
|
||||
|
||||
@@ -6,14 +6,12 @@ BUILD_TOOLS_PROFILE = basic
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
PLATFORMS = darwin linux win32
|
||||
|
||||
# nuttzing!
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
|
||||
@@ -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
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
include $(topdir)/build/profiles/net_4_x.make
|
||||
|
||||
PLATFORMS:=
|
||||
|
||||
PARENT_PROFILE = ../net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS += -d:XBUILD_12
|
||||
|
||||
@@ -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 :=
|
||||
@@ -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) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response)
|
||||
|
||||
xtest_response_preprocessed = $(xtest_response)_preprocessed
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
+25
-1
@@ -1 +1,25 @@
|
||||
See LICENSE file in the project root for full license information.
|
||||
The MIT X11 License covers most of the class libraries in the Mono
|
||||
project. Some third party libraries come from different projects, and
|
||||
are licensed under their own terms.
|
||||
|
||||
|
||||
Copyright (c) 2001, 2002, 2003 The Mono Project
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
+9
-33
@@ -130,11 +130,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 \
|
||||
@@ -320,7 +315,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 +352,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
|
||||
|
||||
@@ -388,7 +381,8 @@ DISTFILES = \
|
||||
MicrosoftAjaxLibrary/License.htm \
|
||||
test-helpers/NetworkHelpers.cs \
|
||||
test-helpers/SocketResponder.cs \
|
||||
$(foreach HOST_PLATFORM,darwin linux win32,lib/$(monolite_dir)/mcs.exe $(monolite_files))
|
||||
lib/$(monolite_dir)/mcs.exe \
|
||||
$(monolite_files)
|
||||
|
||||
.PHONY: all-local $(STD_TARGETS:=-local)
|
||||
all-local $(STD_TARGETS:=-local):
|
||||
@@ -396,7 +390,7 @@ all-local $(STD_TARGETS:=-local):
|
||||
|
||||
all-local-aot:
|
||||
|
||||
monolite_dir = monolite-$(HOST_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
monolite_dir := monolite/$(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 \
|
||||
@@ -419,42 +413,24 @@ lib/$(monolite_dir)/Facades:
|
||||
|
||||
$(monolite_files): | lib/$(monolite_dir)
|
||||
$(monolite_files): | lib/$(monolite_dir)/Facades
|
||||
$(monolite_files): lib/$(monolite_dir)/%: lib/build-$(HOST_PLATFORM)/%
|
||||
$(monolite_files): lib/$(monolite_dir)/%: lib/build/%
|
||||
cp -p $< $@
|
||||
|
||||
lib/$(monolite_dir)/mcs.exe:
|
||||
$(MAKE) -C ../mcs PROFILE=build
|
||||
cp -p lib/build-$(HOST_PLATFORM)/mcs.exe lib/$(monolite_dir)
|
||||
cp -p lib/build/mcs.exe lib/$(monolite_dir)
|
||||
|
||||
$(build_files:%=lib/build-$(HOST_PLATFORM)/%):
|
||||
$(build_files:%=lib/build/%):
|
||||
cd $(topdir) && $(MAKE) profile-do--build--all NO_DIR_CHECK=1 SKIP_AOT=1
|
||||
|
||||
dist-monolite: $(monolite_files) lib/$(monolite_dir)/mcs.exe
|
||||
|
||||
dist-monolite-all-platforms:
|
||||
$(MAKE) dist-monolite HOST_PLATFORM=darwin
|
||||
$(MAKE) dist-monolite HOST_PLATFORM=linux
|
||||
$(MAKE) dist-monolite HOST_PLATFORM=win32
|
||||
|
||||
package-monolite-latest:
|
||||
MONOLITE=monolite-$(HOST_PLATFORM)-$(MONO_CORLIB_VERSION)-latest; \
|
||||
MONOLITE=monolite-$(MONO_CORLIB_VERSION)-latest; \
|
||||
$(MAKE) dist-monolite monolite_dir=$$MONOLITE; \
|
||||
tar zcvpf $$MONOLITE.tar.gz --directory=lib $$MONOLITE/
|
||||
|
||||
package-monolite-latest-all-platforms:
|
||||
$(MAKE) package-monolite-latest HOST_PLATFORM=darwin
|
||||
$(MAKE) package-monolite-latest HOST_PLATFORM=linux
|
||||
$(MAKE) package-monolite-latest HOST_PLATFORM=win32
|
||||
|
||||
monolite_url = https://download.mono-project.com/monolite/monolite-$(BUILD_PLATFORM)-$(MONO_CORLIB_VERSION)-latest.tar.gz
|
||||
|
||||
get-monolite-latest:
|
||||
-rm -fr lib/monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
-mkdir -p lib/monolite-$(BUILD_PLATFORM)
|
||||
cd lib && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd lib && mv -f monolite-$(BUILD_PLATFORM)-$(MONO_CORLIB_VERSION)-latest monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
|
||||
dist-default: dist-monolite-all-platforms
|
||||
dist-default: dist-monolite
|
||||
|
||||
dist-local: dist-default
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -102,18 +102,6 @@ namespace Mono.Debugger.Soft
|
||||
}
|
||||
}
|
||||
|
||||
public int EndLineNumber {
|
||||
get {
|
||||
return Location.EndLineNumber;
|
||||
}
|
||||
}
|
||||
|
||||
public int EndColumnNumber {
|
||||
get {
|
||||
return Location.EndColumnNumber;
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsDebuggerInvoke {
|
||||
get {
|
||||
return (flags & StackFrameFlags.DEBUGGER_INVOKE) != 0;
|
||||
|
||||
@@ -13,8 +13,6 @@ namespace Mono.Debugger.Soft
|
||||
ManualResetEvent fetchingEvent = new ManualResetEvent (false);
|
||||
ThreadInfo info;
|
||||
StackFrame[] frames;
|
||||
bool threadStateInvalid = true;
|
||||
ThreadState threadState;
|
||||
|
||||
internal ThreadMirror (VirtualMachine vm, long id) : base (vm, id) {
|
||||
}
|
||||
@@ -32,7 +30,6 @@ namespace Mono.Debugger.Soft
|
||||
|
||||
internal void InvalidateFrames () {
|
||||
cacheInvalid = true;
|
||||
threadStateInvalid = true;
|
||||
}
|
||||
|
||||
internal void FetchFrames (bool mustFetch = false) {
|
||||
@@ -94,11 +91,7 @@ namespace Mono.Debugger.Soft
|
||||
|
||||
public ThreadState ThreadState {
|
||||
get {
|
||||
if (threadStateInvalid) {
|
||||
threadState = (ThreadState) vm.conn.Thread_GetState (id);
|
||||
threadStateInvalid = false;
|
||||
}
|
||||
return threadState;
|
||||
return (ThreadState)vm.conn.Thread_GetState (id);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -665,7 +665,7 @@ namespace Mono.Debugger.Soft
|
||||
return res;
|
||||
}
|
||||
|
||||
internal ValueImpl EncodeValue (Value v, List<Value> duplicates = null) {
|
||||
internal ValueImpl EncodeValue (Value v) {
|
||||
if (v is PrimitiveValue) {
|
||||
object val = (v as PrimitiveValue).Value;
|
||||
if (val == null)
|
||||
@@ -675,22 +675,16 @@ namespace Mono.Debugger.Soft
|
||||
} else if (v is ObjectMirror) {
|
||||
return new ValueImpl { Type = ElementType.Object, Objid = (v as ObjectMirror).Id };
|
||||
} else if (v is StructMirror) {
|
||||
if (duplicates == null)
|
||||
duplicates = new List<Value> ();
|
||||
if (duplicates.Contains (v))
|
||||
return new ValueImpl { Type = (ElementType)ValueTypeId.VALUE_TYPE_ID_NULL, Objid = 0 };
|
||||
duplicates.Add (v);
|
||||
|
||||
return new ValueImpl { Type = ElementType.ValueType, Klass = (v as StructMirror).Type.Id, Fields = EncodeValues ((v as StructMirror).Fields, duplicates) };
|
||||
return new ValueImpl { Type = ElementType.ValueType, Klass = (v as StructMirror).Type.Id, Fields = EncodeValues ((v as StructMirror).Fields) };
|
||||
} else {
|
||||
throw new NotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
internal ValueImpl[] EncodeValues (IList<Value> values, List<Value> duplicates = null) {
|
||||
internal ValueImpl[] EncodeValues (IList<Value> values) {
|
||||
ValueImpl[] res = new ValueImpl [values.Count];
|
||||
for (int i = 0; i < values.Count; ++i)
|
||||
res [i] = EncodeValue (values [i], duplicates);
|
||||
res [i] = EncodeValue (values [i]);
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -730,7 +724,6 @@ namespace Mono.Debugger.Soft
|
||||
l.Add (new ThreadStartEvent (vm, req_id, id));
|
||||
break;
|
||||
case EventType.ThreadDeath:
|
||||
vm.GetThread (id).InvalidateFrames ();
|
||||
vm.InvalidateThreadCache ();
|
||||
l.Add (new ThreadDeathEvent (vm, req_id, id));
|
||||
break;
|
||||
|
||||
@@ -5,7 +5,6 @@ using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Runtime.Remoting.Messaging;
|
||||
using System.Text;
|
||||
|
||||
namespace Mono.Debugger.Soft
|
||||
{
|
||||
@@ -96,12 +95,6 @@ namespace Mono.Debugger.Soft
|
||||
info.FileName = "valgrind";
|
||||
info.UseShellExecute = false;
|
||||
|
||||
if (info.RedirectStandardError)
|
||||
info.StandardErrorEncoding = Encoding.UTF8;
|
||||
|
||||
if (info.RedirectStandardOutput)
|
||||
info.StandardOutputEncoding = Encoding.UTF8;
|
||||
|
||||
ITargetProcess p;
|
||||
if (options != null && options.CustomProcessLauncher != null)
|
||||
p = new ProcessWrapper (options.CustomProcessLauncher (info));
|
||||
|
||||
@@ -1165,18 +1165,10 @@ public class Tests : TestsBase, ITest2
|
||||
return 42;
|
||||
}
|
||||
|
||||
public int invoke_pass_nullable (int? i) {
|
||||
return (int)i;
|
||||
}
|
||||
|
||||
public int? invoke_return_nullable_null () {
|
||||
return null;
|
||||
}
|
||||
|
||||
public int invoke_pass_nullable_null (int? i) {
|
||||
return i.HasValue ? 1 : 2;
|
||||
}
|
||||
|
||||
public void invoke_type_load () {
|
||||
new Class3 ();
|
||||
}
|
||||
|
||||
@@ -2617,11 +2617,6 @@ public class DebuggerTests
|
||||
m = s.Type.GetMethod ("ToString");
|
||||
v = s.InvokeMethod (e.Thread, m, null);
|
||||
|
||||
// pass nullable as argument
|
||||
m = t.GetMethod ("invoke_pass_nullable");
|
||||
v = this_obj.InvokeMethod (e.Thread, m, new Value [] { s });
|
||||
AssertValue (42, v);
|
||||
|
||||
// return nullable null
|
||||
m = t.GetMethod ("invoke_return_nullable_null");
|
||||
v = this_obj.InvokeMethod (e.Thread, m, null);
|
||||
@@ -2635,11 +2630,6 @@ public class DebuggerTests
|
||||
m = s.Type.GetMethod ("ToString");
|
||||
v = s.InvokeMethod (e.Thread, m, null);
|
||||
|
||||
// pass nullable null as argument
|
||||
m = t.GetMethod ("invoke_pass_nullable_null");
|
||||
v = this_obj.InvokeMethod (e.Thread, m, new Value [] { s });
|
||||
AssertValue (2, v);
|
||||
|
||||
// pass primitive
|
||||
m = t.GetMethod ("invoke_pass_primitive");
|
||||
Value[] args = new Value [] {
|
||||
@@ -2733,17 +2723,6 @@ public class DebuggerTests
|
||||
task = t.InvokeMethodAsync (e.Thread, m, new Value [] { vm.RootDomain.CreateString ("ABC") });
|
||||
AssertValue ("ABC", task.Result);
|
||||
|
||||
// string constructor
|
||||
var stringType = vm.RootDomain.Corlib.GetType ("System.String");
|
||||
var stringConstructor = stringType.GetMethods ().Single (c=>
|
||||
c.Name == ".ctor" &&
|
||||
c.GetParameters ().Length == 2 &&
|
||||
c.GetParameters ()[0].ParameterType.Name == "Char" &&
|
||||
c.GetParameters ()[1].ParameterType.Name == "Int32");
|
||||
var str = stringType.NewInstance (e.Thread, stringConstructor, new Value [] { vm.CreateValue ('a'), vm.CreateValue (3)});
|
||||
|
||||
AssertValue("aaa", str);
|
||||
|
||||
// Argument checking
|
||||
|
||||
// null thread
|
||||
@@ -4143,7 +4122,7 @@ public class DebuggerTests
|
||||
|
||||
frames = thread.GetFrames ();
|
||||
Assert.AreEqual (8, frames.Length, "#7");
|
||||
Assert.AreEqual ("Wait_internal", frames [0].Method.Name, "#8.0");
|
||||
Assert.AreEqual ("WaitOne_internal", frames [0].Method.Name, "#8.0");
|
||||
Assert.AreEqual ("WaitOneNative", frames [1].Method.Name, "#8.1");
|
||||
Assert.AreEqual ("InternalWaitOne", frames [2].Method.Name, "#8.2");
|
||||
Assert.AreEqual ("WaitOne", frames [3].Method.Name, "#8.3");
|
||||
|
||||
@@ -228,7 +228,7 @@ namespace MonoTests.Mono.Options
|
||||
e.Run = (args) => e.CommandSet.Out.WriteLine (string.Join (" ", args));
|
||||
|
||||
var o = new StringWriter ();
|
||||
var c = new CommandSet ("set", output:o, error: Console.Error) {
|
||||
var c = new CommandSet ("set", output:o) {
|
||||
e,
|
||||
};
|
||||
Assert.AreEqual (0, c.Run (new [] { "help", "echo" }));
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace MonoTests.Mono.Options
|
||||
c, v => { string ignore = v.OptionValues [0]; });
|
||||
c.Option = p [0];
|
||||
Utils.AssertException (typeof(ArgumentOutOfRangeException),
|
||||
$"Specified argument was out of the range of valid values.{Environment.NewLine}Parameter name: index",
|
||||
"Specified argument was out of the range of valid values.\nParameter name: index",
|
||||
c, v => { string ignore = v.OptionValues [2]; });
|
||||
c.OptionName = "-a";
|
||||
Utils.AssertException (typeof(OptionException),
|
||||
|
||||
@@ -374,10 +374,10 @@ namespace MonoTests.Mono.Options
|
||||
p, v => { v.Parse (_("-a", "-b")); });
|
||||
Assert.AreEqual (a, "-b");
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: option",
|
||||
"Value cannot be null.\nParameter name: option",
|
||||
p, v => { v.Add ((Option) null); });
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: header",
|
||||
"Value cannot be null.\nParameter name: header",
|
||||
p, v => { v.Add ((string) null); });
|
||||
|
||||
// bad type
|
||||
@@ -394,10 +394,10 @@ namespace MonoTests.Mono.Options
|
||||
p, v => { v.Parse (_("-cz", "extra")); });
|
||||
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: action",
|
||||
"Value cannot be null.\nParameter name: action",
|
||||
p, v => { v.Add ("foo", (Action<string>) null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Cannot provide maxValueCount of 2 for OptionValueType.None.{Environment.NewLine}Parameter name: maxValueCount",
|
||||
"Cannot provide maxValueCount of 2 for OptionValueType.None.\nParameter name: maxValueCount",
|
||||
p, v => { v.Add ("foo", (k, val) => {/* ignore */}); });
|
||||
}
|
||||
|
||||
@@ -772,7 +772,7 @@ namespace MonoTests.Mono.Options
|
||||
Utils.AssertException (typeof(ArgumentException), "prototypes must be null!",
|
||||
p, v => { v.Add ("N|NUM=", (int n) => {}); });
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: option",
|
||||
"Value cannot be null.\nParameter name: option",
|
||||
p, v => { v.GetOptionForName (null); });
|
||||
}
|
||||
|
||||
|
||||
@@ -66,60 +66,60 @@ namespace MonoTests.Mono.Options
|
||||
{
|
||||
object p = null;
|
||||
Utils.AssertException (typeof(ArgumentNullException),
|
||||
$"Value cannot be null.{Environment.NewLine}Parameter name: prototype",
|
||||
"Value cannot be null.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption (null, null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Cannot be the empty string.{Environment.NewLine}Parameter name: prototype",
|
||||
"Cannot be the empty string.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Empty option names are not supported.{Environment.NewLine}Parameter name: prototype",
|
||||
"Empty option names are not supported.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a|b||c=", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Conflicting option types: '=' vs. ':'.{Environment.NewLine}Parameter name: prototype",
|
||||
"Conflicting option types: '=' vs. ':'.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a=|b:", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"The default option handler '<>' cannot require values.{Environment.NewLine}Parameter name: prototype",
|
||||
"The default option handler '<>' cannot require values.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("<>=", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"The default option handler '<>' cannot require values.{Environment.NewLine}Parameter name: prototype",
|
||||
"The default option handler '<>' cannot require values.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("<>:", null); });
|
||||
Utils.AssertException (null, null,
|
||||
p, v => { new DefaultOption ("t|<>=", null, 1); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"The default option handler '<>' cannot require values.{Environment.NewLine}Parameter name: prototype",
|
||||
"The default option handler '<>' cannot require values.\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("t|<>=", null, 2); });
|
||||
Utils.AssertException (null, null,
|
||||
p, v => { new DefaultOption ("a|b=", null, 2); });
|
||||
Utils.AssertException (typeof(ArgumentOutOfRangeException),
|
||||
$"Specified argument was out of the range of valid values.{Environment.NewLine}Parameter name: maxValueCount",
|
||||
"Specified argument was out of the range of valid values.\nParameter name: maxValueCount",
|
||||
p, v => { new DefaultOption ("a", null, -1); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Cannot provide maxValueCount of 0 for OptionValueType.Required or " +
|
||||
$"OptionValueType.Optional.{Environment.NewLine}Parameter name: maxValueCount",
|
||||
"OptionValueType.Optional.\nParameter name: maxValueCount",
|
||||
p, v => { new DefaultOption ("a=", null, 0); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={\".\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a=}\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a=}\".\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a=}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={{}}\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={{}}\".\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={{}}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={}}\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={}}\".\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={}}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
"Ill-formed name/value separator found in \"a={}{\"." + Environment.NewLine + "Parameter name: prototype",
|
||||
"Ill-formed name/value separator found in \"a={}{\".\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={}{", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Cannot provide key/value separators for Options taking 1 value(s).{Environment.NewLine}Parameter name: prototype",
|
||||
"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a==", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Cannot provide key/value separators for Options taking 1 value(s).{Environment.NewLine}Parameter name: prototype",
|
||||
"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a={}", null); });
|
||||
Utils.AssertException (typeof(ArgumentException),
|
||||
$"Cannot provide key/value separators for Options taking 1 value(s).{Environment.NewLine}Parameter name: prototype",
|
||||
"Cannot provide key/value separators for Options taking 1 value(s).\nParameter name: prototype",
|
||||
p, v => { new DefaultOption ("a=+-*/", null); });
|
||||
Utils.AssertException (null, null,
|
||||
p, v => { new DefaultOption ("a", null, 0); });
|
||||
|
||||
@@ -34,16 +34,9 @@ using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.Permissions;
|
||||
|
||||
|
||||
|
||||
#if MONO_POSIX_NETSTANDARD_BUILD
|
||||
[assembly: AssemblyVersion ("1.0.0.0")]
|
||||
[assembly: AssemblyTitle("Mono.Posix.NETStandard.dll")]
|
||||
#else
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyTitle("Mono.Posix.dll")]
|
||||
#endif
|
||||
|
||||
[assembly: AssemblyTitle("Mono.Posix.dll")]
|
||||
[assembly: AssemblyDescription("Unix Integration Classes")]
|
||||
|
||||
[assembly: CLSCompliant (true)]
|
||||
@@ -55,11 +48,9 @@ using System.Security.Permissions;
|
||||
|
||||
*/
|
||||
|
||||
#if !MONO_POSIX_NETSTANDARD_BUILD
|
||||
// We are using ../Open.snk for MONO_POSIX_NETSTANDARD_BUILD
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../mono.pub")]
|
||||
#endif
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
*
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AssemblyName>Mono.Posix.NETStandard</AssemblyName>
|
||||
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
|
||||
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
|
||||
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>..\Open.snk</AssemblyOriginatorKeyFile>
|
||||
<!--<BaseIntermediateOutputPath>obj-netstandard2.0</BaseIntermediateOutputPath>
|
||||
<IntermediateOutputPath>obj-netstandard2.0</IntermediateOutputPath>-->
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DefineConstants>$(DefineConstants);MONO_POSIX_NETSTANDARD_BUILD</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(ForceUseLibC)' == 'true'">
|
||||
<DefineConstants>$(DefineConstants);FORCE_USE_LIBC_NOT_MSVC</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include=".\Assembly\**\*.cs" />
|
||||
<Compile Include=".\Mono.Posix\**\*.cs" />
|
||||
<Compile Include=".\Mono.Unix\**\*.cs" />
|
||||
<Compile Include=".\Mono.Unix.Native\**\*.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Remove=".\Mono.Unix.Native\CdeclFunction.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -153,7 +153,7 @@ namespace Mono.Remoting.Channels.Unix
|
||||
_pool = pool;
|
||||
_client = client;
|
||||
_stream = new BufferedStream (client.GetStream());
|
||||
_controlTime = DateTime.UtcNow;
|
||||
_controlTime = DateTime.Now;
|
||||
_buffer = new byte[UnixMessageIO.DefaultStreamBufferSize];
|
||||
}
|
||||
|
||||
@@ -270,7 +270,7 @@ namespace Mono.Remoting.Channels.Unix
|
||||
{
|
||||
lock (_pool)
|
||||
{
|
||||
entry.ControlTime = DateTime.UtcNow; // Initialize timeout
|
||||
entry.ControlTime = DateTime.Now; // Initialize timeout
|
||||
_pool.Add (entry);
|
||||
Monitor.Pulse (_pool);
|
||||
}
|
||||
@@ -295,7 +295,7 @@ namespace Mono.Remoting.Channels.Unix
|
||||
for (int n=0; n < _pool.Count; n++)
|
||||
{
|
||||
UnixConnection entry = (UnixConnection)_pool[n];
|
||||
if ( (DateTime.UtcNow - entry.ControlTime).TotalSeconds > UnixConnectionPool.KeepAliveSeconds)
|
||||
if ( (DateTime.Now - entry.ControlTime).TotalSeconds > UnixConnectionPool.KeepAliveSeconds)
|
||||
{
|
||||
CancelConnection (entry);
|
||||
_pool.RemoveAt(n);
|
||||
|
||||
@@ -309,7 +309,6 @@ namespace Mono.Unix.Native {
|
||||
public delegate void SignalHandler (int signal);
|
||||
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
internal class XPrintfFunctions
|
||||
{
|
||||
internal delegate object XPrintf (object[] parameters);
|
||||
@@ -336,7 +335,6 @@ namespace Mono.Unix.Native {
|
||||
syslog = new XPrintf (_syslog.Invoke);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//
|
||||
// Convention: Functions that are part of the C standard library go here.
|
||||
@@ -380,11 +378,7 @@ namespace Mono.Unix.Native {
|
||||
//
|
||||
public class Stdlib
|
||||
{
|
||||
#if FORCE_USE_LIBC_NOT_MSVC
|
||||
internal const string LIBC = "c";
|
||||
#else
|
||||
internal const string LIBC = "msvcrt";
|
||||
#endif
|
||||
internal const string MPH = "MonoPosixHelper";
|
||||
|
||||
// It is possible for Mono.Posix and MonoPosixHelper to get out of sync,
|
||||
@@ -777,7 +771,6 @@ namespace Mono.Unix.Native {
|
||||
return sys_fprintf (stream, "%s", message);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use fprintf (IntPtr, string) instead.")]
|
||||
public static int fprintf (IntPtr stream, string format, params object[] parameters)
|
||||
@@ -788,7 +781,6 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 2, parameters.Length);
|
||||
return (int) XPrintfFunctions.fprintf (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* SKIP: fscanf(3) */
|
||||
|
||||
@@ -801,7 +793,6 @@ namespace Mono.Unix.Native {
|
||||
return sys_printf ("%s", message);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use printf (string) instead.")]
|
||||
public static int printf (string format, params object[] parameters)
|
||||
@@ -811,7 +802,6 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 1, parameters.Length);
|
||||
return (int) XPrintfFunctions.printf (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* SKIP: scanf(3) */
|
||||
|
||||
@@ -833,7 +823,6 @@ namespace Mono.Unix.Native {
|
||||
return sys_snprintf (s, (ulong) s.Capacity, "%s", message);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[CLSCompliant (false)]
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use snprintf (StringBuilder, string) instead.")]
|
||||
@@ -864,7 +853,6 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 3, parameters.Length);
|
||||
return (int) XPrintfFunctions.snprintf (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* SKIP:
|
||||
|
||||
@@ -4387,7 +4387,6 @@ namespace Mono.Unix.Native {
|
||||
return UnixMarshal.EscapeFormatString (message, new char[]{'m'});
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
[Obsolete ("Not necessarily portable due to cdecl restrictions.\n" +
|
||||
"Use syslog(SyslogFacility, SyslogLevel, string) instead.")]
|
||||
public static int syslog (SyslogFacility facility, SyslogLevel level,
|
||||
@@ -4416,7 +4415,6 @@ namespace Mono.Unix.Native {
|
||||
Array.Copy (parameters, 0, _parameters, 2, parameters.Length);
|
||||
return (int) XPrintfFunctions.syslog (_parameters);
|
||||
}
|
||||
#endif
|
||||
|
||||
[DllImport (MPH, SetLastError=true,
|
||||
EntryPoint="Mono_Posix_Syscall_closelog")]
|
||||
|
||||
@@ -300,35 +300,17 @@ public class UnixEncoding : Encoding
|
||||
throw new ArgumentOutOfRangeException ("byteIndex", _("ArgRange_Array"));
|
||||
}
|
||||
|
||||
unsafe {
|
||||
fixed (char* p = s) {
|
||||
fixed (byte* b = bytes) {
|
||||
return GetBytes (p + charIndex, charCount, b + byteIndex, bytes.Length - byteIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public unsafe override int GetBytes(char* chars, int charCount, byte* bytes, int byteCount)
|
||||
{
|
||||
if (bytes == null || chars == null)
|
||||
throw new ArgumentNullException (bytes == null ? "bytes" : "chars");
|
||||
|
||||
if (charCount < 0 || byteCount < 0)
|
||||
throw new ArgumentOutOfRangeException (charCount < 0 ? "charCount" : "byteCount");
|
||||
|
||||
// Convert the characters into bytes.
|
||||
char ch;
|
||||
int length = byteCount;
|
||||
int length = bytes.Length;
|
||||
uint pair;
|
||||
int posn = 0;
|
||||
int charIndex = 0;
|
||||
int posn = byteIndex;
|
||||
while (charCount > 0) {
|
||||
// Fetch the next UTF-16 character pair value.
|
||||
ch = chars [charIndex++];
|
||||
ch = s[charIndex++];
|
||||
if (ch >= '\uD800' && ch <= '\uDBFF' && charCount > 1) {
|
||||
// This may be the start of a surrogate pair.
|
||||
pair = (uint)(chars[charIndex]);
|
||||
pair = (uint)(s[charIndex]);
|
||||
if (pair >= (uint)0xDC00 && pair <= (uint)0xDFFF) {
|
||||
pair = (pair - (uint)0xDC00) +
|
||||
((((uint)ch) - (uint)0xD800) << 10) +
|
||||
@@ -344,7 +326,7 @@ public class UnixEncoding : Encoding
|
||||
}
|
||||
charCount -= 2;
|
||||
if (charCount >= 0) {
|
||||
bytes[posn++] = (byte)chars [charIndex++];
|
||||
bytes[posn++] = (byte) s [charIndex++];
|
||||
}
|
||||
continue;
|
||||
} else {
|
||||
@@ -383,7 +365,7 @@ public class UnixEncoding : Encoding
|
||||
}
|
||||
|
||||
// Return the final count to the caller.
|
||||
return posn;
|
||||
return posn - byteIndex;
|
||||
}
|
||||
|
||||
// Internal version of "GetCharCount" which can handle a rolling
|
||||
@@ -412,7 +394,7 @@ public class UnixEncoding : Encoding
|
||||
uint leftSoFar = (leftOverCount & (uint)0x0F);
|
||||
uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
|
||||
while (count > 0) {
|
||||
ch = (uint)(bytes [index++]);
|
||||
ch = (uint)(bytes[index++]);
|
||||
++next_raw;
|
||||
--count;
|
||||
if (leftSize == 0) {
|
||||
|
||||
@@ -325,42 +325,27 @@ namespace Mono.Unix {
|
||||
if (encoding == null)
|
||||
throw new ArgumentNullException ("encoding");
|
||||
|
||||
if (index < 0 || count < 0)
|
||||
throw new ArgumentOutOfRangeException ((index < 0 ? "index" : "count"),
|
||||
"Non - negative number required.");
|
||||
int min_byte_count = encoding.GetMaxByteCount(1);
|
||||
char[] copy = s.ToCharArray (index, count);
|
||||
byte[] marshal = new byte [encoding.GetByteCount (copy) + min_byte_count];
|
||||
|
||||
if (s.Length - index < count)
|
||||
throw new ArgumentOutOfRangeException ("s", "Index and count must refer to a location within the string.");
|
||||
int bytes_copied = encoding.GetBytes (copy, 0, copy.Length, marshal, 0);
|
||||
|
||||
int null_terminator_count = encoding.GetMaxByteCount (1);
|
||||
int length_without_null = encoding.GetByteCount (s);
|
||||
int marshalLength = checked (length_without_null + null_terminator_count);
|
||||
if (bytes_copied != (marshal.Length-min_byte_count))
|
||||
throw new NotSupportedException ("encoding.GetBytes() doesn't equal encoding.GetByteCount()!");
|
||||
|
||||
IntPtr mem = AllocHeap (marshalLength);
|
||||
IntPtr mem = AllocHeap (marshal.Length);
|
||||
if (mem == IntPtr.Zero)
|
||||
throw new UnixIOException (Native.Errno.ENOMEM);
|
||||
|
||||
unsafe {
|
||||
fixed (char* p = s) {
|
||||
byte* marshal = (byte*)mem;
|
||||
int bytes_copied;
|
||||
|
||||
try {
|
||||
bytes_copied = encoding.GetBytes (p + index, count, marshal, marshalLength);
|
||||
} catch {
|
||||
FreeHeap (mem);
|
||||
throw;
|
||||
}
|
||||
|
||||
if (bytes_copied != length_without_null) {
|
||||
FreeHeap (mem);
|
||||
throw new NotSupportedException ("encoding.GetBytes() doesn't equal encoding.GetByteCount()!");
|
||||
}
|
||||
|
||||
marshal += length_without_null;
|
||||
for (int i = 0; i < null_terminator_count; ++i)
|
||||
marshal[i] = 0;
|
||||
}
|
||||
bool copied = false;
|
||||
try {
|
||||
Marshal.Copy (marshal, 0, mem, marshal.Length);
|
||||
copied = true;
|
||||
}
|
||||
finally {
|
||||
if (!copied)
|
||||
FreeHeap (mem);
|
||||
}
|
||||
|
||||
return mem;
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace MonoTests.Mono.Unix.Native {
|
||||
Assert.IsFalse (NativeConvert.ToSignum (st.signalReceived) == Signum.SIGURG,
|
||||
"#IH: Signal Handler invoked when it should have been removed!");
|
||||
}
|
||||
#if !NETCOREAPP2_0
|
||||
|
||||
[Test]
|
||||
// MSVCRT.DLL doesn't export snprintf(3).
|
||||
[Category ("NotDotNet")]
|
||||
@@ -92,7 +92,6 @@ namespace MonoTests.Mono.Unix.Native {
|
||||
Assert.AreEqual (s.ToString(), expected,
|
||||
"#SNPF: printf of many builtin types failed");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
using NUnit.Framework;
|
||||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using Mono.Unix;
|
||||
@@ -26,12 +25,12 @@ namespace MonoTests.Mono.Unix {
|
||||
static Thread CreateWaitSignalThread (UnixSignal signal, int timeout)
|
||||
{
|
||||
Thread t1 = new Thread(delegate() {
|
||||
var sw = Stopwatch.StartNew ();
|
||||
DateTime start = DateTime.Now;
|
||||
bool r = signal.WaitOne (timeout, false);
|
||||
sw.Stop ();
|
||||
DateTime end = DateTime.Now;
|
||||
Assert.AreEqual (signal.Count, 1);
|
||||
Assert.AreEqual (r, true);
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, timeout/1000))
|
||||
if ((end - start) > new TimeSpan (0, 0, timeout/1000))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
});
|
||||
return t1;
|
||||
@@ -249,12 +248,12 @@ namespace MonoTests.Mono.Unix {
|
||||
{
|
||||
Thread t1 = new Thread (delegate () {
|
||||
using (UnixSignal a = new UnixSignal (Signum.SIGINT)) {
|
||||
var sw = Stopwatch.StartNew ();
|
||||
DateTime start = DateTime.Now;
|
||||
bool r = a.WaitOne (5000, false);
|
||||
sw.Stop ();
|
||||
DateTime end = DateTime.Now;
|
||||
Assert.AreEqual (a.Count, 1);
|
||||
Assert.AreEqual (r, true);
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, 5))
|
||||
if ((end - start) > new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
}
|
||||
});
|
||||
@@ -273,12 +272,12 @@ namespace MonoTests.Mono.Unix {
|
||||
{
|
||||
Thread t1 = new Thread (delegate () {
|
||||
using (UnixSignal a = new UnixSignal (Signum.SIGINT)) {
|
||||
var sw = Stopwatch.StartNew ();
|
||||
DateTime start = DateTime.Now;
|
||||
int idx = UnixSignal.WaitAny (new UnixSignal[]{a}, 5000);
|
||||
sw.Stop ();
|
||||
DateTime end = DateTime.Now;
|
||||
Assert.AreEqual (idx, 0);
|
||||
Assert.AreEqual (a.Count, 1);
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, 5))
|
||||
if ((end - start) > new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
}
|
||||
});
|
||||
@@ -298,13 +297,13 @@ namespace MonoTests.Mono.Unix {
|
||||
Thread t1 = new Thread (delegate () {
|
||||
using (UnixSignal a = new UnixSignal (Signum.SIGINT))
|
||||
using (UnixSignal b = new UnixSignal (Signum.SIGTERM)) {
|
||||
var sw = Stopwatch.StartNew ();
|
||||
DateTime start = DateTime.Now;
|
||||
int idx = UnixSignal.WaitAny (new UnixSignal[]{a, b}, 5000);
|
||||
sw.Stop ();
|
||||
DateTime end = DateTime.Now;
|
||||
Assert.AreEqual (idx, 1);
|
||||
Assert.AreEqual (a.Count, 0);
|
||||
Assert.AreEqual (b.Count, 1);
|
||||
if (sw.Elapsed > new TimeSpan (0, 0, 5))
|
||||
if ((end - start) > new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal slept too long");
|
||||
}
|
||||
});
|
||||
@@ -322,12 +321,12 @@ namespace MonoTests.Mono.Unix {
|
||||
public void TestNoEmit ()
|
||||
{
|
||||
using (UnixSignal u = new UnixSignal (Signum.SIGINT)) {
|
||||
var sw = Stopwatch.StartNew ();
|
||||
DateTime start = DateTime.Now;
|
||||
bool r = u.WaitOne (5100, false);
|
||||
Assert.AreEqual (r, false);
|
||||
sw.Stop ();
|
||||
if (sw.Elapsed < new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal didn't block for 5s; blocked for " + sw.Elapsed.TotalSeconds.ToString());
|
||||
DateTime end = DateTime.Now;
|
||||
if ((end - start) < new TimeSpan (0, 0, 5))
|
||||
throw new InvalidOperationException ("Signal didn't block for 5s; blocked for " + (end-start).ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System.Reflection;
|
||||
using System.Resources;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
[assembly: AssemblyTitle ("Mono.Profiler.Log")]
|
||||
[assembly: AssemblyDescription ("Mono Log Profiler API Library")]
|
||||
|
||||
[assembly: AssemblyCompany (Consts.MonoCompany)]
|
||||
[assembly: AssemblyProduct (Consts.MonoProduct)]
|
||||
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
|
||||
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: SatelliteContractVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
|
||||
[assembly: ComVisible (false)]
|
||||
@@ -1,12 +0,0 @@
|
||||
thisdir = class/Mono.Profiler.Log
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Mono.Profiler.Log.dll
|
||||
LIBRARY_SNK = ../mono.snk
|
||||
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = /unsafe /keyfile:$(LIBRARY_SNK) /publicsign
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -1,113 +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>{58A188CE-DED8-48B0-98B7-065A260D21DF}</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>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Mono.Profiler.Log</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>
|
||||
</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="Mono.Profiler.Log\LogBufferHeader.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEnums.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEvent.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEvents.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogEventVisitor.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogException.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogProcessor.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogReader.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogRuntimeProfiler.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogStream.cs" />
|
||||
<Compile Include="Mono.Profiler.Log\LogStreamHeader.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>
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_x.csproj">
|
||||
<Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
|
||||
<Name>System.Core-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
Assembly/AssemblyInfo.cs
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/Locale.cs
|
||||
Mono.Profiler.Log/LogBufferHeader.cs
|
||||
Mono.Profiler.Log/LogEnums.cs
|
||||
Mono.Profiler.Log/LogEvent.cs
|
||||
Mono.Profiler.Log/LogEventVisitor.cs
|
||||
Mono.Profiler.Log/LogEvents.cs
|
||||
Mono.Profiler.Log/LogException.cs
|
||||
Mono.Profiler.Log/LogProcessor.cs
|
||||
Mono.Profiler.Log/LogReader.cs
|
||||
Mono.Profiler.Log/LogRuntimeProfiler.cs
|
||||
Mono.Profiler.Log/LogStream.cs
|
||||
Mono.Profiler.Log/LogStreamHeader.cs
|
||||
@@ -1,46 +0,0 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class LogBufferHeader {
|
||||
|
||||
const int Id = 0x4d504c01;
|
||||
|
||||
public LogStreamHeader StreamHeader { get; }
|
||||
|
||||
public int Length { get; }
|
||||
|
||||
public ulong TimeBase { get; }
|
||||
|
||||
public long PointerBase { get; }
|
||||
|
||||
public long ObjectBase { get; }
|
||||
|
||||
public long ThreadId { get; }
|
||||
|
||||
public long MethodBase { get; }
|
||||
|
||||
internal ulong CurrentTime { get; set; }
|
||||
|
||||
internal long CurrentMethod { get; set; }
|
||||
|
||||
internal LogBufferHeader (LogStreamHeader streamHeader, LogReader reader)
|
||||
{
|
||||
StreamHeader = streamHeader;
|
||||
|
||||
var id = reader.ReadInt32 ();
|
||||
|
||||
if (id != Id)
|
||||
throw new LogException ($"Invalid buffer header ID (0x{id:X}).");
|
||||
|
||||
Length = reader.ReadInt32 ();
|
||||
TimeBase = CurrentTime = reader.ReadUInt64 ();
|
||||
PointerBase = reader.ReadInt64 ();
|
||||
ObjectBase = reader.ReadInt64 ();
|
||||
ThreadId = reader.ReadInt64 ();
|
||||
MethodBase = CurrentMethod = reader.ReadInt64 ();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,212 +0,0 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
|
||||
namespace Mono.Profiler.Log {
|
||||
|
||||
// mono/profiler/log.h : TYPE_*
|
||||
enum LogEventType {
|
||||
Allocation = 0,
|
||||
GC = 1,
|
||||
Metadata = 2,
|
||||
Method = 3,
|
||||
Exception = 4,
|
||||
Monitor = 5,
|
||||
Heap = 6,
|
||||
Sample = 7,
|
||||
Runtime = 8,
|
||||
Coverage = 9,
|
||||
Meta = 10,
|
||||
|
||||
AllocationNoBacktrace = 0 << 4,
|
||||
AllocationBacktrace = 1 << 4,
|
||||
|
||||
GCEvent = 1 << 4,
|
||||
GCResize = 2 << 4,
|
||||
GCMove = 3 << 4,
|
||||
GCHandleCreationNoBacktrace = 4 << 4,
|
||||
GCHandleDeletionNoBacktrace = 5 << 4,
|
||||
GCHandleCreationBacktrace = 6 << 4,
|
||||
GCHandleDeletionBacktrace = 7 << 4,
|
||||
GCFinalizeBegin = 8 << 4,
|
||||
GCFinalizeEnd = 9 << 4,
|
||||
GCFinalizeObjectBegin = 10 << 4,
|
||||
GCFinalizeObjectEnd = 11 << 4,
|
||||
|
||||
MetadataExtra = 0 << 4,
|
||||
MetadataEndLoad = 2 << 4,
|
||||
MetadataEndUnload = 4 << 4,
|
||||
|
||||
MethodLeave = 1 << 4,
|
||||
MethodEnter = 2 << 4,
|
||||
MethodLeaveExceptional = 3 << 4,
|
||||
MethodJit = 4 << 4,
|
||||
|
||||
ExceptionThrowNoBacktrace = 0 << 7,
|
||||
ExceptionThrowBacktrace = 1 << 7,
|
||||
ExceptionClause = 1 << 4,
|
||||
|
||||
MonitorNoBacktrace = 0 << 7,
|
||||
MonitorBacktrace = 1 << 7,
|
||||
|
||||
HeapBegin = 0 << 4,
|
||||
HeapEnd = 1 << 4,
|
||||
HeapObject = 2 << 4,
|
||||
HeapRoots = 3 << 4,
|
||||
|
||||
SampleHit = 0 << 4,
|
||||
SampleUnmanagedSymbol = 1 << 4,
|
||||
SampleUnmanagedBinary = 2 << 4,
|
||||
SampleCounterDescriptions = 3 << 4,
|
||||
SampleCounters = 4 << 4,
|
||||
|
||||
RuntimeJitHelper = 1 << 4,
|
||||
|
||||
CoverageAssembly = 0 << 4,
|
||||
CoverageMethod = 1 << 4,
|
||||
CoverageStatement = 2 << 4,
|
||||
CoverageClass = 3 << 4,
|
||||
|
||||
MetaSynchronizationPoint = 0 << 4,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : TYPE_*
|
||||
enum LogMetadataType {
|
||||
Class = 1,
|
||||
Image = 2,
|
||||
Assembly = 3,
|
||||
AppDomain = 4,
|
||||
Thread = 5,
|
||||
Context = 6,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterType {
|
||||
Int32 = 0,
|
||||
UInt32 = 1,
|
||||
Word = 2,
|
||||
Int64 = 3,
|
||||
UInt64 = 4,
|
||||
Double = 5,
|
||||
String = 6,
|
||||
Interval = 7,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterSection {
|
||||
Jit = 1 << 8,
|
||||
GC = 1 << 9,
|
||||
Metadata = 1 << 10,
|
||||
Generics = 1 << 11,
|
||||
Security = 1 << 12,
|
||||
Runtime = 1 << 13,
|
||||
System = 1 << 14,
|
||||
User = 1 << 15,
|
||||
Profiler = 1 << 16,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterUnit {
|
||||
Raw = 0 << 24,
|
||||
Bytes = 1 << 24,
|
||||
Time = 2 << 24,
|
||||
Count = 3 << 24,
|
||||
Percentage = 4 << 24,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
public enum LogCounterVariance {
|
||||
Monotonic = 1 << 28,
|
||||
Constant = 1 << 29,
|
||||
Variable = 1 << 30,
|
||||
}
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerCodeBufferType
|
||||
public enum LogJitHelper {
|
||||
Unknown = 0,
|
||||
Method = 1,
|
||||
MethodTrampoline = 2,
|
||||
UnboxTrampoline = 3,
|
||||
ImtTrampoline = 4,
|
||||
GenericsTrampoline = 5,
|
||||
SpecificTrampoline = 6,
|
||||
Helper = 7,
|
||||
Monitor = 8,
|
||||
DelegateInvoke = 9,
|
||||
ExceptionHandling = 10,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : SAMPLE_*
|
||||
public enum LogSampleHitType {
|
||||
Cycles = 1,
|
||||
Instructions = 2,
|
||||
CacheMisses = 3,
|
||||
CacheHits = 4,
|
||||
Branches = 5,
|
||||
BranchMisses = 6,
|
||||
}
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerGCRootType
|
||||
[Flags]
|
||||
public enum LogHeapRootAttributes {
|
||||
Pinning = 1 << 8,
|
||||
WeakReference = 2 << 8,
|
||||
Interior = 4 << 8,
|
||||
|
||||
Stack = 0,
|
||||
Finalizer = 1,
|
||||
Handle = 2,
|
||||
Other = 3,
|
||||
Miscellaneous = 4,
|
||||
|
||||
TypeMask = 0xff,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : MonoProfilerMonitorEvent
|
||||
public enum LogMonitorEvent {
|
||||
Contention = 1,
|
||||
Done = 2,
|
||||
Fail = 3,
|
||||
}
|
||||
|
||||
// mono/metadata/metadata.h : MonoExceptionEnum
|
||||
public enum LogExceptionClause {
|
||||
Catch = 0,
|
||||
Filter = 1,
|
||||
Finally = 2,
|
||||
Fault = 4,
|
||||
}
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerGCEvent
|
||||
public enum LogGCEvent {
|
||||
Begin = 0,
|
||||
MarkBegin = 1,
|
||||
MarkEnd = 2,
|
||||
ReclaimBegin = 3,
|
||||
ReclaimEnd = 4,
|
||||
End = 5,
|
||||
PreStopWorld = 6,
|
||||
PostStopWorld = 7,
|
||||
PreStartWorld = 8,
|
||||
PostStartWorld = 9,
|
||||
PreStopWorldLocked = 10,
|
||||
PostStartWorldUnlocked = 11,
|
||||
}
|
||||
|
||||
// mono/metadata/mono-gc.h : MonoGCHandleType
|
||||
public enum LogGCHandleType {
|
||||
Weak = 0,
|
||||
WeakTrackResurrection = 1,
|
||||
Normal = 2,
|
||||
Pinned = 3,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : MonoProfilerSyncPointType
|
||||
public enum LogSynchronizationPoint {
|
||||
Periodic = 0,
|
||||
WorldStop = 1,
|
||||
WorldStart = 2,
|
||||
}
|
||||
}
|
||||
Loaded 100 of 882 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user