mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-18 03:51:19 -10:00
Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3e427fe0ef | ||
|
|
2d13830146 | ||
|
|
d02edc4281 | ||
|
|
ae86e67f1b | ||
|
|
e3a4ce1117 | ||
|
|
6ee3fd4e87 | ||
|
|
b95d8a65b9 | ||
|
|
8c73578428 | ||
|
|
cceaabac62 | ||
|
|
693da9b0bb | ||
|
|
04f55b81b2 | ||
|
|
dbd7eedb92 | ||
|
|
2007e2b9c4 | ||
|
|
552554e9f2 | ||
|
|
5f0b43c260 | ||
|
|
335769d7f1 | ||
|
|
265ec9665d | ||
|
|
dd390c5e03 | ||
|
|
e33b302618 |
No files matched your search
@@ -64,6 +64,13 @@ For comments, corrections and updates, please contact [email protected]
|
||||
the terms of the MIT X11, this means that this code can be
|
||||
used for any purposes by anyone.
|
||||
|
||||
** mono/metadata/sgen*: Mono's Copying Collector
|
||||
|
||||
This new garbage collector is licensed under the terms of
|
||||
the MIT X11 license, in hopes that the GC could be reused
|
||||
by third party projects, follows the same spirit than the
|
||||
Boehm GC.
|
||||
|
||||
** mono/arch/*/XXX-codegen.h
|
||||
|
||||
This are C macros that are useful when generating native
|
||||
|
||||
+2
-6
@@ -3,24 +3,20 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
|
||||
if CROSS_COMPILING
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
|
||||
# Keep in sync with SUBDIRS
|
||||
## 'tools' is not normally built
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
|
||||
else
|
||||
if ONLY_MONOTOUCH
|
||||
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
|
||||
else
|
||||
if ONLY_XAMMAC
|
||||
SUBDIRS = $(libgc_dir) eglib/src mono runtime
|
||||
else
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
|
||||
# Keep in sync with SUBDIRS
|
||||
## 'tools' is not normally built
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
all: update_submodules
|
||||
|
||||
|
||||
+5
-31
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [3.4.1],
|
||||
AC_INIT(mono, [3.2.7],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -215,9 +215,6 @@ case "$host" in
|
||||
CFLAGS="$CFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
|
||||
CXXFLAGS="$CXXFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
|
||||
|
||||
# The configure check can't detect this
|
||||
AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
|
||||
|
||||
# to bypass the underscore linker check, can't work when cross-compiling
|
||||
mono_cv_uscore=yes
|
||||
mono_cv_clang=no
|
||||
@@ -516,9 +513,6 @@ if test x"$GCC" = xyes; then
|
||||
# The runtime code does not respect ANSI C strict aliasing rules
|
||||
CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||
|
||||
# We rely on signed overflow to behave
|
||||
CFLAGS="$CFLAGS -fwrapv"
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
|
||||
AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
|
||||
@@ -955,15 +949,6 @@ if test x$has_extension_module != xno ; then
|
||||
AC_MSG_NOTICE([Enabling mono extension module.])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(gsharing, [ --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no)
|
||||
if test x$enable_gsharing = xyes; then
|
||||
AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(native-types, [ --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no)
|
||||
if test x$enable_native_types = xyes; then
|
||||
AC_DEFINE(MONO_NATIVE_TYPES,1,[native types])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for visibility __attribute__)
|
||||
AC_COMPILE_IFELSE([
|
||||
@@ -2159,7 +2144,6 @@ else
|
||||
AC_CHECK_FUNCS(GetProcessId)
|
||||
AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedIncrement64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedAdd, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedAdd64, [], [], [[#include <windows.h>]])
|
||||
@@ -2436,15 +2420,13 @@ if test "x$enable_llvm" = "xyes"; then
|
||||
# from LLVM classes.
|
||||
LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
|
||||
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
||||
# This might include empty lines
|
||||
LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
|
||||
if test "x$host" != "x$target"; then
|
||||
# No need for jit libs
|
||||
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter`
|
||||
else
|
||||
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
|
||||
fi
|
||||
LLVM_LIBS="$LLVM_LIBS $LLVM_LDFLAGS $LLVM_SYSTEM_LIBS -lstdc++"
|
||||
LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
|
||||
|
||||
expected_llvm_version="3.4svn-mono-mono/e656cac"
|
||||
|
||||
@@ -2953,9 +2935,8 @@ case "$host" in
|
||||
;;
|
||||
*-*-*linux*)
|
||||
AC_PATH_X
|
||||
dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
|
||||
AC_MSG_CHECKING(for the soname of libX11.so)
|
||||
for i in $x_libraries $dlsearch_path; do
|
||||
for i in $x_libraries /usr/lib /usr/lib64; do
|
||||
for r in 4 5 6; do
|
||||
if test -f $i/libX11.so.$r; then
|
||||
X11=libX11.so.$r
|
||||
@@ -3185,7 +3166,7 @@ AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install
|
||||
AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes])
|
||||
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
|
||||
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no,only If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no])
|
||||
AC_ARG_WITH(xammac, [ --with-xammac=yes,no,only If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no])
|
||||
AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile assemblies (defaults to no)], [], [with_mobile=no])
|
||||
|
||||
OPROFILE=no
|
||||
AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir> Enable oprofile support (defaults to no)],[
|
||||
@@ -3261,7 +3242,6 @@ if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
|
||||
with_profile4_5=no
|
||||
with_monodroid=no
|
||||
with_monotouch=no
|
||||
with_xammac=no
|
||||
fi
|
||||
|
||||
if test x$DISABLE_MCS_DOCS = xyes; then
|
||||
@@ -3285,9 +3265,8 @@ AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
|
||||
AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
|
||||
AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_MOBILE, [test "x$with_mobile" = xyes])
|
||||
AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"])
|
||||
AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"])
|
||||
|
||||
AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
|
||||
AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
|
||||
@@ -3535,7 +3514,6 @@ mono/tests/cas/inheritance/Makefile
|
||||
mono/tests/cas/linkdemand/Makefile
|
||||
mono/tests/cas/threads/Makefile
|
||||
mono/tests/gc-descriptors/Makefile
|
||||
mono/unit-tests/Makefile
|
||||
mono/benchmark/Makefile
|
||||
mono/monograph/Makefile
|
||||
mono/io-layer/Makefile
|
||||
@@ -3681,9 +3659,6 @@ fi
|
||||
if test -z "$INSTALL_MONOTOUCH_TRUE"; then :
|
||||
default_profile=monotouch
|
||||
fi
|
||||
if test -z "$INSTALL_XAMMAC_TRUE"; then :
|
||||
default_profile=xammac
|
||||
fi
|
||||
if test -z "$INSTALL_4_5_TRUE"; then :
|
||||
default_profile=net_4_5
|
||||
fi
|
||||
@@ -3735,7 +3710,6 @@ echo "
|
||||
.NET 4.5: $with_profile4_5
|
||||
MonoDroid: $with_monodroid
|
||||
MonoTouch: $with_monotouch
|
||||
Xamarin.Mac: $with_xammac
|
||||
JNI support: $jdk_headers_found
|
||||
libgdiplus: $libgdiplus_msg
|
||||
zlib: $zlib_msg
|
||||
|
||||
+3
-4
@@ -12,8 +12,7 @@ EXTRA_DIST = \
|
||||
mono.pc.in mono-2.pc.in monosgen-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
|
||||
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
|
||||
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
|
||||
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
|
||||
reactive.pc.in xbuild12.pc \
|
||||
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in reactive.pc.in \
|
||||
net_1_1/machine.config \
|
||||
gdb/mono-gdb.py \
|
||||
gdb/gdb-python.diff
|
||||
@@ -29,10 +28,10 @@ endif
|
||||
if JIT_SUPPORTED
|
||||
if INTERP_SUPPORTED
|
||||
pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE)
|
||||
else
|
||||
pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE)
|
||||
endif
|
||||
else
|
||||
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Name: AspNetWebStack
|
||||
Description: References Microsoft ASP.NET Web Stack
|
||||
Version: @VERSION@
|
||||
Libs: -r:@prefix@/lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Razor/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Deployment/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Deployment.dll
|
||||
Libs: -r:System.Web.Razor.dll -r:System.Web.Http.dll -r:System.Web.WebPages -r:System.Web.WebPages.Razor -r:System.Web.WebPages.Deployment
|
||||
@@ -28,6 +28,4 @@
|
||||
</dllmap>
|
||||
<dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdi32" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdi32.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
</configuration>
|
||||
@@ -1,7 +0,0 @@
|
||||
bindir=${pcfiledir}/../mono/xbuild/12.0/bin
|
||||
|
||||
Name: XBuild 12.0
|
||||
Description: XBuild/MSBuild 12.0
|
||||
Version: 12.0
|
||||
Libs: -r:${bindir}/Microsoft.Build.Engine.dll -r:${bindir}/Microsoft.Build.Framework.dll -r:${bindir}/Microsoft.Build.Tasks.v12.0.dll -r:${bindir}/Microsoft.Build.Utilities.v12.0.dll -r:${bindir}/Microsoft.Build.dll
|
||||
|
||||
@@ -87,12 +87,10 @@ g_unsetenv(const gchar *variable)
|
||||
gchar*
|
||||
g_win32_getlocale(void)
|
||||
{
|
||||
LCID lcid = GetThreadLocale();
|
||||
gchar buf[19];
|
||||
gint ccBuf = GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buf, 9);
|
||||
buf[ccBuf - 1] = '-';
|
||||
ccBuf += GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, buf + ccBuf, 9);
|
||||
return strdup(buf);
|
||||
/* FIXME: Use GetThreadLocale
|
||||
* and convert LCID to standard
|
||||
* string form, "en_US" */
|
||||
return strdup ("en_US");
|
||||
}
|
||||
|
||||
gboolean
|
||||
|
||||
+2
-3
@@ -216,8 +216,8 @@ cont:
|
||||
gchar *
|
||||
g_find_program_in_path (const gchar *program)
|
||||
{
|
||||
char *p;
|
||||
char *x, *l;
|
||||
char *p = g_strdup (g_getenv ("PATH"));
|
||||
char *x = p, *l;
|
||||
gchar *curdir = NULL;
|
||||
char *save = NULL;
|
||||
#ifdef G_OS_WIN32
|
||||
@@ -228,7 +228,6 @@ g_find_program_in_path (const gchar *program)
|
||||
#endif
|
||||
|
||||
g_return_val_if_fail (program != NULL, NULL);
|
||||
x = p = g_strdup (g_getenv ("PATH"));
|
||||
|
||||
if (x == NULL || *x == '\0') {
|
||||
curdir = g_get_current_dir ();
|
||||
|
||||
Vendored
+1
-1
Submodule external/rx updated: 00c1aadf14...17e8477b2c.
@@ -580,7 +580,6 @@ void GC_stop_world()
|
||||
|
||||
if (GC_notify_event)
|
||||
GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
|
||||
GC_process_togglerefs ();
|
||||
|
||||
# if DEBUG_THREADS
|
||||
GC_printf1("Stopping the world from 0x%lx\n", mach_thread_self());
|
||||
|
||||
+1
-162
@@ -307,163 +307,6 @@ out:
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* toggleref support */
|
||||
typedef struct {
|
||||
GC_PTR strong_ref;
|
||||
GC_hidden_pointer weak_ref;
|
||||
} GCToggleRef;
|
||||
|
||||
static int (*GC_toggleref_callback) (GC_PTR obj);
|
||||
static GCToggleRef *GC_toggleref_array;
|
||||
static int GC_toggleref_array_size;
|
||||
static int GC_toggleref_array_capacity;
|
||||
|
||||
|
||||
void
|
||||
GC_process_togglerefs (void)
|
||||
{
|
||||
int i, w;
|
||||
int toggle_ref_counts [3] = { 0, 0, 0 };
|
||||
|
||||
for (i = w = 0; i < GC_toggleref_array_size; ++i) {
|
||||
int res;
|
||||
GCToggleRef r = GC_toggleref_array [i];
|
||||
|
||||
GC_PTR obj;
|
||||
|
||||
if (r.strong_ref)
|
||||
obj = r.strong_ref;
|
||||
else if (r.weak_ref)
|
||||
obj = REVEAL_POINTER (r.weak_ref);
|
||||
else
|
||||
continue;
|
||||
|
||||
res = GC_toggleref_callback (obj);
|
||||
++toggle_ref_counts [res];
|
||||
switch (res) {
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
GC_toggleref_array [w].strong_ref = obj;
|
||||
GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
|
||||
++w;
|
||||
break;
|
||||
case 2:
|
||||
GC_toggleref_array [w].strong_ref = NULL;
|
||||
GC_toggleref_array [w].weak_ref = HIDE_POINTER (obj);
|
||||
++w;
|
||||
break;
|
||||
default:
|
||||
ABORT("Invalid callback result");
|
||||
}
|
||||
}
|
||||
|
||||
for (i = w; i < GC_toggleref_array_size; ++i) {
|
||||
GC_toggleref_array [w].strong_ref = NULL;
|
||||
GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
|
||||
}
|
||||
|
||||
GC_toggleref_array_size = w;
|
||||
}
|
||||
|
||||
|
||||
static void push_and_mark_object (GC_PTR p)
|
||||
{
|
||||
hdr * hhdr = HDR(p);
|
||||
|
||||
PUSH_OBJ((word *)p, hhdr, GC_mark_stack_top,
|
||||
&(GC_mark_stack[GC_mark_stack_size]));
|
||||
|
||||
while (!GC_mark_stack_empty()) MARK_FROM_MARK_STACK();
|
||||
GC_set_mark_bit (p);
|
||||
if (GC_mark_state != MS_NONE)
|
||||
while (!GC_mark_some((ptr_t)0)) {}
|
||||
}
|
||||
|
||||
static void GC_mark_togglerefs ()
|
||||
{
|
||||
int i;
|
||||
if (!GC_toggleref_array)
|
||||
return;
|
||||
|
||||
GC_set_mark_bit ((GC_PTR)GC_toggleref_array);
|
||||
for (i = 0; i < GC_toggleref_array_size; ++i) {
|
||||
if (GC_toggleref_array [i].strong_ref) {
|
||||
GC_PTR object = GC_toggleref_array [i].strong_ref;
|
||||
|
||||
push_and_mark_object (object);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void GC_clear_togglerefs ()
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < GC_toggleref_array_size; ++i) {
|
||||
if (GC_toggleref_array [i].weak_ref) {
|
||||
GC_PTR object = REVEAL_POINTER (GC_toggleref_array [i].weak_ref);
|
||||
|
||||
if (!GC_is_marked (object)) {
|
||||
GC_toggleref_array [i].weak_ref = (GC_hidden_pointer)NULL; /* We defer compaction to only happen on the callback step. */
|
||||
} else {
|
||||
/*No need to copy, boehm is non-moving */
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void GC_toggleref_register_callback(int (*proccess_toggleref) (GC_PTR obj))
|
||||
{
|
||||
GC_toggleref_callback = proccess_toggleref;
|
||||
}
|
||||
|
||||
static void
|
||||
ensure_toggleref_capacity (int capacity)
|
||||
{
|
||||
if (!GC_toggleref_array) {
|
||||
GC_toggleref_array_capacity = 32;
|
||||
GC_toggleref_array = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
}
|
||||
if (GC_toggleref_array_size + capacity >= GC_toggleref_array_capacity) {
|
||||
GCToggleRef *tmp;
|
||||
int old_capacity = GC_toggleref_array_capacity;
|
||||
while (GC_toggleref_array_capacity < GC_toggleref_array_size + capacity)
|
||||
GC_toggleref_array_capacity *= 2;
|
||||
|
||||
tmp = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
memcpy (tmp, GC_toggleref_array, GC_toggleref_array_size * sizeof (GCToggleRef));
|
||||
GC_INTERNAL_FREE (GC_toggleref_array);
|
||||
GC_toggleref_array = tmp;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
GC_toggleref_add (GC_PTR object, int strong_ref)
|
||||
{
|
||||
DCL_LOCK_STATE;
|
||||
# ifdef THREADS
|
||||
DISABLE_SIGNALS();
|
||||
LOCK();
|
||||
# endif
|
||||
|
||||
if (!GC_toggleref_callback)
|
||||
goto end;
|
||||
|
||||
ensure_toggleref_capacity (1);
|
||||
GC_toggleref_array [GC_toggleref_array_size].strong_ref = strong_ref ? object : NULL;
|
||||
GC_toggleref_array [GC_toggleref_array_size].weak_ref = strong_ref ? (GC_hidden_pointer)NULL : HIDE_POINTER (object);
|
||||
++GC_toggleref_array_size;
|
||||
|
||||
end:
|
||||
# ifdef THREADS
|
||||
UNLOCK();
|
||||
ENABLE_SIGNALS();
|
||||
# endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
# if defined(__STDC__) || defined(__cplusplus)
|
||||
int GC_register_long_link(GC_PTR * link, GC_PTR obj)
|
||||
@@ -836,9 +679,7 @@ void GC_finalize()
|
||||
ptr_t real_ptr;
|
||||
register int i;
|
||||
int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
|
||||
|
||||
GC_mark_togglerefs();
|
||||
|
||||
|
||||
/* Make non-tracking disappearing links disappear */
|
||||
GC_make_disappearing_links_disappear(&GC_dl_hashtbl);
|
||||
|
||||
@@ -914,8 +755,6 @@ void GC_finalize()
|
||||
/* Remove dangling disappearing links. */
|
||||
GC_remove_dangling_disappearing_links(&GC_dl_hashtbl);
|
||||
|
||||
GC_clear_togglerefs ();
|
||||
|
||||
/* Make long links disappear and remove dangling ones. */
|
||||
GC_make_disappearing_links_disappear(&GC_ll_hashtbl);
|
||||
GC_remove_dangling_disappearing_links(&GC_ll_hashtbl);
|
||||
|
||||
@@ -769,11 +769,6 @@ GC_API int GC_unregister_disappearing_link GC_PROTO((GC_PTR * /* link */));
|
||||
GC_API int GC_register_long_link GC_PROTO((GC_PTR * /* link */, GC_PTR obj));
|
||||
GC_API int GC_unregister_long_link GC_PROTO((GC_PTR * /* link */));
|
||||
|
||||
|
||||
/* toggleref support */
|
||||
GC_API void GC_toggleref_register_callback GC_PROTO((int (*proccess_toggleref) (GC_PTR obj)));
|
||||
GC_API void GC_toggleref_add (GC_PTR object, int strong_ref);
|
||||
|
||||
/* Returns !=0 if GC_invoke_finalizers has something to do. */
|
||||
GC_API int GC_should_invoke_finalizers GC_PROTO((void));
|
||||
|
||||
|
||||
@@ -1688,9 +1688,6 @@ void GC_finalize GC_PROTO((void));
|
||||
/* for processing by GC_invoke_finalizers. */
|
||||
/* Invoked with lock. */
|
||||
|
||||
void GC_process_togglerefs (void);
|
||||
/*Process the togglerefs before GC starts */
|
||||
|
||||
void GC_notify_or_invoke_finalizers GC_PROTO((void));
|
||||
/* If GC_finalize_on_demand is not set, invoke */
|
||||
/* eligible finalizers. Otherwise: */
|
||||
|
||||
@@ -611,7 +611,6 @@ void GC_stop_world()
|
||||
{
|
||||
if (GC_notify_event)
|
||||
GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
|
||||
GC_process_togglerefs ();
|
||||
/* Make sure all free list construction has stopped before we start. */
|
||||
/* No new construction can start, since free list construction is */
|
||||
/* required to acquire and release the GC lock before it starts, */
|
||||
|
||||
+3
-9
@@ -1417,9 +1417,9 @@ small embedded systems.
|
||||
The default is 180 seconds.
|
||||
.TP
|
||||
\fBMONO_THREADS_PER_CPU\fR
|
||||
The minimum number of threads in the general threadpool will be
|
||||
MONO_THREADS_PER_CPU * number of CPUs. The default value for this
|
||||
variable is 1.
|
||||
The maximum number of threads in the general threadpool will be
|
||||
20 + (MONO_THREADS_PER_CPU * number of CPUs). The default value for this
|
||||
variable is 10.
|
||||
.TP
|
||||
\fBMONO_XMLSERIALIZER_THS\fR
|
||||
Controls the threshold for the XmlSerializer to produce a custom
|
||||
@@ -1638,12 +1638,6 @@ method.
|
||||
\fBMONO_VERBOSE_HWCAP\fR
|
||||
If set, makes the JIT output information about detected CPU features
|
||||
(such as SSE, CMOV, FCMOV, etc) to stdout.
|
||||
.TP
|
||||
\fBMONO_CONSERVATIVE_HWCAP\fR
|
||||
If set, the JIT will not perform any hardware capability detection. This
|
||||
may be useful to pinpoint the cause of JIT issues. This is the default
|
||||
when Mono is built as an AOT cross compiler, so that the generated code
|
||||
will run on most hardware.
|
||||
.SH VALGRIND
|
||||
If you want to use Valgrind, you will find the file `mono.supp'
|
||||
useful, it contains the suppressions for the GC which trigger
|
||||
|
||||
+1
-5
@@ -10,12 +10,10 @@ net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
|
||||
monodroid_SUBDIRS := build class
|
||||
monotouch_SUBDIRS := build class
|
||||
monotouch_runtime_SUBDIRS := build class
|
||||
xammac_SUBDIRS := build class
|
||||
mobile_SUBDIRS := build class
|
||||
net_3_5_SUBDIRS := build class tools/xbuild
|
||||
net_4_0_SUBDIRS := build class
|
||||
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
|
||||
xbuild_12_SUBDIRS := build class tools/xbuild
|
||||
|
||||
# List of test subdirs that should pass 100%
|
||||
centum_tests := \
|
||||
@@ -87,7 +85,7 @@ dir-check:
|
||||
|
||||
# fun specialty targets
|
||||
|
||||
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12
|
||||
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5
|
||||
|
||||
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
|
||||
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
|
||||
@@ -106,14 +104,12 @@ profiles-do--run-test:
|
||||
|
||||
# Orchestrate the bootstrap here.
|
||||
_boot_ = all clean install
|
||||
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
|
||||
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--%
|
||||
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
|
||||
|
||||
+1
-2
@@ -21,8 +21,7 @@ PROFILES = \
|
||||
net_2_0 \
|
||||
net_3_5 \
|
||||
net_4_0 \
|
||||
net_4_5 \
|
||||
xbuild_12
|
||||
net_4_5
|
||||
|
||||
COMMON_SRCS = \
|
||||
Consts.cs.in \
|
||||
|
||||
@@ -119,7 +119,6 @@ static class Consts
|
||||
public const string WindowsBase_3_0 = "WindowsBase, Version=3.0.0.0, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyWindowsBase = "WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyPresentationCore_3_5 = "PresentationCore, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyPresentationCore_4_0 = "PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyPresentationFramework_3_5 = "PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
#elif NET_2_1
|
||||
|
||||
@@ -12,7 +12,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MOBILE_DYNAMIC -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
NO_TEST = yes
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
|
||||
@@ -13,4 +13,3 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.0
|
||||
XBUILD_VERSION = 2.0
|
||||
@@ -13,7 +13,6 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 3.5
|
||||
XBUILD_VERSION = 3.5
|
||||
|
||||
TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
|
||||
TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
|
||||
|
||||
@@ -14,6 +14,5 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
|
||||
|
||||
FRAMEWORK_VERSION = 4.0
|
||||
XBUILD_VERSION = 4.0
|
||||
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
|
||||
@@ -14,4 +14,3 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
XBUILD_VERSION = 4.0
|
||||
@@ -1,32 +0,0 @@
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
|
||||
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
|
||||
|
||||
# Use system resgen as we don't want local System.Windows.Forms dependency
|
||||
RESGEN = resgen2
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MOBILE \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:XAMMAC \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
-lib:$(topdir)/class/lib/$(PROFILE) \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
@@ -1,7 +0,0 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
include $(topdir)/build/profiles/net_4_5.make
|
||||
|
||||
PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -lib:$(topdir)/class/lib/net_4_5
|
||||
|
||||
XBUILD_VERSION = 12.0
|
||||
@@ -3,13 +3,13 @@ MCS_BUILD_DIR = ../../build
|
||||
thisdir = class/Facades
|
||||
|
||||
monotouch_SUBDIRS = System.Collections.Concurrent System.Collections System.ComponentModel.Annotations System.ComponentModel.EventBasedAsync System.ComponentModel \
|
||||
System.Diagnostics.Contracts System.Diagnostics.Debug System.Diagnostics.Tracing System.Diagnostics.Tools System.Dynamic.Runtime System.Globalization System.IO System.Linq.Expressions \
|
||||
System.Diagnostics.Contracts System.Diagnostics.Debug System.Diagnostics.Tools System.Dynamic.Runtime System.Globalization System.IO System.Linq.Expressions \
|
||||
System.Linq.Parallel System.Linq.Queryable System.Linq System.Net.NetworkInformation System.Net.Primitives System.Net.Requests System.ObjectModel \
|
||||
System.Reflection.Extensions System.Reflection.Primitives System.Reflection System.Resources.ResourceManager System.Runtime.Extensions \
|
||||
System.Runtime.InteropServices System.Runtime.InteropServices.WindowsRuntime System.Runtime.Numerics System.Runtime.Serialization.Json \
|
||||
System.Runtime.Serialization.Primitives System.Runtime.Serialization.Xml System.Runtime System.Security.Principal System.ServiceModel.Http \
|
||||
System.ServiceModel.Primitives System.Text.Encoding.Extensions System.Text.Encoding System.Text.RegularExpressions System.Threading.Tasks.Parallel \
|
||||
System.Threading.Tasks System.Threading.Timer System.Threading System.Xml.ReaderWriter System.Xml.XDocument System.Xml.XmlSerializer
|
||||
System.Threading.Tasks System.Threading System.Xml.ReaderWriter System.Xml.XDocument System.Xml.XmlSerializer
|
||||
|
||||
mobile_static_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
|
||||
@@ -17,8 +17,6 @@ net_4_5_SUBDIRS = $(monotouch_SUBDIRS) System.Reflection.Emit.ILGeneration Syste
|
||||
|
||||
monodroid_SUBDIRS = $(net_4_5_SUBDIRS)
|
||||
|
||||
xammac_SUBDIRS = $(net_4_5_SUBDIRS)
|
||||
|
||||
SUBDIRS = $(net_4_5_SUBDIRS)
|
||||
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
@@ -26,8 +24,3 @@ include $(MCS_BUILD_DIR)/rules.make
|
||||
dist-local: dist-default
|
||||
|
||||
|
||||
doc-update-local:
|
||||
@echo "not doing docs"
|
||||
|
||||
doc-update-recursive:
|
||||
@echo "do not recurse the Facades folder"
|
||||
@@ -1,41 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyTitle ("System.Diagnostics.Tracing.dll")]
|
||||
[assembly: AssemblyDescription ("System.Diagnostics.Tracing.dll")]
|
||||
[assembly: AssemblyDefaultAlias ("System.Diagnostics.Tracing.dll")]
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../../msfinal.pub")]
|
||||
|
||||
[assembly: ReferenceAssembly]
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
MCS_BUILD_DIR = ../../../build
|
||||
|
||||
thisdir = class/Facades/System.Diagnostics.Tracing
|
||||
SUBDIRS =
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
|
||||
LIBRARY_SUBDIR = Facades
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.Diagnostics.Tracing.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
include $(MCS_BUILD_DIR)/library.make
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCommand))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCommandEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventKeywords))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventLevel))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventListener))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventOpcode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSource))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSourceAttribute))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventSourceException))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventTask))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventWrittenEventArgs))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.NonEventAttribute))]
|
||||
@@ -19,7 +19,7 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
#if !FULL_AOT_RUNTIME
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Dynamic.BinaryOperationBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Dynamic.BindingRestrictions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Dynamic.CallInfo))]
|
||||
@@ -41,10 +41,11 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Dynamic.SetMemberBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Dynamic.UnaryOperationBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.DynamicExpression))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.DynamicExpressionVisitor))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallSite))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallSite<>))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallSiteBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.CallSiteHelpers))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DynamicAttribute))]
|
||||
#endif
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConditionalWeakTable<,>))]
|
||||
@@ -20,6 +20,7 @@
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
#if !FULL_AOT_RUNTIME
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.BlockExpression))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.CatchBlock))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.DebugInfoExpression))]
|
||||
@@ -35,6 +36,7 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.SwitchExpression))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.SymbolDocumentInfo))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.TryExpression))]
|
||||
#endif
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.BinaryExpression))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ConditionalExpression))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.Expressions.ConstantExpression))]
|
||||
|
||||
@@ -20,7 +20,9 @@
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
#if !MONOTOUCH
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.ObjectModel.ReadOnlyDictionary<,>))]
|
||||
#endif
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.ObjectModel.KeyedCollection<,>))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.ObjectModel.ObservableCollection<>))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Collections.ObjectModel.ReadOnlyObservableCollection<>))]
|
||||
|
||||
@@ -40,40 +40,26 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.COMException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComMemberType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComSourceInterfacesAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CriticalHandle))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CurrencyWrapper))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CustomQueryInterfaceMode))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CustomQueryInterfaceResult))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DefaultCharSetAttribute))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DefaultDllImportSearchPathsAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DefaultParameterValueAttribute))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DispatchWrapper))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DispIdAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DllImportAttribute))]
|
||||
//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DllImportSearchPath))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GCHandle))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GCHandleType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GuidAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.HandleCollector))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ICustomAdapter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.InAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.InterfaceTypeAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.InvalidComObjectException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.InvalidOleVariantTypeException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.Marshal))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.MarshalAsAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.MarshalDirectiveException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.OptionalAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.PreserveSigAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SafeArrayRankMismatchException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SafeArrayTypeMismatchException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SafeBuffer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SafeHandle))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SEHException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.TypeIdentifierAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.UnknownWrapper))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.UnmanagedFunctionPointerAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.UnmanagedType))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.VarEnum))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.VariantWrapper))]
|
||||
|
||||
@@ -212,7 +212,6 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.TypeForwardedToAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.UnsafeValueTypeAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.ExceptionServices.ExceptionDispatchInfo))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.GCLargeObjectHeapCompactionMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.GCLatencyMode))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.GCSettings))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CharSet))]
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyTitle ("System.Threading.Timer.dll")]
|
||||
[assembly: AssemblyDescription ("System.Threading.Timer.dll")]
|
||||
[assembly: AssemblyDefaultAlias ("System.Threading.Timer.dll")]
|
||||
[assembly: AssemblyCompany ("Xamarin, Inc.")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../../msfinal.pub")]
|
||||
|
||||
[assembly: ReferenceAssembly]
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
MCS_BUILD_DIR = ../../../build
|
||||
|
||||
thisdir = class/Facades/System.Threading.Timer
|
||||
SUBDIRS =
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
|
||||
LIBRARY_SUBDIR = Facades
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.Threading.Timer.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
include $(MCS_BUILD_DIR)/library.make
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Timer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.TimerCallback))]
|
||||
|
||||
@@ -138,7 +138,7 @@ namespace Mainsoft.Web.Security
|
||||
if (returnValue == 0)
|
||||
return true;
|
||||
if (returnValue == 2)
|
||||
return false; //role does not exist
|
||||
return false; //role does not exists
|
||||
else if (returnValue == 3 && throwOnPopulatedRole)
|
||||
throw new ProviderException (rolename + " is not empty");
|
||||
else
|
||||
|
||||
+19
-33
@@ -88,6 +88,10 @@ common_dirs := \
|
||||
SystemWebTestShim
|
||||
|
||||
net_2_0_dirs := \
|
||||
Microsoft.Build.Framework \
|
||||
Microsoft.Build.Utilities \
|
||||
Microsoft.Build.Engine \
|
||||
Microsoft.Build.Tasks \
|
||||
System.Xml.Linq \
|
||||
System.Runtime.Serialization \
|
||||
System.Data.DataSetExtensions \
|
||||
@@ -110,6 +114,7 @@ net_2_0_dirs := \
|
||||
Mono.Tasklets \
|
||||
System.Dynamic \
|
||||
Mono.CSharp \
|
||||
Moonlight.Build.Tasks \
|
||||
System.Net \
|
||||
System.Json
|
||||
|
||||
@@ -161,24 +166,19 @@ monodroid_dirs := \
|
||||
Microsoft.CSharp \
|
||||
System.Net.Http
|
||||
|
||||
xammac_dirs := \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
Mono.CSharp \
|
||||
Microsoft.CSharp \
|
||||
System.Net.Http
|
||||
|
||||
monotouch_runtime_dirs := \
|
||||
corlib
|
||||
|
||||
monotouch_dirs := \
|
||||
Mono.CSharp \
|
||||
Microsoft.CSharp \
|
||||
Mono.Dynamic.Interpreter \
|
||||
System.Core
|
||||
net_3_5_only_dirs := \
|
||||
Microsoft.Build.Framework \
|
||||
Microsoft.Build.Utilities \
|
||||
Microsoft.Build.Engine \
|
||||
Microsoft.Build.Tasks
|
||||
|
||||
net_4_0_dirs := \
|
||||
System.Numerics \
|
||||
Microsoft.CSharp \
|
||||
Microsoft.Build \
|
||||
System.Windows.Forms.DataVisualization \
|
||||
System.Xaml \
|
||||
WindowsBase \
|
||||
@@ -197,7 +197,6 @@ net_4_0_dirs := \
|
||||
System.Reactive.Runtime.Remoting \
|
||||
System.Reactive.Windows.Forms \
|
||||
System.Reactive.Windows.Threading \
|
||||
System.Reactive.Observable.Aliases \
|
||||
System.Reactive.Experimental \
|
||||
System.Reactive.Debugger \
|
||||
Microsoft.Web.Infrastructure \
|
||||
@@ -233,35 +232,22 @@ net_4_5_dirs := \
|
||||
System.Windows \
|
||||
System.Xml.Serialization \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
xbuild_2_0_dirs := \
|
||||
Microsoft.Build.Framework \
|
||||
Microsoft.Build.Utilities \
|
||||
Microsoft.Build.Engine \
|
||||
Mono.XBuild.Tasks \
|
||||
Microsoft.Build.Tasks
|
||||
|
||||
xbuild_4_0_dirs := \
|
||||
$(xbuild_2_0_dirs) \
|
||||
Microsoft.Build
|
||||
|
||||
net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
|
||||
|
||||
net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler
|
||||
monodroid_SUBDIRS := $(mobile_dirs) $(monodroid_dirs)
|
||||
monotouch_SUBDIRS := $(mobile_dirs) $(monotouch_dirs)
|
||||
monotouch_SUBDIRS := $(mobile_dirs)
|
||||
monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
|
||||
mobile_static_SUBDIRS := $(mobile_dirs)
|
||||
mobile_SUBDIRS := $(mobile_dirs)
|
||||
xammac_SUBDIRS := $(mobile_dirs) $(xammac_dirs)
|
||||
net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
|
||||
net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
|
||||
net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
|
||||
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
|
||||
net_3_5_SUBDIRS := $(net_3_5_only_dirs)
|
||||
net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs)
|
||||
net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) aot-compiler
|
||||
|
||||
include ../build/rules.make
|
||||
|
||||
SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_dirs) $(monotouch_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
|
||||
SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_3_5_only_dirs) $(mobile_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
|
||||
|
||||
DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
|
||||
DIST_ONLY_SUBDIRS = dlr aot-compiler
|
||||
|
||||
# No new makefiles for: System.Messaging, System.Web.Mobile,
|
||||
# System.ServiceProcess
|
||||
|
||||
@@ -1978,12 +1978,10 @@ namespace System.Windows.Forms {
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (owned_forms != null) {
|
||||
for (int i = 0; i < owned_forms.Count; i++)
|
||||
((Form)owned_forms[i]).Owner = null;
|
||||
for (int i = 0; i < owned_forms.Count; i++)
|
||||
((Form)owned_forms[i]).Owner = null;
|
||||
|
||||
owned_forms.Clear ();
|
||||
}
|
||||
owned_forms.Clear ();
|
||||
Owner = null;
|
||||
base.Dispose (disposing);
|
||||
|
||||
|
||||
@@ -2444,8 +2444,6 @@ namespace System.Windows.Forms {
|
||||
|
||||
if (selection_visible == false) {
|
||||
SetSelectionToCaret (true);
|
||||
move_sel_start = false;
|
||||
move_sel_end = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -958,7 +958,7 @@ namespace System.Windows.Forms
|
||||
image = null;
|
||||
}
|
||||
|
||||
if (owner != null && disposing)
|
||||
if (owner != null)
|
||||
owner.Items.Remove (this);
|
||||
|
||||
base.Dispose (disposing);
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
/Test/resources/*.proj
|
||||
@@ -44,9 +44,9 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyCompany (Consts.MonoCompany)]
|
||||
[assembly: AssemblyProduct (Consts.MonoProduct)]
|
||||
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
|
||||
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: SatelliteContractVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
|
||||
|
||||
[assembly: NeutralResourcesLanguage ("en-US")]
|
||||
|
||||
@@ -55,5 +55,5 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile("../msfinal.pub")]
|
||||
|
||||
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
|
||||
@@ -2,38 +2,64 @@ thisdir = class/Microsoft.Build.Engine
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
XBUILD_DIR=$(topdir)/tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.Engine.dll
|
||||
|
||||
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
|
||||
|
||||
ifeq (3.5, $(FRAMEWORK_VERSION))
|
||||
NAME_SUFFIX = .v3.5
|
||||
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
|
||||
else
|
||||
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
|
||||
NAME_SUFFIX = .v4.0
|
||||
endif
|
||||
endif
|
||||
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
/r:System.Core.dll \
|
||||
/r:System.Xml.dll \
|
||||
/r:$(XBUILD_FRAMEWORK) \
|
||||
/r:$(XBUILD_UTILITIES)
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
/r:System.Core.dll \
|
||||
/r:System.Xml.dll \
|
||||
/r:$(BUILD_FRAMEWORK) \
|
||||
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
|
||||
|
||||
TEST_MCS_FLAGS = \
|
||||
/r:$(XBUILD_FRAMEWORK) \
|
||||
/r:$(XBUILD_UTILITIES) \
|
||||
/r:$(BUILD_FRAMEWORK) \
|
||||
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
|
||||
/r:System.Xml.dll
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
Test/resources/TestTasks.cs \
|
||||
Test/resources/*.*proj \
|
||||
Test/resources/*.csproj
|
||||
Test/resources/*.csproj \
|
||||
Test/test-config-file*
|
||||
|
||||
Test/resources/TestTasks.dll: Test/resources/TestTasks.cs
|
||||
$(CSCOMPILE) Test/resources/TestTasks.cs /r:$(XBUILD_FRAMEWORK) /r:$(XBUILD_UTILITIES) /target:library
|
||||
$(CSCOMPILE) Test/resources/TestTasks.cs /r:Microsoft.Build.Framework.dll /r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll /target:library
|
||||
|
||||
clean-test-resources:
|
||||
clean-local: clean-test-tasks
|
||||
|
||||
clean-test-tasks:
|
||||
rm -f Test/resources/TestTasks.dll
|
||||
|
||||
test-local: copy-config
|
||||
|
||||
ifeq (net_4_0, $(PROFILE))
|
||||
copy-config:
|
||||
cp Test/test-config-file-net-4.0 $(test_lib).config
|
||||
else
|
||||
ifeq (net_3_5, $(PROFILE))
|
||||
copy-config:
|
||||
cp Test/test-config-file-net-3.5 $(test_lib).config
|
||||
else
|
||||
copy-config:
|
||||
endif
|
||||
endif
|
||||
|
||||
export TESTING_MONO=a
|
||||
XBUILD_DIR=../../tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild_targets.make
|
||||
|
||||
test-local: Test/resources/TestTasks.dll
|
||||
|
||||
clean-local: clean-test-resources
|
||||
|
||||
include $(XBUILD_DIR)/xbuild_test.make
|
||||
include ../../build/library.make
|
||||
@@ -167,7 +167,9 @@ namespace Microsoft.Build.BuildEngine {
|
||||
{
|
||||
if (ReservedNameUtils.IsReservedMetadataName (metadataName)) {
|
||||
string metadata = ReservedNameUtils.GetReservedMetadata (FinalItemSpec, metadataName, evaluatedMetadata);
|
||||
return MSBuildUtils.Unescape (metadata);
|
||||
return string.Equals (metadataName, "fullpath", StringComparison.OrdinalIgnoreCase)
|
||||
? MSBuildUtils.Escape (metadata)
|
||||
: metadata;
|
||||
}
|
||||
|
||||
if (evaluatedMetadata.Contains (metadataName))
|
||||
@@ -179,7 +181,10 @@ namespace Microsoft.Build.BuildEngine {
|
||||
public string GetMetadata (string metadataName)
|
||||
{
|
||||
if (ReservedNameUtils.IsReservedMetadataName (metadataName)) {
|
||||
return ReservedNameUtils.GetReservedMetadata (FinalItemSpec, metadataName, unevaluatedMetadata);
|
||||
string metadata = ReservedNameUtils.GetReservedMetadata (FinalItemSpec, metadataName, unevaluatedMetadata);
|
||||
return string.Equals (metadataName, "fullpath", StringComparison.OrdinalIgnoreCase)
|
||||
? MSBuildUtils.Escape (metadata)
|
||||
: metadata;
|
||||
} else if (unevaluatedMetadata.Contains (metadataName))
|
||||
return (string) unevaluatedMetadata [metadataName];
|
||||
else
|
||||
|
||||
-3
@@ -103,9 +103,6 @@ namespace Microsoft.Build.BuildEngine {
|
||||
// FIXME imported projects
|
||||
static bool Exists (string file, Project context)
|
||||
{
|
||||
if (string.IsNullOrEmpty (file))
|
||||
return false;
|
||||
|
||||
string directory = null;
|
||||
|
||||
if (context.FullFileName != String.Empty)
|
||||
|
||||
@@ -118,8 +118,10 @@ namespace Microsoft.Build.BuildEngine {
|
||||
Toolsets.Add (new Toolset ("4.0",
|
||||
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40)));
|
||||
#endif
|
||||
#if XBUILD_12
|
||||
Toolsets.Add (new Toolset ("12.0", ToolLocationHelper.GetPathToBuildTools ("12.0")));
|
||||
#if NET_4_5
|
||||
Toolsets.Add (new Toolset("12.0",
|
||||
ToolLocationHelper.GetMSBuildInstallPath ("12.0"),
|
||||
ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40)));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ using System.Text;
|
||||
using System.Xml;
|
||||
using System.Xml.Schema;
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
using Mono.XBuild.Framework;
|
||||
using Mono.XBuild.CommandLine;
|
||||
|
||||
@@ -1033,13 +1032,13 @@ namespace Microsoft.Build.BuildEngine {
|
||||
SetExtensionsPathProperties (DefaultExtensionsPath);
|
||||
evaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectDefaultTargets", DefaultTargets, PropertyType.Reserved));
|
||||
evaluatedProperties.AddProperty (new BuildProperty ("OS", OS, PropertyType.Environment));
|
||||
#if XBUILD_12
|
||||
#if NET_4_5
|
||||
// see http://msdn.microsoft.com/en-us/library/vstudio/hh162058(v=vs.120).aspx
|
||||
if (effective_tools_version == "12.0") {
|
||||
evaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsPath32", toolsPath, PropertyType.Reserved));
|
||||
|
||||
var frameworkToolsPath = ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version451);
|
||||
|
||||
string frameworkToolsPath = parentEngine.Toolsets [effective_tools_version].FrameworkToolsPath;
|
||||
if (frameworkToolsPath == null)
|
||||
throw new Exception (String.Format ("Invalid tools version '{0}', no framework tools path set for this.", effective_tools_version));
|
||||
evaluatedProperties.AddProperty (new BuildProperty ("MSBuildFrameworkToolsPath", frameworkToolsPath, PropertyType.Reserved));
|
||||
evaluatedProperties.AddProperty (new BuildProperty ("MSBuildFrameworkToolsPath32", frameworkToolsPath, PropertyType.Reserved));
|
||||
}
|
||||
|
||||
@@ -31,15 +31,21 @@ namespace Microsoft.Build.BuildEngine
|
||||
{
|
||||
public class Toolset
|
||||
{
|
||||
public Toolset (string toolsVersion, string toolsPath, BuildPropertyGroup buildProperties)
|
||||
public Toolset (string toolsVersion, string toolsPath, string toolsFrameworkPath, BuildPropertyGroup buildProperties)
|
||||
{
|
||||
ToolsVersion = toolsVersion;
|
||||
ToolsPath = toolsPath;
|
||||
FrameworkToolsPath = toolsFrameworkPath;
|
||||
BuildProperties = buildProperties;
|
||||
}
|
||||
|
||||
public Toolset (string toolsVersion, string toolsPath)
|
||||
: this (toolsVersion, toolsPath, null)
|
||||
public Toolset (string toolsVersion, string toolsPath, string toolsFrameworkPath)
|
||||
: this (toolsVersion, toolsPath, toolsFrameworkPath, null)
|
||||
{
|
||||
}
|
||||
|
||||
public Toolset(string toolsVersion, string toolsPath)
|
||||
: this (toolsVersion, toolsPath, toolsPath)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -47,5 +53,6 @@ namespace Microsoft.Build.BuildEngine
|
||||
|
||||
public string ToolsVersion { get; private set; }
|
||||
public string ToolsPath { get; private set; }
|
||||
public string FrameworkToolsPath { get; private set; }
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/MonoTODOAttribute.cs
|
||||
../../tools/xbuild/XBuildConsts.cs
|
||||
Assembly/AssemblyInfo.cs
|
||||
../Microsoft.Build.Framework/Mono.XBuild.Framework/AssemblyLoadInfo.cs
|
||||
../Microsoft.Build.Utilities/Mono.XBuild.Utilities/MSBuildUtils.cs
|
||||
|
||||
@@ -400,35 +400,5 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
|
||||
|
||||
Assert.AreEqual ("no", project.GetEvaluatedProperty ("Exists"), "A1");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EmptyExistsCondition()
|
||||
{
|
||||
string documentString = @"
|
||||
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
|
||||
<Choose>
|
||||
<When Condition=""Exists('$(UndefinedProperty)')"">
|
||||
<PropertyGroup>
|
||||
<Exists>yes</Exists>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<Otherwise>
|
||||
<PropertyGroup>
|
||||
<Exists>no</Exists>
|
||||
</PropertyGroup>
|
||||
</Otherwise>
|
||||
</Choose>
|
||||
</Project>
|
||||
";
|
||||
|
||||
Engine engine = new Engine (Consts.BinPath);
|
||||
Project project = engine.CreateNewProject ();
|
||||
//assign a real filename to be used as base path for the Exists
|
||||
project.FullFileName = typeof (BuildChooseTest).Assembly.Location;
|
||||
|
||||
project.LoadXml (documentString);
|
||||
|
||||
Assert.AreEqual ("no", project.GetEvaluatedProperty ("Exists"), "A1");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -284,40 +284,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
|
||||
Assert.AreEqual (String.Empty, item.GetMetadata ("AccessedTime"), "A13");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetMetadata_UnescapedItemSpec ()
|
||||
{
|
||||
string itemInclude = "a;b;c";
|
||||
string escapedItemInclude = Utilities.Escape (itemInclude);
|
||||
|
||||
item = new BuildItem ("name", itemInclude);
|
||||
Assert.IsTrue (item.GetMetadata ("FullPath").EndsWith (escapedItemInclude), "#1a");
|
||||
Assert.IsTrue (item.GetEvaluatedMetadata ("FullPath").EndsWith (itemInclude), "#1b");
|
||||
|
||||
Assert.AreEqual (itemInclude, item.GetMetadata ("FileName"), "#2b");
|
||||
Assert.AreEqual (itemInclude, item.GetEvaluatedMetadata ("FileName"), "#2b");
|
||||
|
||||
Assert.AreEqual (itemInclude, item.GetMetadata ("Identity"), "#3a");
|
||||
Assert.AreEqual (itemInclude, item.GetEvaluatedMetadata ("Identity"), "#3b");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetMetadata_EscapedItemSpec ()
|
||||
{
|
||||
string itemInclude = "a;b;c";
|
||||
string escapedItemInclude = Utilities.Escape (itemInclude);
|
||||
|
||||
item = new BuildItem ("name", escapedItemInclude);
|
||||
Assert.IsTrue (item.GetMetadata ("FullPath").EndsWith (escapedItemInclude), "#1a");
|
||||
Assert.IsTrue (item.GetEvaluatedMetadata ("FullPath").EndsWith (itemInclude), "#1b");
|
||||
|
||||
Assert.AreEqual (escapedItemInclude, item.GetMetadata ("FileName"), "#2b");
|
||||
Assert.AreEqual (itemInclude, item.GetEvaluatedMetadata ("FileName"), "#2b");
|
||||
|
||||
Assert.AreEqual (escapedItemInclude, item.GetMetadata ("Identity"), "#3a");
|
||||
Assert.AreEqual ("a;b;c", item.GetEvaluatedMetadata ("Identity"), "#3b");
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException (typeof (ArgumentNullException))]
|
||||
public void TestGetMetadata2 ()
|
||||
|
||||
@@ -38,42 +38,16 @@ public static class Consts {
|
||||
|
||||
public static string BinPath {
|
||||
get {
|
||||
if (RunningOnMono ()) {
|
||||
#if XBUILD_12
|
||||
string profile = "xbuild_12";
|
||||
#elif NET_4_5
|
||||
string profile = "net_4_5";
|
||||
#elif NET_4_0
|
||||
string profile = "net_4_0";
|
||||
#elif NET_3_5
|
||||
string profile = "net_3_5";
|
||||
#else
|
||||
string profile = "net_2_0";
|
||||
#endif
|
||||
var corlib = typeof (object).Assembly.Location;
|
||||
var lib = Path.GetDirectoryName (Path.GetDirectoryName (corlib));
|
||||
return Path.Combine (lib, profile);
|
||||
} else {
|
||||
#if XBUILD_12
|
||||
return ToolLocationHelper.GetPathToBuildTools ("12.0");
|
||||
#elif NET_4_5
|
||||
return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version45);
|
||||
#elif NET_4_0
|
||||
return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40);
|
||||
#elif NET_3_5
|
||||
return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35);
|
||||
#else
|
||||
if (RunningOnMono ())
|
||||
return "../../tools/xbuild/xbuild";
|
||||
else
|
||||
return ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static string ToolsVersionString {
|
||||
get {
|
||||
#if XBUILD_12
|
||||
return " ToolsVersion='12.0'";
|
||||
#elif NET_4_0
|
||||
#if NET_4_0
|
||||
return " ToolsVersion='4.0'";
|
||||
#elif NET_3_5
|
||||
return " ToolsVersion='3.5'";
|
||||
@@ -85,14 +59,12 @@ public static class Consts {
|
||||
|
||||
public static string GetTasksAsmPath ()
|
||||
{
|
||||
#if XBUILD_12
|
||||
return Path.Combine (BinPath, "Microsoft.Build.Tasks.v12.0.dll");
|
||||
#elif NET_4_0
|
||||
return Path.Combine (BinPath, "Microsoft.Build.Tasks.v4.0.dll");
|
||||
#if NET_4_0
|
||||
return Path.Combine (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40), "Microsoft.Build.Tasks.v4.0.dll");
|
||||
#elif NET_3_5
|
||||
return Path.Combine (BinPath, "Microsoft.Build.Tasks.v3.5.dll");
|
||||
return Path.Combine (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35), "Microsoft.Build.Tasks.v3.5.dll");
|
||||
#else
|
||||
return Path.Combine (BinPath, "Microsoft.Build.Tasks.dll");
|
||||
return Path.Combine (ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20), "Microsoft.Build.Tasks.dll");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version ="1.0"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="3.5.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="3.5.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version ="1.0"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -44,9 +44,9 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyCompany (Consts.MonoCompany)]
|
||||
[assembly: AssemblyProduct (Consts.MonoProduct)]
|
||||
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
|
||||
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: SatelliteContractVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
|
||||
|
||||
[assembly: NeutralResourcesLanguage ("en-US")]
|
||||
|
||||
@@ -56,5 +56,5 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile("../msfinal.pub")]
|
||||
|
||||
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
|
||||
@@ -2,17 +2,24 @@ thisdir = class/Microsoft.Build.Framework
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
XBUILD_DIR=$(topdir)/tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.Framework.dll
|
||||
|
||||
ifeq (1.0, $(FRAMEWORK_VERSION))
|
||||
LIBRARY_NAME = dummy-Microsoft.Build.Framework.dll
|
||||
NO_INSTALL = yes
|
||||
NO_TEST = yes
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
endif
|
||||
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
export TESTING_MONO=a
|
||||
XBUILD_DIR=../../tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild_targets.make
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
Mono.XBuild.Framework/AssemblyLoadInfo.cs
|
||||
|
||||
include ../../build/library.make
|
||||
include $(XBUILD_DIR)/xbuild_test.make
|
||||
@@ -1,6 +1,5 @@
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/MonoTODOAttribute.cs
|
||||
../../tools/xbuild/XBuildConsts.cs
|
||||
Assembly/AssemblyInfo.cs
|
||||
Microsoft.Build.Framework/AnyEventHandler.cs
|
||||
Microsoft.Build.Framework/BuildEngineResult.cs
|
||||
|
||||
+5
-47
@@ -26,16 +26,13 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Build.Framework {
|
||||
[Serializable]
|
||||
public class BuildErrorEventArgs
|
||||
#if NET_4_0
|
||||
: LazyFormattedBuildEventArgs {
|
||||
#else
|
||||
: BuildEventArgs {
|
||||
#endif
|
||||
public class BuildErrorEventArgs : BuildEventArgs {
|
||||
|
||||
string code;
|
||||
int columnNumber;
|
||||
@@ -44,10 +41,7 @@ namespace Microsoft.Build.Framework {
|
||||
string file;
|
||||
int lineNumber;
|
||||
string subcategory;
|
||||
#if NET_4_0
|
||||
string projectFile;
|
||||
#endif
|
||||
|
||||
|
||||
protected BuildErrorEventArgs ()
|
||||
{
|
||||
}
|
||||
@@ -70,35 +64,6 @@ namespace Microsoft.Build.Framework {
|
||||
this.endColumnNumber = endColumnNumber;
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public BuildErrorEventArgs (string subcategory, string code,
|
||||
string file, int lineNumber, int columnNumber,
|
||||
int endLineNumber, int endColumnNumber, string message,
|
||||
string helpKeyword, string senderName, DateTime eventTimestamp)
|
||||
: this (subcategory, code, file, lineNumber, columnNumber,
|
||||
endLineNumber, endColumnNumber, message, helpKeyword,
|
||||
senderName, eventTimestamp, new object[0])
|
||||
{
|
||||
}
|
||||
|
||||
public BuildErrorEventArgs (string subcategory, string code,
|
||||
string file, int lineNumber, int columnNumber, int endLineNumber,
|
||||
int endColumnNumber, string message, string helpKeyword,
|
||||
string senderName, DateTime eventTimestamp,
|
||||
params object[] messageArgs)
|
||||
: base (message, helpKeyword, senderName, eventTimestamp, messageArgs)
|
||||
{
|
||||
this.subcategory = subcategory;
|
||||
this.code = code;
|
||||
this.file = file;
|
||||
this.lineNumber = lineNumber;
|
||||
this.columnNumber = columnNumber;
|
||||
this.endLineNumber = endLineNumber;
|
||||
this.endColumnNumber = endColumnNumber;
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
public string Code {
|
||||
get {
|
||||
return code;
|
||||
@@ -140,14 +105,7 @@ namespace Microsoft.Build.Framework {
|
||||
return subcategory;
|
||||
}
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public string ProjectFile {
|
||||
get { return projectFile; }
|
||||
set { projectFile = value; }
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -26,6 +26,8 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
@@ -39,9 +41,7 @@ namespace Microsoft.Build.Framework
|
||||
string senderName;
|
||||
int threadId;
|
||||
DateTime timestamp;
|
||||
#if NET_3_5
|
||||
BuildEventContext context;
|
||||
#endif
|
||||
|
||||
protected BuildEventArgs ()
|
||||
: this (null, null, null)
|
||||
@@ -54,20 +54,15 @@ namespace Microsoft.Build.Framework
|
||||
{
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
protected
|
||||
#endif
|
||||
BuildEventArgs (string message, string helpKeyword,
|
||||
string senderName, DateTime eventTimestamp)
|
||||
protected BuildEventArgs (string message, string helpKeyword,
|
||||
string senderName, DateTime eventTimestamp)
|
||||
{
|
||||
this.message = message;
|
||||
this.helpKeyword = helpKeyword;
|
||||
this.senderName = senderName;
|
||||
this.threadId = Thread.CurrentThread.GetHashCode ();
|
||||
this.timestamp = eventTimestamp;
|
||||
#if NET_3_5
|
||||
this.context = BuildEventContext.NewInstance ();
|
||||
#endif
|
||||
}
|
||||
|
||||
public string HelpKeyword {
|
||||
@@ -76,9 +71,6 @@ namespace Microsoft.Build.Framework
|
||||
}
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
virtual
|
||||
#endif
|
||||
public string Message {
|
||||
get {
|
||||
return message;
|
||||
@@ -104,7 +96,6 @@ namespace Microsoft.Build.Framework
|
||||
}
|
||||
}
|
||||
|
||||
#if NET_3_5
|
||||
public BuildEventContext BuildEventContext {
|
||||
get { return context; }
|
||||
set {
|
||||
@@ -113,7 +104,7 @@ namespace Microsoft.Build.Framework
|
||||
context = value;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
+4
-4
@@ -26,6 +26,8 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Build.Framework {
|
||||
@@ -41,12 +43,10 @@ namespace Microsoft.Build.Framework {
|
||||
public BuildFinishedEventArgs (string message,
|
||||
string helpKeyword,
|
||||
bool succeeded)
|
||||
: base (message, helpKeyword, null)
|
||||
: this (message, helpKeyword, succeeded, DateTime.Now)
|
||||
{
|
||||
this.succeeded = succeeded;
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public BuildFinishedEventArgs (string message,
|
||||
string helpKeyword,
|
||||
bool succeeded,
|
||||
@@ -65,7 +65,6 @@ namespace Microsoft.Build.Framework {
|
||||
{
|
||||
this.succeeded = succeeded;
|
||||
}
|
||||
#endif
|
||||
|
||||
public bool Succeeded {
|
||||
get {
|
||||
@@ -75,3 +74,4 @@ namespace Microsoft.Build.Framework {
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
+6
-12
@@ -26,16 +26,14 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Microsoft.Build.Framework {
|
||||
[Serializable]
|
||||
public class BuildStartedEventArgs : BuildStatusEventArgs {
|
||||
|
||||
#if NET_4_0
|
||||
IDictionary<string, string> buildEnvironment;
|
||||
#endif
|
||||
|
||||
protected BuildStartedEventArgs ()
|
||||
{
|
||||
@@ -43,17 +41,17 @@ namespace Microsoft.Build.Framework {
|
||||
|
||||
public BuildStartedEventArgs (string message,
|
||||
string helpKeyword)
|
||||
: base (message, helpKeyword, null)
|
||||
: this (message, helpKeyword, DateTime.Now)
|
||||
{
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public BuildStartedEventArgs (string message,
|
||||
string helpKeyword,
|
||||
IDictionary<string, string> environmentOfBuild)
|
||||
: base (message, helpKeyword, null)
|
||||
{
|
||||
buildEnvironment = environmentOfBuild;
|
||||
// deal with environmentOfBuild
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
public BuildStartedEventArgs (string message,
|
||||
@@ -70,11 +68,7 @@ namespace Microsoft.Build.Framework {
|
||||
: base (message, helpKeyword, null, eventTimestamp, messageArgs)
|
||||
{
|
||||
}
|
||||
|
||||
public IDictionary<string, string> BuildEnvironment {
|
||||
get { return buildEnvironment; }
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
+4
-8
@@ -26,17 +26,14 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Build.Framework
|
||||
{
|
||||
[Serializable]
|
||||
public abstract class BuildStatusEventArgs
|
||||
#if NET_4_0
|
||||
: LazyFormattedBuildEventArgs {
|
||||
#else
|
||||
: BuildEventArgs {
|
||||
#endif
|
||||
public abstract class BuildStatusEventArgs : LazyFormattedBuildEventArgs {
|
||||
|
||||
protected BuildStatusEventArgs ()
|
||||
{
|
||||
@@ -49,7 +46,6 @@ namespace Microsoft.Build.Framework
|
||||
{
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
protected BuildStatusEventArgs (string message,
|
||||
string helpKeyword,
|
||||
string senderName,
|
||||
@@ -66,7 +62,7 @@ namespace Microsoft.Build.Framework
|
||||
: base (message, helpKeyword, senderName, eventTimestamp, messageArgs)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
+6
-46
@@ -26,16 +26,13 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.Build.Framework {
|
||||
[Serializable]
|
||||
public class BuildWarningEventArgs
|
||||
#if NET_4_0
|
||||
: LazyFormattedBuildEventArgs {
|
||||
#else
|
||||
: BuildEventArgs {
|
||||
#endif
|
||||
public class BuildWarningEventArgs : BuildEventArgs {
|
||||
|
||||
string subcategory;
|
||||
string code;
|
||||
@@ -44,10 +41,7 @@ namespace Microsoft.Build.Framework {
|
||||
int columnNumber;
|
||||
int endLineNumber;
|
||||
int endColumnNumber;
|
||||
#if NET_4_0
|
||||
string projectFile;
|
||||
#endif
|
||||
|
||||
|
||||
protected BuildWarningEventArgs ()
|
||||
{
|
||||
}
|
||||
@@ -71,35 +65,6 @@ namespace Microsoft.Build.Framework {
|
||||
this.endColumnNumber = endColumnNumber;
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public BuildWarningEventArgs (string subcategory, string code,
|
||||
string file, int lineNumber, int columnNumber,
|
||||
int endLineNumber, int endColumnNumber, string message,
|
||||
string helpKeyword, string senderName, DateTime eventTimestamp)
|
||||
: this (subcategory, code, file, lineNumber, columnNumber,
|
||||
endLineNumber, endColumnNumber, message, helpKeyword,
|
||||
senderName, eventTimestamp, new object[0])
|
||||
{
|
||||
}
|
||||
|
||||
public BuildWarningEventArgs (string subcategory, string code,
|
||||
string file, int lineNumber, int columnNumber, int endLineNumber,
|
||||
int endColumnNumber, string message, string helpKeyword,
|
||||
string senderName, DateTime eventTimestamp,
|
||||
params object[] messageArgs)
|
||||
: base (message, helpKeyword, senderName, eventTimestamp, messageArgs)
|
||||
{
|
||||
this.subcategory = subcategory;
|
||||
this.code = code;
|
||||
this.file = file;
|
||||
this.lineNumber = lineNumber;
|
||||
this.columnNumber = columnNumber;
|
||||
this.endLineNumber = endLineNumber;
|
||||
this.endColumnNumber = endColumnNumber;
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
public string Code {
|
||||
get {
|
||||
return code;
|
||||
@@ -141,12 +106,7 @@ namespace Microsoft.Build.Framework {
|
||||
return subcategory;
|
||||
}
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public string ProjectFile {
|
||||
get { return projectFile; }
|
||||
set { projectFile = value; }
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
+12
-32
@@ -25,51 +25,31 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_4_0
|
||||
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
namespace Microsoft.Build.Framework
|
||||
{
|
||||
[Serializable]
|
||||
public abstract class LazyFormattedBuildEventArgs : BuildEventArgs {
|
||||
|
||||
string message, format;
|
||||
object[] args;
|
||||
|
||||
public abstract class LazyFormattedBuildEventArgs : BuildEventArgs
|
||||
{
|
||||
|
||||
protected LazyFormattedBuildEventArgs ()
|
||||
: this (null, null, null)
|
||||
{
|
||||
}
|
||||
|
||||
public LazyFormattedBuildEventArgs (string message,
|
||||
string helpKeyword, string senderName)
|
||||
: base (message, helpKeyword, senderName)
|
||||
|
||||
protected LazyFormattedBuildEventArgs (string message, string helpKeyword,
|
||||
string senderName)
|
||||
: this (message, helpKeyword, senderName, DateTime.Now)
|
||||
{
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public LazyFormattedBuildEventArgs (string message,
|
||||
string helpKeyword, string senderName,
|
||||
DateTime eventTimestamp, params object[] messageArgs)
|
||||
: base (message, helpKeyword, senderName, eventTimestamp)
|
||||
protected LazyFormattedBuildEventArgs (string message, string helpKeyword,
|
||||
string senderName, DateTime eventTimestamp,
|
||||
params object [] messageArgs)
|
||||
: base (string.Format (message, messageArgs), helpKeyword, senderName, eventTimestamp)
|
||||
{
|
||||
if (messageArgs != null && messageArgs.Length > 0) {
|
||||
args = messageArgs;
|
||||
format = message;
|
||||
} else {
|
||||
this.message = message;
|
||||
}
|
||||
}
|
||||
|
||||
public override string Message {
|
||||
get {
|
||||
if (message == null && format != null)
|
||||
message = string.Format (format, args);
|
||||
return message;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1 +0,0 @@
|
||||
/Test/resources/*.proj
|
||||
@@ -44,9 +44,9 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyCompany (Consts.MonoCompany)]
|
||||
[assembly: AssemblyProduct (Consts.MonoProduct)]
|
||||
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
|
||||
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: SatelliteContractVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
|
||||
|
||||
[assembly: NeutralResourcesLanguage ("en-US")]
|
||||
|
||||
@@ -56,4 +56,4 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile("../msfinal.pub")]
|
||||
|
||||
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
@@ -1,11 +1,23 @@
|
||||
thisdir = class/Microsoft.Build.Tasks
|
||||
SUBDIRS =
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
XBUILD_DIR=$(topdir)/tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.Tasks.dll
|
||||
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
|
||||
BUILD_ENGINE = Microsoft.Build.Engine.dll
|
||||
|
||||
ifeq (3.5, $(FRAMEWORK_VERSION))
|
||||
NAME_SUFFIX = .v3.5
|
||||
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
|
||||
BUILD_ENGINE := $(topdir)/class/lib/$(PROFILE)/$(BUILD_ENGINE)
|
||||
else
|
||||
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
|
||||
NAME_SUFFIX = .v4.0
|
||||
endif
|
||||
endif
|
||||
|
||||
# Some tests are explicitly testing Microsoft.Build.Tasks.v3.5.dll
|
||||
TEST_MONO_PATH = $(topdir)/class/lib/net_3_5$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0
|
||||
|
||||
LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
|
||||
|
||||
@@ -15,16 +27,14 @@ LIB_MCS_FLAGS = \
|
||||
/r:System.Core.dll \
|
||||
/r:System.Xml.dll \
|
||||
/r:System.Windows.Forms.dll \
|
||||
/r:$(XBUILD_UTILITIES) \
|
||||
/r:$(XBUILD_FRAMEWORK) \
|
||||
/r:$(XBUILD_ENGINE) \
|
||||
/r:$(XBUILD_TASKS)
|
||||
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
|
||||
/r:$(BUILD_FRAMEWORK) \
|
||||
/r:$(BUILD_ENGINE)
|
||||
|
||||
TEST_MCS_FLAGS = \
|
||||
/r:$(XBUILD_ENGINE) \
|
||||
/r:$(XBUILD_FRAMEWORK) \
|
||||
/r:$(XBUILD_TASKS) \
|
||||
/r:$(XBUILD_UTILITIES) \
|
||||
/r:$(BUILD_ENGINE) \
|
||||
/r:$(BUILD_FRAMEWORK) \
|
||||
/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
|
||||
/r:System.Core.dll
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
@@ -34,15 +44,37 @@ EXTRA_DISTFILES = \
|
||||
Test/resources/junk.txt \
|
||||
Test/test-config-file*
|
||||
|
||||
test-local: Test/resources/test.dll
|
||||
|
||||
Test/resources/test.dll: Test/resources/test.cs
|
||||
$(CSCOMPILE) -target:library Test/resources/test.cs
|
||||
|
||||
clean-test-resources:
|
||||
clean-local: clean-test-dll
|
||||
|
||||
clean-test-dll:
|
||||
rm -f Test/resources/test.dll
|
||||
|
||||
test-local: Test/resources/test.dll
|
||||
test-local: copy-config
|
||||
|
||||
clean-local: clean-test-resources
|
||||
ifeq (net_4_5, $(PROFILE))
|
||||
copy-config:
|
||||
cp Test/test-config-file-net-4.0 $(test_lib).config
|
||||
else
|
||||
ifeq (net_4_0, $(PROFILE))
|
||||
copy-config:
|
||||
cp Test/test-config-file-net-4.0 $(test_lib).config
|
||||
else
|
||||
ifeq (net_3_5, $(PROFILE))
|
||||
copy-config:
|
||||
cp Test/test-config-file-net-3.5 $(test_lib).config
|
||||
else
|
||||
copy-config:
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
export TESTING_MONO=a
|
||||
XBUILD_DIR=../../tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild_targets.make
|
||||
|
||||
include $(XBUILD_DIR)/xbuild_test.make
|
||||
include ../../build/library.make
|
||||
@@ -132,10 +132,12 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LC.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LibraryPcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\Message.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\PcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />
|
||||
@@ -208,10 +210,6 @@
|
||||
<Project>{E8E948B8-6DCF-48F2-A6BC-04309AED8740}</Project>
|
||||
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_2_0.csproj">
|
||||
<Project>{F5F84165-0541-4828-A81E-0AA1836E50C1}</Project>
|
||||
<Name>Mono.XBuild.Tasks-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -132,10 +132,12 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LC.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LibraryPcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\Message.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\PcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />
|
||||
@@ -208,10 +210,6 @@
|
||||
<Project>{874516A3-F5F6-4EAB-B005-4D1A567C5E4D}</Project>
|
||||
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_3_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_3_5.csproj">
|
||||
<Project>{7B888FCD-9064-4F4A-954E-795B43F98127}</Project>
|
||||
<Name>Mono.XBuild.Tasks-net_3_5</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -132,10 +132,12 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LC.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LibraryPcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\Message.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\PcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />
|
||||
@@ -208,10 +210,6 @@
|
||||
<Project>{9B0AC297-CB85-43C1-8C18-12997CF1B78D}</Project>
|
||||
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_0.csproj">
|
||||
<Project>{F7F03F9B-6E7A-43BD-993A-7F197A440150}</Project>
|
||||
<Name>Mono.XBuild.Tasks-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -132,10 +132,12 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LC.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\LibraryPcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\Message.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\PcFileCache.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />
|
||||
@@ -208,10 +210,6 @@
|
||||
<Project>{0DA63190-E6E1-41C5-B683-A54FADBE61CB}</Project>
|
||||
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_5.csproj">
|
||||
<Project>{9AC58525-C730-4552-A8FA-332979FCD055}</Project>
|
||||
<Name>Mono.XBuild.Tasks-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
Assembly/AssemblyInfo.cs
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/MonoTODOAttribute.cs
|
||||
../../tools/xbuild/XBuildConsts.cs
|
||||
Microsoft.Build.Tasks/AL.cs
|
||||
Microsoft.Build.Tasks/AppDomainIsolatedTaskExtension.cs
|
||||
Microsoft.Build.Tasks/AspNetCompiler.cs
|
||||
@@ -88,6 +87,8 @@ Microsoft.Build.Tasks/MakeDir.cs
|
||||
Microsoft.Build.Tasks/ManagedCompiler.cs
|
||||
Microsoft.Build.Tasks/Message.cs
|
||||
Microsoft.Build.Tasks/MSBuild.cs
|
||||
Microsoft.Build.Tasks/PcFileCache.cs
|
||||
Microsoft.Build.Tasks/LibraryPcFileCache.cs
|
||||
Microsoft.Build.Tasks/ReadLinesFromFile.cs
|
||||
Microsoft.Build.Tasks/RegisterAssembly.cs
|
||||
Microsoft.Build.Tasks/RemoveDir.cs
|
||||
|
||||
@@ -98,9 +98,7 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected override string GenerateFullPathToTool ()
|
||||
{
|
||||
if (!string.IsNullOrEmpty (ToolPath))
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
}
|
||||
|
||||
public string AlgorithmId {
|
||||
@@ -236,7 +234,9 @@ namespace Microsoft.Build.Tasks {
|
||||
}
|
||||
|
||||
protected override string ToolName {
|
||||
get { return "al.exe"; }
|
||||
get {
|
||||
return MSBuildUtils.RunningOnWindows ? "al.bat" : "al";
|
||||
}
|
||||
}
|
||||
|
||||
public string Trademark {
|
||||
|
||||
@@ -43,10 +43,6 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected internal override void AddResponseFileCommands (CommandLineBuilderExtension commandLine)
|
||||
{
|
||||
#if !NET_4_0
|
||||
//pre-MSBuild 2 targets don't support multi-targeting, so tell compiler to use 2.0 corlib
|
||||
commandLine.AppendSwitch ("/sdk:2");
|
||||
#endif
|
||||
base.AddResponseFileCommands (commandLine);
|
||||
|
||||
if (AdditionalLibPaths != null && AdditionalLibPaths.Length > 0)
|
||||
@@ -133,9 +129,7 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected override string GenerateFullPathToTool ()
|
||||
{
|
||||
if (!string.IsNullOrEmpty (ToolPath))
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
@@ -206,7 +200,11 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected override string ToolName {
|
||||
get {
|
||||
return "mcs.exe";
|
||||
#if NET_4_0
|
||||
return MSBuildUtils.RunningOnWindows ? "dmcs.bat" : "dmcs";
|
||||
#else
|
||||
return MSBuildUtils.RunningOnWindows ? "gmcs.bat" : "gmcs";
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -76,9 +76,7 @@ namespace Microsoft.Build.Tasks {
|
||||
if (outputResources == null) {
|
||||
foreach (ITaskItem source in sources) {
|
||||
string sourceFile = source.ItemSpec;
|
||||
string outputFile = source.GetMetadata ("AutoGen").Equals ("true", StringComparison.OrdinalIgnoreCase) ?
|
||||
source.ItemSpec.Replace ('\\', '.').Replace ('/', '.') :
|
||||
Path.ChangeExtension (sourceFile, "resources");
|
||||
string outputFile = Path.ChangeExtension (sourceFile, "resources");
|
||||
|
||||
if (IsResgenRequired (sourceFile, outputFile))
|
||||
result &= CompileResourceFile (sourceFile, outputFile);
|
||||
@@ -378,9 +376,7 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected override string GenerateFullPathToTool ()
|
||||
{
|
||||
if (!string.IsNullOrEmpty (ToolPath))
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
}
|
||||
|
||||
protected override MessageImportance StandardOutputLoggingImportance {
|
||||
@@ -388,7 +384,7 @@ namespace Microsoft.Build.Tasks {
|
||||
}
|
||||
|
||||
protected override string ToolName {
|
||||
get { return "resgen.exe"; }
|
||||
get { return MSBuildUtils.RunningOnWindows ? "resgen2.bat" : "resgen2"; }
|
||||
}
|
||||
|
||||
public string SourceFile { get; set; }
|
||||
|
||||
@@ -25,13 +25,11 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Microsoft.Build.Framework;
|
||||
using System.Reflection;
|
||||
using System.Globalization;
|
||||
using Microsoft.Build.Utilities;
|
||||
using System.Text;
|
||||
|
||||
namespace Microsoft.Build.Tasks {
|
||||
public class GetAssemblyIdentity : TaskExtension {
|
||||
@@ -43,56 +41,22 @@ namespace Microsoft.Build.Tasks {
|
||||
{
|
||||
}
|
||||
|
||||
[MonoTODO ("Error handling")]
|
||||
[MonoTODO]
|
||||
public override bool Execute ()
|
||||
{
|
||||
assemblies = new ITaskItem [assembly_files.Length];
|
||||
|
||||
for (int i = 0; i < assemblies.Length; i++) {
|
||||
string file = assembly_files [i].ItemSpec;
|
||||
AssemblyName an = AssemblyName.GetAssemblyName (file);
|
||||
TaskItem item = new TaskItem (an.FullName);
|
||||
|
||||
item.SetMetadata ("Version", an.Version.ToString ());
|
||||
|
||||
byte[] pk = an.GetPublicKeyToken ();
|
||||
string pkStr = pk != null? ByteArrayToString (pk) : "null";
|
||||
item.SetMetadata ("PublicKeyToken", pkStr);
|
||||
|
||||
CultureInfo culture = an.CultureInfo;
|
||||
if (culture != null) {
|
||||
string cn;
|
||||
if (culture.LCID == CultureInfo.InvariantCulture.LCID)
|
||||
cn = "neutral";
|
||||
else
|
||||
cn = culture.Name;
|
||||
item.SetMetadata ("Culture", cn);
|
||||
}
|
||||
|
||||
assemblies[i] = item;
|
||||
}
|
||||
|
||||
return true;
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
static string ByteArrayToString (byte[] arr)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder ();
|
||||
for (int i = 0; i < arr.Length; i++)
|
||||
sb.Append (arr[i].ToString ("x2"));
|
||||
return sb.ToString ();
|
||||
}
|
||||
|
||||
[Output]
|
||||
public ITaskItem [] Assemblies {
|
||||
get { return assemblies; }
|
||||
set { assemblies = value; }
|
||||
}
|
||||
|
||||
[Required]
|
||||
public ITaskItem [] AssemblyFiles {
|
||||
get { return assembly_files; }
|
||||
set { assembly_files = value; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -72,9 +72,7 @@ namespace Microsoft.Build.Tasks {
|
||||
|
||||
protected override string GenerateFullPathToTool ()
|
||||
{
|
||||
if (!string.IsNullOrEmpty (ToolPath))
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
}
|
||||
|
||||
protected override bool ValidateParameters()
|
||||
|
||||
+3
-3
@@ -36,7 +36,7 @@ using System.Collections.Generic;
|
||||
|
||||
namespace Mono.PkgConfig
|
||||
{
|
||||
public class LibraryPcFileCache: PcFileCache<LibraryPackageInfo>
|
||||
internal class LibraryPcFileCache: PcFileCache<LibraryPackageInfo>
|
||||
{
|
||||
Dictionary<string, PackageAssemblyInfo> assemblyLocations;
|
||||
|
||||
@@ -251,7 +251,7 @@ namespace Mono.PkgConfig
|
||||
}
|
||||
}
|
||||
|
||||
public class LibraryPackageInfo: PackageInfo
|
||||
internal class LibraryPackageInfo: PackageInfo
|
||||
{
|
||||
public bool IsGacPackage {
|
||||
get { return GetData ("gacPackage") != "false"; }
|
||||
@@ -270,7 +270,7 @@ namespace Mono.PkgConfig
|
||||
}
|
||||
}
|
||||
|
||||
public class PackageAssemblyInfo
|
||||
internal class PackageAssemblyInfo
|
||||
{
|
||||
public string File { get; set; }
|
||||
|
||||
+35
-40
@@ -36,7 +36,7 @@ using System.Collections.Generic;
|
||||
|
||||
namespace Mono.PkgConfig
|
||||
{
|
||||
public interface IPcFileCacheContext<TP> where TP:PackageInfo, new()
|
||||
internal interface IPcFileCacheContext<TP> where TP:PackageInfo, new()
|
||||
{
|
||||
// In the implementation of this method, the host application can extract
|
||||
// information from the pc file and store it in the PackageInfo object
|
||||
@@ -50,23 +50,24 @@ namespace Mono.PkgConfig
|
||||
void ReportError (string message, Exception ex);
|
||||
}
|
||||
|
||||
public interface IPcFileCacheContext: IPcFileCacheContext<PackageInfo>
|
||||
internal interface IPcFileCacheContext: IPcFileCacheContext<PackageInfo>
|
||||
{
|
||||
}
|
||||
|
||||
public abstract class PcFileCache: PcFileCache<PackageInfo>
|
||||
internal abstract class PcFileCache: PcFileCache<PackageInfo>
|
||||
{
|
||||
public PcFileCache (IPcFileCacheContext ctx): base (ctx)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class PcFileCache<TP> where TP:PackageInfo, new()
|
||||
internal abstract class PcFileCache<TP> where TP:PackageInfo, new()
|
||||
{
|
||||
const string CACHE_VERSION = "2";
|
||||
const string MacOSXExternalPkgConfigDir = "/Library/Frameworks/Mono.framework/External/pkgconfig";
|
||||
|
||||
Dictionary<string, TP> infos = new Dictionary<string, TP> ();
|
||||
Dictionary<string, List<TP>> filesByFolder = new Dictionary<string, List<TP>> ();
|
||||
|
||||
string cacheFile;
|
||||
bool hasChanges;
|
||||
@@ -99,25 +100,12 @@ namespace Mono.PkgConfig
|
||||
}
|
||||
|
||||
// Updates the pkg-config index, looking for .pc files in the provided directories
|
||||
// Deletes pkg info entries, of which .pc files don't exist, from cache
|
||||
public void Update (IEnumerable<string> pkgConfigDirs)
|
||||
{
|
||||
foreach (string pcdir in pkgConfigDirs) {
|
||||
foreach (string pcfile in Directory.GetFiles (pcdir, "*.pc"))
|
||||
GetPackageInfo (pcfile);
|
||||
}
|
||||
|
||||
lock (infos) {
|
||||
string[] keys = new string [infos.Count];
|
||||
infos.Keys.CopyTo (keys, 0);
|
||||
foreach (string key in keys) {
|
||||
if (!File.Exists (key)) {
|
||||
infos.Remove (key);
|
||||
hasChanges = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Save ();
|
||||
}
|
||||
|
||||
@@ -130,23 +118,12 @@ namespace Mono.PkgConfig
|
||||
{
|
||||
if (pkgConfigDirs == null)
|
||||
pkgConfigDirs = GetDefaultPaths ();
|
||||
else
|
||||
pkgConfigDirs = NormaliseAndFilterPaths (pkgConfigDirs, Environment.CurrentDirectory);
|
||||
|
||||
string[] keys = new string [infos.Count];
|
||||
TP[] vals = new TP [infos.Count];
|
||||
lock (infos) {
|
||||
infos.Keys.CopyTo (keys, 0);
|
||||
infos.Values.CopyTo (vals, 0);
|
||||
}
|
||||
|
||||
foreach (string sp in pkgConfigDirs) {
|
||||
int i = 0;
|
||||
foreach (var file in keys) {
|
||||
string dirOfFile = Path.GetFullPath (Path.GetDirectoryName (file));
|
||||
if (dirOfFile == sp)
|
||||
yield return vals [i];
|
||||
i++;
|
||||
List<TP> list;
|
||||
if (filesByFolder.TryGetValue (Path.GetFullPath (sp), out list)) {
|
||||
foreach (TP p in list)
|
||||
yield return p;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -167,7 +144,7 @@ namespace Mono.PkgConfig
|
||||
// Returns information about a .pc file
|
||||
public TP GetPackageInfo (string file)
|
||||
{
|
||||
TP info;
|
||||
TP info, oldInfo = null;
|
||||
file = Path.GetFullPath (file);
|
||||
|
||||
DateTime wtime = File.GetLastWriteTime (file);
|
||||
@@ -176,6 +153,7 @@ namespace Mono.PkgConfig
|
||||
if (infos.TryGetValue (file, out info)) {
|
||||
if (info.LastWriteTime == wtime)
|
||||
return info;
|
||||
oldInfo = info;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,13 +168,32 @@ namespace Mono.PkgConfig
|
||||
if (!info.IsValidPackage)
|
||||
info = new TP (); // Create a default empty instance
|
||||
info.LastWriteTime = wtime;
|
||||
infos [file] = info;
|
||||
Add (file, info, oldInfo);
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
void Add (string file, TP info, TP replacedInfo)
|
||||
{
|
||||
infos [file] = info;
|
||||
string dir = Path.GetFullPath (Path.GetDirectoryName (file));
|
||||
List<TP> list;
|
||||
if (!filesByFolder.TryGetValue (dir, out list)) {
|
||||
list = new List<TP> ();
|
||||
filesByFolder [dir] = list;
|
||||
}
|
||||
if (replacedInfo != null) {
|
||||
int i = list.IndexOf (replacedInfo);
|
||||
if (i != -1) {
|
||||
list [i] = info;
|
||||
return;
|
||||
}
|
||||
}
|
||||
list.Add (info);
|
||||
}
|
||||
|
||||
FileStream OpenFile (FileAccess access)
|
||||
{
|
||||
int retries = 6;
|
||||
@@ -316,10 +313,8 @@ namespace Mono.PkgConfig
|
||||
tr.Read ();
|
||||
tr.MoveToContent ();
|
||||
|
||||
if (!pinfo.IsValidPackage || ctx.IsCustomDataComplete (file, pinfo)) {
|
||||
lock (infos)
|
||||
infos [file] = pinfo;
|
||||
}
|
||||
if (!pinfo.IsValidPackage || ctx.IsCustomDataComplete (file, pinfo))
|
||||
Add (file, pinfo, null);
|
||||
}
|
||||
|
||||
protected virtual void ReadPackageContent (XmlReader tr, TP pinfo)
|
||||
@@ -454,7 +449,7 @@ namespace Mono.PkgConfig
|
||||
}
|
||||
}
|
||||
|
||||
public class PcFile
|
||||
internal class PcFile
|
||||
{
|
||||
Dictionary<string,string> variables = new Dictionary<string, string> ();
|
||||
|
||||
@@ -580,7 +575,7 @@ namespace Mono.PkgConfig
|
||||
}
|
||||
}
|
||||
|
||||
public class PackageInfo
|
||||
internal class PackageInfo
|
||||
{
|
||||
Dictionary<string,string> customData;
|
||||
DateTime lastWriteTime;
|
||||
@@ -162,6 +162,9 @@ namespace Microsoft.Build.Tasks {
|
||||
Log.LogWarning ("Reference '{0}' not resolved", item.ItemSpec);
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
|
||||
} else {
|
||||
if (Environment.GetEnvironmentVariable ("XBUILD_LOG_REFERENCE_RESOLVER") != null)
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
|
||||
Log.LogMessage (MessageImportance.Low,
|
||||
"\tReference {0} resolved to {1}. CopyLocal = {2}",
|
||||
item.ItemSpec, resolved_ref.TaskItem,
|
||||
@@ -171,8 +174,6 @@ namespace Microsoft.Build.Tasks {
|
||||
"\tReference found at search path {0}",
|
||||
resolved_ref.FoundInSearchPathAsString);
|
||||
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
|
||||
if (TryAddNewReference (tempResolvedFiles, resolved_ref) &&
|
||||
!IsFromGacOrTargetFramework (resolved_ref) &&
|
||||
resolved_ref.FoundInSearchPath != SearchPath.PkgConfig) {
|
||||
@@ -288,7 +289,8 @@ namespace Microsoft.Build.Tasks {
|
||||
continue;
|
||||
}
|
||||
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
if (Environment.GetEnvironmentVariable ("XBUILD_LOG_REFERENCE_RESOLVER") != null)
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
|
||||
ResolvedReference rr = assembly_resolver.GetResolvedReference (item, item.ItemSpec, aname, true,
|
||||
SearchPath.RawFileName);
|
||||
@@ -362,6 +364,9 @@ namespace Microsoft.Build.Tasks {
|
||||
resolved_ref = ResolveReference (item, dependency_search_paths, false);
|
||||
|
||||
if (resolved_ref != null) {
|
||||
if (Environment.GetEnvironmentVariable ("XBUILD_LOG_REFERENCE_RESOLVER") != null)
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
|
||||
Log.LogMessage (MessageImportance.Low, "\tReference {0} resolved to {1}.",
|
||||
aname, resolved_ref.TaskItem.ItemSpec);
|
||||
|
||||
@@ -369,8 +374,6 @@ namespace Microsoft.Build.Tasks {
|
||||
"\tReference found at search path {0}",
|
||||
resolved_ref.FoundInSearchPathAsString);
|
||||
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
|
||||
if (resolved_ref.FoundInSearchPath == SearchPath.Directory) {
|
||||
// override CopyLocal with parent's val
|
||||
SetCopyLocal (resolved_ref.TaskItem, parent_copy_local);
|
||||
@@ -386,14 +389,14 @@ namespace Microsoft.Build.Tasks {
|
||||
} else {
|
||||
//gac or tgtfmwk
|
||||
Log.LogMessage (MessageImportance.Low,
|
||||
"\tThis is CopyLocal false as it is in the GAC," +
|
||||
"\tThis is CopyLocal false as it is in the gac," +
|
||||
"target framework directory or provided by a package.");
|
||||
|
||||
TryAddNewReference (tempResolvedFiles, resolved_ref);
|
||||
}
|
||||
} else {
|
||||
Log.LogMessage (MessageImportance.Low, "Could not resolve the assembly \"{0}\".", aname);
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Low);
|
||||
Log.LogWarning ("Reference '{0}' not resolved", aname);
|
||||
assembly_resolver.LogSearchLoggerMessages (MessageImportance.Normal);
|
||||
}
|
||||
|
||||
return resolved_ref;
|
||||
|
||||
@@ -141,9 +141,7 @@ namespace Microsoft.Build.Tasks {
|
||||
[MonoTODO]
|
||||
protected override string GenerateFullPathToTool ()
|
||||
{
|
||||
if (!string.IsNullOrEmpty (ToolPath))
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
return ToolLocationHelper.GetPathToDotNetFrameworkFile (ToolExe, TargetDotNetFrameworkVersion.VersionLatest);
|
||||
return Path.Combine (ToolPath, ToolExe);
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Collections;
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
@@ -44,20 +43,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
|
||||
public void ARFC (CommandLineBuilderExtension commandLine)
|
||||
{
|
||||
base.AddResponseFileCommands (commandLine);
|
||||
#if !NET_4_0
|
||||
string s = commandLine.ToString ();
|
||||
if (s.Length == 6)
|
||||
Assert.AreEqual ("/sdk:2", s);
|
||||
else
|
||||
Assert.AreEqual ("/sdk:2 ", s.Substring (0, 7));
|
||||
|
||||
BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
|
||||
PropertyInfo pi = typeof (CommandLineBuilderExtension).GetProperty ("CommandLine", flags);
|
||||
System.Text.StringBuilder sb = (System.Text.StringBuilder) pi.GetValue (commandLine, null);
|
||||
sb.Length = 0;
|
||||
if (s.Length > 6)
|
||||
sb.Append (s.Substring (7));
|
||||
#endif
|
||||
}
|
||||
|
||||
public void ACLC (CommandLineBuilderExtension commandLine)
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Collections;
|
||||
using Microsoft.Build.BuildEngine;
|
||||
using Microsoft.Build.Framework;
|
||||
@@ -683,11 +682,10 @@ namespace MonoTests.Microsoft.Build.Tasks {
|
||||
mc.References = null;
|
||||
Assert.IsTrue (mc.CheckAllReferencesExistOnDisk (), "A2");
|
||||
|
||||
string path = Path.Combine (Path.Combine ("Test", "resources"), "test.cs");
|
||||
mc.References = new ITaskItem [1] { new TaskItem (path) };
|
||||
mc.References = new ITaskItem [1] { new TaskItem (@"Test\resources\test.cs") };
|
||||
Assert.IsTrue (mc.CheckAllReferencesExistOnDisk (), "A3");
|
||||
|
||||
mc.References = new ITaskItem [2] { new TaskItem (path), new TaskItem ("X") };
|
||||
mc.References = new ITaskItem [2] { new TaskItem (@"Test\resources\test.cs"), new TaskItem ("X") };
|
||||
Assert.IsFalse (mc.CheckAllReferencesExistOnDisk (), "A4");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,9 +46,9 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyCompany (Consts.MonoCompany)]
|
||||
[assembly: AssemblyProduct (Consts.MonoProduct)]
|
||||
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
|
||||
[assembly: AssemblyVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: SatelliteContractVersion (XBuildConsts.AssemblyVersion)]
|
||||
[assembly: AssemblyInformationalVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyVersion (Consts.FxVersion)]
|
||||
[assembly: SatelliteContractVersion (Consts.FxVersion)]
|
||||
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
|
||||
|
||||
[assembly: NeutralResourcesLanguage ("en-US")]
|
||||
|
||||
@@ -57,6 +57,6 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile("../msfinal.pub")]
|
||||
|
||||
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
|
||||
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
|
||||
|
||||
#endif
|
||||
@@ -2,18 +2,27 @@ thisdir = class/Microsoft.Build.Utilities
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
XBUILD_DIR=$(topdir)/tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.Utilities.dll
|
||||
LIBRARY_NAME = Microsoft.Build.Utilities$(NAME_SUFFIX).dll
|
||||
BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
|
||||
|
||||
ifeq (3.5, $(FRAMEWORK_VERSION))
|
||||
LIBRARY_NAME = Microsoft.Build.Utilities.v3.5.dll
|
||||
BUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/$(BUILD_FRAMEWORK)
|
||||
else
|
||||
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
|
||||
LIBRARY_NAME = Microsoft.Build.Utilities.v4.0.dll
|
||||
endif
|
||||
endif
|
||||
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
/r:$(XBUILD_FRAMEWORK)
|
||||
/r:$(BUILD_FRAMEWORK)
|
||||
|
||||
TEST_MCS_FLAGS = /r:$(XBUILD_ENGINE) /r:$(XBUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll
|
||||
TEST_MCS_FLAGS = /r:$(BUILD_FRAMEWORK) -r:System.dll -r:System.Core.dll
|
||||
|
||||
export TESTING_MONO=a
|
||||
XBUILD_DIR=../../tools/xbuild
|
||||
include $(XBUILD_DIR)/xbuild_targets.make
|
||||
|
||||
include $(XBUILD_DIR)/xbuild_test.make
|
||||
include ../../build/library.make
|
||||
@@ -1,6 +1,5 @@
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/MonoTODOAttribute.cs
|
||||
../../tools/xbuild/XBuildConsts.cs
|
||||
Assembly/AssemblyInfo.cs
|
||||
Microsoft.Build.Utilities/AppDomainIsolatedTask.cs
|
||||
Microsoft.Build.Utilities/CommandLineBuilder.cs
|
||||
|
||||
@@ -117,7 +117,6 @@ namespace Microsoft.Build.Utilities
|
||||
startInfo.RedirectStandardError = true;
|
||||
startInfo.RedirectStandardInput = redirectStandardInput;
|
||||
startInfo.UseShellExecute = false;
|
||||
startInfo.CreateNoWindow = true;
|
||||
|
||||
return startInfo;
|
||||
}
|
||||
|
||||
+1
-6
@@ -48,13 +48,8 @@ namespace Microsoft.Build.Utilities
|
||||
#if NET_4_5
|
||||
Version45,
|
||||
#endif
|
||||
#if XBUILD_12
|
||||
Version451,
|
||||
#endif
|
||||
|
||||
#if XBUILD_12
|
||||
VersionLatest = Version451
|
||||
#elif NET_4_5
|
||||
#if NET_4_5
|
||||
VersionLatest = Version45
|
||||
#elif NET_4_0
|
||||
VersionLatest = Version40
|
||||
|
||||
@@ -40,37 +40,23 @@ namespace Microsoft.Build.Utilities
|
||||
public
|
||||
#endif
|
||||
sealed class TaskItem : MarshalByRefObject, ITaskItem
|
||||
#if NET_4_0
|
||||
, ITaskItem2
|
||||
#endif
|
||||
{
|
||||
IDictionary escapedMetadata;
|
||||
string escapedItemSpec;
|
||||
IDictionary metadata;
|
||||
string itemSpec;
|
||||
|
||||
public TaskItem ()
|
||||
{
|
||||
this.escapedItemSpec = String.Empty;
|
||||
this.escapedMetadata = CollectionsUtil.CreateCaseInsensitiveHashtable ();
|
||||
this.itemSpec = String.Empty;
|
||||
this.metadata = CollectionsUtil.CreateCaseInsensitiveHashtable ();
|
||||
}
|
||||
|
||||
public TaskItem (ITaskItem sourceItem)
|
||||
{
|
||||
if (sourceItem == null)
|
||||
throw new ArgumentNullException ("sourceItem");
|
||||
|
||||
#if NET_4_0
|
||||
var ti2 = sourceItem as ITaskItem2;
|
||||
if (ti2 != null) {
|
||||
escapedItemSpec = ti2.EvaluatedIncludeEscaped;
|
||||
escapedMetadata = ti2.CloneCustomMetadataEscaped ();
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
escapedItemSpec = MSBuildUtils.Escape (sourceItem.ItemSpec);
|
||||
escapedMetadata = sourceItem.CloneCustomMetadata ();
|
||||
foreach (string key in new ArrayList (escapedMetadata.Keys))
|
||||
escapedMetadata [key] = MSBuildUtils.Escape ((string)escapedMetadata [key]);
|
||||
}
|
||||
|
||||
this.itemSpec = sourceItem.ItemSpec;
|
||||
this.metadata = sourceItem.CloneCustomMetadata ();
|
||||
}
|
||||
|
||||
public TaskItem (string itemSpec)
|
||||
@@ -78,8 +64,11 @@ namespace Microsoft.Build.Utilities
|
||||
if (itemSpec == null)
|
||||
throw new ArgumentNullException ("itemSpec");
|
||||
|
||||
escapedItemSpec = itemSpec;
|
||||
escapedMetadata = CollectionsUtil.CreateCaseInsensitiveHashtable ();
|
||||
this.itemSpec = itemSpec;
|
||||
this.metadata = CollectionsUtil.CreateCaseInsensitiveHashtable ();
|
||||
|
||||
// FIXME: hack
|
||||
this.itemSpec = itemSpec.Replace ('\\', Path.DirectorySeparatorChar);
|
||||
}
|
||||
|
||||
public TaskItem (string itemSpec, IDictionary itemMetadata)
|
||||
@@ -90,35 +79,23 @@ namespace Microsoft.Build.Utilities
|
||||
if (itemMetadata == null)
|
||||
throw new ArgumentNullException ("itemMetadata");
|
||||
|
||||
escapedItemSpec = itemSpec;
|
||||
escapedMetadata = CollectionsUtil.CreateCaseInsensitiveHashtable (itemMetadata);
|
||||
this.itemSpec = itemSpec;
|
||||
this.metadata = CollectionsUtil.CreateCaseInsensitiveHashtable (itemMetadata);
|
||||
}
|
||||
|
||||
public IDictionary CloneCustomMetadata ()
|
||||
{
|
||||
IDictionary clonedMetadata = CollectionsUtil.CreateCaseInsensitiveHashtable ();
|
||||
foreach (DictionaryEntry de in escapedMetadata)
|
||||
clonedMetadata.Add (de.Key, MSBuildUtils.Unescape ((string) de.Value));
|
||||
foreach (DictionaryEntry de in metadata)
|
||||
clonedMetadata.Add (de.Key, de.Value);
|
||||
return clonedMetadata;
|
||||
}
|
||||
|
||||
IDictionary CloneCustomMetadataEscaped ()
|
||||
{
|
||||
return CollectionsUtil.CreateCaseInsensitiveHashtable (escapedMetadata);
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
IDictionary ITaskItem2.CloneCustomMetadataEscaped ()
|
||||
{
|
||||
return CloneCustomMetadataEscaped ();
|
||||
}
|
||||
#endif
|
||||
|
||||
public void CopyMetadataTo (ITaskItem destinationItem)
|
||||
{
|
||||
foreach (DictionaryEntry e in escapedMetadata) {
|
||||
foreach (DictionaryEntry e in metadata) {
|
||||
if (destinationItem.GetMetadata ((string)e.Key) == String.Empty) {
|
||||
destinationItem.SetMetadata ((string)e.Key, MSBuildUtils.Unescape ((string)e.Value));
|
||||
destinationItem.SetMetadata ((string)e.Key, (string)e.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -129,24 +106,15 @@ namespace Microsoft.Build.Utilities
|
||||
}
|
||||
|
||||
public string GetMetadata (string metadataName)
|
||||
{
|
||||
return MSBuildUtils.Unescape (GetMetadataValue (metadataName));
|
||||
}
|
||||
|
||||
string GetMetadataValue (string metadataName)
|
||||
{
|
||||
if (ReservedNameUtils.IsReservedMetadataName (metadataName))
|
||||
return ReservedNameUtils.GetReservedMetadata (ItemSpec, metadataName, escapedMetadata);
|
||||
return ((string) escapedMetadata [metadataName]) ?? String.Empty;
|
||||
return ReservedNameUtils.GetReservedMetadata (ItemSpec, metadataName, metadata);
|
||||
else if (metadata.Contains (metadataName))
|
||||
return (string) metadata [metadataName];
|
||||
else
|
||||
return String.Empty;
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
string ITaskItem2.GetMetadataValueEscaped (string metadataName)
|
||||
{
|
||||
return GetMetadataValue (metadataName);
|
||||
}
|
||||
#endif
|
||||
|
||||
public override object InitializeLifetimeService ()
|
||||
{
|
||||
return null;
|
||||
@@ -158,7 +126,8 @@ namespace Microsoft.Build.Utilities
|
||||
throw new ArgumentNullException ("metadataName");
|
||||
if (ReservedNameUtils.IsReservedMetadataName (metadataName))
|
||||
throw new ArgumentException ("Can't remove reserved metadata");
|
||||
escapedMetadata.Remove (metadataName);
|
||||
if (metadata.Contains (metadataName))
|
||||
metadata.Remove (metadataName);
|
||||
}
|
||||
|
||||
public void SetMetadata (string metadataName, string metadataValue)
|
||||
@@ -173,34 +142,23 @@ namespace Microsoft.Build.Utilities
|
||||
ReservedNameUtils.IsReservedMetadataName (metadataName))
|
||||
throw new ArgumentException ("Can't modify reserved metadata");
|
||||
|
||||
escapedMetadata [metadataName] = metadataValue;
|
||||
if (metadata.Contains (metadataName))
|
||||
metadata.Remove (metadataName);
|
||||
metadata.Add (metadataName, metadataValue);
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
void ITaskItem2.SetMetadataValueLiteral (string metadataName, string metadataValue)
|
||||
{
|
||||
SetMetadata (metadataName, MSBuildUtils.Escape (metadataValue));
|
||||
}
|
||||
#endif
|
||||
public override string ToString ()
|
||||
{
|
||||
return escapedItemSpec;
|
||||
return itemSpec;
|
||||
}
|
||||
|
||||
public string ItemSpec {
|
||||
get { return MSBuildUtils.Unescape (escapedItemSpec); }
|
||||
set { escapedItemSpec = value; }
|
||||
get { return itemSpec; }
|
||||
set { itemSpec = value; }
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
string ITaskItem2.EvaluatedIncludeEscaped {
|
||||
get { return escapedItemSpec; }
|
||||
set { escapedItemSpec = value; }
|
||||
}
|
||||
#endif
|
||||
|
||||
public int MetadataCount {
|
||||
get { return escapedMetadata.Count + 11; }
|
||||
get { return metadata.Count + 11; }
|
||||
}
|
||||
|
||||
public ICollection MetadataNames {
|
||||
@@ -209,13 +167,12 @@ namespace Microsoft.Build.Utilities
|
||||
|
||||
foreach (string s in ReservedNameUtils.ReservedMetadataNames)
|
||||
list.Add (s);
|
||||
foreach (string s in escapedMetadata.Keys)
|
||||
foreach (string s in metadata.Keys)
|
||||
list.Add (s);
|
||||
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+18
-58
@@ -39,7 +39,6 @@ namespace Microsoft.Build.Utilities
|
||||
{
|
||||
static string lib_mono_dir;
|
||||
static string [] mono_dir;
|
||||
static bool runningOnDotNet;
|
||||
|
||||
static ToolLocationHelper ()
|
||||
{
|
||||
@@ -54,45 +53,38 @@ namespace Microsoft.Build.Utilities
|
||||
t2 = t1.Parent;
|
||||
|
||||
lib_mono_dir = t2.FullName;
|
||||
|
||||
#if NET_4_0
|
||||
var windowsPath = Environment.GetFolderPath (Environment.SpecialFolder.Windows);
|
||||
runningOnDotNet = !string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath);
|
||||
#endif
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) {
|
||||
mono_dir = new string [] {
|
||||
Path.Combine (lib_mono_dir, "net_1_0"),
|
||||
Path.Combine (lib_mono_dir, "net_2_0"),
|
||||
Path.Combine (lib_mono_dir, "net_2_0"),
|
||||
Path.Combine (lib_mono_dir, "net_3_5"),
|
||||
// mono's 4.0 is not an actual framework directory with all tools etc
|
||||
// it's simply reference assemblies. So like .NET we consider 4.5 to
|
||||
// be a complete replacement for 4.0.
|
||||
Path.Combine (lib_mono_dir, "net_4_5"),
|
||||
Path.Combine (lib_mono_dir, "net_4_5"),
|
||||
Path.Combine (lib_mono_dir, "net_4_0"),
|
||||
Path.Combine (lib_mono_dir, "net_4_5")
|
||||
};
|
||||
} else if (runningOnDotNet) {
|
||||
#if NET_4_0
|
||||
} else if (!string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath)) {
|
||||
//running in .NET, not Mono
|
||||
mono_dir = new string [] {
|
||||
Path.Combine (lib_mono_dir, "v1.0.3705"),
|
||||
Path.Combine (lib_mono_dir, "v2.0.50727"),
|
||||
Path.Combine (lib_mono_dir, "v2.0.50727"),
|
||||
Path.Combine (lib_mono_dir, "v3.5"),
|
||||
Path.Combine (lib_mono_dir, "v4.0.30319"),
|
||||
Path.Combine (lib_mono_dir, "v4.0.30319"),
|
||||
Path.Combine (lib_mono_dir, "v4.0.30319")
|
||||
};
|
||||
#endif
|
||||
} else {
|
||||
mono_dir = new string [] {
|
||||
Path.Combine (lib_mono_dir, "1.0"),
|
||||
Path.Combine (lib_mono_dir, "2.0"),
|
||||
Path.Combine (lib_mono_dir, "2.0"),
|
||||
Path.Combine (lib_mono_dir, "3.5"),
|
||||
// see comment above regarding 4.0/4.5
|
||||
Path.Combine (lib_mono_dir, "4.5"),
|
||||
Path.Combine (lib_mono_dir, "4.5"),
|
||||
Path.Combine (lib_mono_dir, "4.5"),
|
||||
Path.Combine (lib_mono_dir, "4.0"),
|
||||
Path.Combine (lib_mono_dir, "4.5")
|
||||
};
|
||||
}
|
||||
|
||||
@@ -121,27 +113,20 @@ namespace Microsoft.Build.Utilities
|
||||
return mono_dir [(int)version];
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
public static string GetMSBuildInstallPath (string version)
|
||||
{
|
||||
//see http://msdn.microsoft.com/en-us/library/vstudio/bb397428(v=vs.120).aspx
|
||||
var programFiles = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86);
|
||||
return Path.Combine (programFiles, "MSBuild", version, "bin");
|
||||
}
|
||||
#endif
|
||||
|
||||
[MonoTODO]
|
||||
public static string GetPathToDotNetFrameworkFile (string fileName,
|
||||
TargetDotNetFrameworkVersion version)
|
||||
{
|
||||
string dir = GetPathToDotNetFramework (version);
|
||||
string file = Path.Combine (dir, fileName);
|
||||
if (File.Exists (file))
|
||||
return file;
|
||||
|
||||
//Mono doesn't ship multiple versions of tools that are backwards/forwards compatible
|
||||
if (!runningOnDotNet) {
|
||||
#if NET_3_5
|
||||
//most of the 3.5 tools are in the 2.0 directory
|
||||
if (version == TargetDotNetFrameworkVersion.Version35)
|
||||
return GetPathToDotNetFrameworkFile (fileName, TargetDotNetFrameworkVersion.Version20);
|
||||
#endif
|
||||
//unversioned tools are in the 4.5 directory
|
||||
if (version == TargetDotNetFrameworkVersion.Version20)
|
||||
return GetPathToDotNetFrameworkFile (fileName, (TargetDotNetFrameworkVersion)5);
|
||||
}
|
||||
|
||||
return null;
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
public static string GetPathToDotNetFrameworkSdk (TargetDotNetFrameworkVersion version)
|
||||
@@ -168,30 +153,5 @@ namespace Microsoft.Build.Utilities
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
#if XBUILD_12
|
||||
public static string CurrentToolsVersion {
|
||||
get {
|
||||
return XBuildConsts.Version;
|
||||
}
|
||||
}
|
||||
|
||||
public static string GetPathToBuildTools (string toolsVersion)
|
||||
{
|
||||
if (toolsVersion != "12.0")
|
||||
return null;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null)
|
||||
return Path.Combine (lib_mono_dir, "xbuild_12");
|
||||
|
||||
if (runningOnDotNet) {
|
||||
//see http://msdn.microsoft.com/en-us/library/vstudio/bb397428(v=vs.120).aspx
|
||||
var programFiles = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86);
|
||||
return Path.Combine (programFiles, "MSBuild", toolsVersion, "bin");
|
||||
}
|
||||
|
||||
return Path.Combine (lib_mono_dir, "xbuild", toolsVersion, "bin");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -72,6 +72,7 @@ namespace Microsoft.Build.Utilities
|
||||
{
|
||||
this.TaskResources = taskResources;
|
||||
this.HelpKeywordPrefix = helpKeywordPrefix;
|
||||
this.toolPath = MonoLocationHelper.GetBinDir ();
|
||||
this.responseFileEncoding = Encoding.UTF8;
|
||||
this.timeout = Int32.MaxValue;
|
||||
}
|
||||
@@ -297,7 +298,6 @@ namespace Microsoft.Build.Utilities
|
||||
|
||||
pinfo.WorkingDirectory = GetWorkingDirectory () ?? Environment.CurrentDirectory;
|
||||
pinfo.UseShellExecute = false;
|
||||
pinfo.CreateNoWindow = true;
|
||||
pinfo.RedirectStandardOutput = true;
|
||||
pinfo.RedirectStandardError = true;
|
||||
|
||||
@@ -439,12 +439,15 @@ namespace Microsoft.Build.Utilities
|
||||
public virtual string ToolExe
|
||||
{
|
||||
get {
|
||||
if (string.IsNullOrEmpty (toolExe))
|
||||
if (toolExe == null)
|
||||
return ToolName;
|
||||
else
|
||||
return toolExe;
|
||||
}
|
||||
set { toolExe = value; }
|
||||
set {
|
||||
if (!String.IsNullOrEmpty (value))
|
||||
toolExe = value;
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract string ToolName
|
||||
@@ -455,7 +458,10 @@ namespace Microsoft.Build.Utilities
|
||||
public string ToolPath
|
||||
{
|
||||
get { return toolPath; }
|
||||
set { toolPath = value; }
|
||||
set {
|
||||
if (!String.IsNullOrEmpty (value))
|
||||
toolPath = value;
|
||||
}
|
||||
}
|
||||
|
||||
// Keep in sync with mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
|
||||
|
||||
@@ -77,8 +77,7 @@ namespace Mono.XBuild.Utilities {
|
||||
|
||||
switch (metadataName.ToLowerInvariant ()) {
|
||||
case "fullpath":
|
||||
var unescapedItemSpec = MSBuildUtils.Unescape (itemSpec);
|
||||
return MSBuildUtils.Escape (Path.GetFullPath (unescapedItemSpec));
|
||||
return Path.GetFullPath (itemSpec);
|
||||
case "rootdir":
|
||||
if (Path.IsPathRooted (itemSpec))
|
||||
return Path.GetPathRoot (itemSpec);
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Specialized;
|
||||
using System.IO;
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
using NUnit.Framework;
|
||||
@@ -116,50 +115,6 @@ namespace MonoTests.Microsoft.Build.Utilities {
|
||||
new TaskItem ("itemspec", null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestCtor_EscapedSpecialChar ()
|
||||
{
|
||||
// If we instantiate with the *escaped* metadata, it's unescaped automatically
|
||||
var metadata = "[email protected]";
|
||||
var escapedMetadata = global::Microsoft.Build.BuildEngine.Utilities.Escape ("[email protected]");
|
||||
var item = new TaskItem (escapedMetadata);
|
||||
item.SetMetadata ("mine", escapedMetadata);
|
||||
|
||||
Assert.AreEqual (metadata, item.ItemSpec, "#1");
|
||||
Assert.AreEqual (metadata, item.GetMetadata ("Identity"), "#2");
|
||||
Assert.AreEqual (Path.GetFileNameWithoutExtension (metadata), item.GetMetadata ("FileName"), "#3");
|
||||
Assert.IsTrue (item.GetMetadata ("FullPath").EndsWith (metadata), "#4");
|
||||
Assert.AreEqual (metadata, item.GetMetadata ("mine"), "#5");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestCtor_EscapedSpecialChar_BrokenEscaping ()
|
||||
{
|
||||
// This is badly escaped, but MSBuild does not care.
|
||||
var metadata = "foo%[email protected]";
|
||||
var item = new TaskItem (metadata);
|
||||
|
||||
Assert.AreEqual (metadata, item.ItemSpec, "#1");
|
||||
Assert.AreEqual (metadata, item.GetMetadata ("Identity"), "#2");
|
||||
Assert.AreEqual (Path.GetFileNameWithoutExtension (metadata), item.GetMetadata ("FileName"), "#3");
|
||||
Assert.IsTrue (item.GetMetadata ("FullPath").EndsWith (metadata), "#4");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestCtor_UnescapedSpecialChar ()
|
||||
{
|
||||
// If we instantiate with unescaped metadata, we get the same value back
|
||||
var metadata = "[email protected]";
|
||||
var item = new TaskItem (metadata);
|
||||
item.SetMetadata ("mine", metadata);
|
||||
|
||||
Assert.AreEqual (metadata, item.ItemSpec, "#1");
|
||||
Assert.AreEqual (metadata, item.GetMetadata ("Identity"), "#2");
|
||||
Assert.AreEqual (Path.GetFileNameWithoutExtension (metadata), item.GetMetadata ("FileName"), "#3");
|
||||
Assert.IsTrue (item.GetMetadata ("FullPath").EndsWith (metadata), "#4");
|
||||
Assert.AreEqual (metadata, item.GetMetadata ("mine"), "#5");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestCopyConstructor ()
|
||||
{
|
||||
@@ -285,19 +240,5 @@ namespace MonoTests.Microsoft.Build.Utilities {
|
||||
item = new TaskItem ("lalala");
|
||||
item.SetMetadata ("Identity", "some value");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestSetItemSpec ()
|
||||
{
|
||||
var itemSpec = "[email protected]";
|
||||
var escapedItemSpec = global::Microsoft.Build.BuildEngine.Utilities.Escape (itemSpec);
|
||||
|
||||
var item = new TaskItem ("foo");
|
||||
item.ItemSpec = itemSpec;
|
||||
Assert.AreEqual (itemSpec, item.ItemSpec, "#1");
|
||||
|
||||
item.ItemSpec = escapedItemSpec;
|
||||
Assert.AreEqual (itemSpec, item.ItemSpec, "#2");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -56,23 +56,6 @@ namespace MonoTests.Microsoft.Build.Utilities {
|
||||
task.Codes.Clear ();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ToolExeAndPath ()
|
||||
{
|
||||
TestToolTask a = new TestToolTask ();
|
||||
Assert.AreEqual (a.ToolExe, "TestTool.exe", "#1");
|
||||
a.ToolExe = "Foo";
|
||||
Assert.AreEqual (a.ToolExe, "Foo", "#2");
|
||||
a.ToolExe = "";
|
||||
Assert.AreEqual (a.ToolExe, "TestTool.exe", "#3");
|
||||
|
||||
Assert.AreEqual (a.ToolPath, null, "#4");
|
||||
a.ToolPath = "Bar";
|
||||
Assert.AreEqual (a.ToolPath, "Bar", "#5");
|
||||
a.ToolPath = "";
|
||||
Assert.AreEqual (a.ToolPath, "", "#6");
|
||||
}
|
||||
}
|
||||
|
||||
class LogEventsFromTextOutputToolTask : ToolTask {
|
||||
@@ -154,17 +137,5 @@ namespace MonoTests.Microsoft.Build.Utilities {
|
||||
Codes.Add (e.Code);
|
||||
}
|
||||
}
|
||||
|
||||
class TestToolTask : ToolTask {
|
||||
|
||||
protected override string ToolName {
|
||||
get { return "TestTool.exe"; }
|
||||
}
|
||||
|
||||
protected override string GenerateFullPathToTool ()
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loaded 100 of 5211 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user